Move checksum configs to aws_smithy_types

Update codegen to point to new checksum config

aws/rust-runtime/aws-config/Cargo.toml

@@ -33,7 +33,6 @@ aws-smithy-json = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-json" }
 aws-smithy-runtime = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-runtime", features = ["client"] }
 aws-smithy-runtime-api = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-runtime-api", features = ["client"] }
 aws-smithy-types = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-types" }
-aws-smithy-checksums = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-checksums" }
 aws-types = { path = "../../sdk/build/aws-sdk/sdk/aws-types" }
 bytes = "1.1.0"
 http = "0.2.4"

aws/rust-runtime/aws-config/external-types.toml

@@ -20,8 +20,6 @@ allowed_external_types = [
    "aws_smithy_async::rt::sleep::SharedAsyncSleep",
    "aws_smithy_async::time::SharedTimeSource",
    "aws_smithy_async::time::TimeSource",
-   "aws_smithy_checksums::RequestChecksumCalculation",
-   "aws_smithy_checksums::ResponseChecksumValidation",
    "aws_smithy_runtime::client::identity::cache::IdentityCache",
    "aws_smithy_runtime::client::identity::cache::lazy::LazyCacheBuilder",
    "aws_smithy_runtime_api::box_error::BoxError",
@@ -36,6 +34,8 @@ allowed_external_types = [
    "aws_smithy_runtime_api::client::result::SdkError",
    "aws_smithy_runtime_api::client::stalled_stream_protection::StalledStreamProtectionConfig",
    "aws_smithy_types::body::SdkBody",
+   "aws_smithy_types::checksum_config::RequestChecksumCalculation",
+   "aws_smithy_types::checksum_config::ResponseChecksumValidation",
    "aws_smithy_types::retry",
    "aws_smithy_types::retry::*",
    "aws_smithy_types::timeout",

aws/rust-runtime/aws-config/src/default_provider/checksums.rs

@@ -81,9 +81,10 @@ mod test {
     #[allow(deprecated)]
     use crate::profile::profile_file::{ProfileFileKind, ProfileFiles};
     use crate::provider_config::ProviderConfig;
-    use aws_smithy_checksums::ResponseChecksumValidation;
+    use aws_smithy_types::checksum_config::{
+        RequestChecksumCalculation, ResponseChecksumValidation,
+    };
     use aws_types::os_shim_internal::{Env, Fs};
-    use aws_types::sdk_config::RequestChecksumCalculation;
     use tracing_test::traced_test;
 
     #[tokio::test]

aws/rust-runtime/aws-config/src/lib.rs

@@ -222,13 +222,15 @@ mod loader {
     use aws_credential_types::Credentials;
     use aws_smithy_async::rt::sleep::{default_async_sleep, AsyncSleep, SharedAsyncSleep};
     use aws_smithy_async::time::{SharedTimeSource, TimeSource};
-    use aws_smithy_checksums::{RequestChecksumCalculation, ResponseChecksumValidation};
     use aws_smithy_runtime::client::identity::IdentityCache;
     use aws_smithy_runtime_api::client::behavior_version::BehaviorVersion;
     use aws_smithy_runtime_api::client::http::HttpClient;
     use aws_smithy_runtime_api::client::identity::{ResolveCachedIdentity, SharedIdentityCache};
     use aws_smithy_runtime_api::client::stalled_stream_protection::StalledStreamProtectionConfig;
     use aws_smithy_runtime_api::shared::IntoShared;
+    use aws_smithy_types::checksum_config::{
+        RequestChecksumCalculation, ResponseChecksumValidation,
+    };
     use aws_smithy_types::retry::RetryConfig;
     use aws_smithy_types::timeout::TimeoutConfig;
     use aws_types::app_name::AppName;

aws/rust-runtime/aws-inlineable/src/http_request_checksum.rs

@@ -10,8 +10,8 @@
 use aws_runtime::content_encoding::{AwsChunkedBody, AwsChunkedBodyOptions};
 use aws_runtime::{auth::SigV4OperationSigningConfig, content_encoding::header_value::AWS_CHUNKED};
 use aws_sigv4::http_request::SignableBody;
+use aws_smithy_checksums::ChecksumAlgorithm;
 use aws_smithy_checksums::{body::calculate, http::HttpChecksum};
-use aws_smithy_checksums::{ChecksumAlgorithm, RequestChecksumCalculation};
 use aws_smithy_runtime_api::box_error::BoxError;
 use aws_smithy_runtime_api::client::interceptors::context::{
     BeforeSerializationInterceptorContextRef, BeforeTransmitInterceptorContextMut, Input,
@@ -20,6 +20,7 @@ use aws_smithy_runtime_api::client::interceptors::Intercept;
 use aws_smithy_runtime_api::client::orchestrator::HttpRequest;
 use aws_smithy_runtime_api::client::runtime_components::RuntimeComponents;
 use aws_smithy_types::body::SdkBody;
+use aws_smithy_types::checksum_config::RequestChecksumCalculation;
 use aws_smithy_types::config_bag::{ConfigBag, Layer, Storable, StoreReplace};
 use aws_smithy_types::error::operation::BuildError;
 use http::HeaderValue;

aws/rust-runtime/aws-inlineable/src/http_response_checksum.rs

@@ -7,7 +7,7 @@
 
 //! Interceptor for handling Smithy `@httpChecksum` response checksumming
 
-use aws_smithy_checksums::{ChecksumAlgorithm, ResponseChecksumValidation};
+use aws_smithy_checksums::ChecksumAlgorithm;
 use aws_smithy_runtime_api::box_error::BoxError;
 use aws_smithy_runtime_api::client::interceptors::context::{
     BeforeDeserializationInterceptorContextMut, BeforeSerializationInterceptorContextMut, Input,
@@ -16,6 +16,7 @@ use aws_smithy_runtime_api::client::interceptors::Intercept;
 use aws_smithy_runtime_api::client::runtime_components::RuntimeComponents;
 use aws_smithy_runtime_api::http::Headers;
 use aws_smithy_types::body::SdkBody;
+use aws_smithy_types::checksum_config::ResponseChecksumValidation;
 use aws_smithy_types::config_bag::{ConfigBag, Layer, Storable, StoreReplace};
 use std::{fmt, mem};
 

aws/rust-runtime/aws-types/Cargo.toml

@@ -17,7 +17,6 @@ aws-smithy-async = { path = "../../../rust-runtime/aws-smithy-async" }
 aws-smithy-types = { path = "../../../rust-runtime/aws-smithy-types" }
 aws-smithy-runtime = { path = "../../../rust-runtime/aws-smithy-runtime", optional = true }
 aws-smithy-runtime-api = { path = "../../../rust-runtime/aws-smithy-runtime-api", features = ["client"] }
-aws-smithy-checksums = {path = "../../../rust-runtime/aws-smithy-checksums"}
 tracing = "0.1"
 # cargo does not support optional test dependencies, so to completely disable rustls
 # we need to add the webpki-roots feature here.

aws/rust-runtime/aws-types/external-types.toml

@@ -6,15 +6,15 @@ allowed_external_types = [
     "aws_smithy_async::rt::sleep::SharedAsyncSleep",
     "aws_smithy_async::time::SharedTimeSource",
     "aws_smithy_async::time::TimeSource",
-    "aws_smithy_checksums::ResponseChecksumValidation",
-    "aws_smithy_checksums::RequestChecksumCalculation",
     "aws_smithy_runtime_api::client::behavior_version::BehaviorVersion",
     "aws_smithy_runtime_api::client::http::HttpClient",
     "aws_smithy_runtime_api::client::http::SharedHttpClient",
     "aws_smithy_runtime_api::client::identity::ResolveCachedIdentity",
     "aws_smithy_runtime_api::client::identity::SharedIdentityCache",
     "aws_smithy_runtime_api::client::stalled_stream_protection::StalledStreamProtectionConfig",
     "aws_smithy_runtime_api::http::headers::Headers",
+    "aws_smithy_types::checksum_config::ResponseChecksumValidation",
+    "aws_smithy_types::checksum_config::RequestChecksumCalculation",
     "aws_smithy_types::config_bag::storable::Storable",
     "aws_smithy_types::config_bag::storable::StoreReplace",
     "aws_smithy_types::config_bag::storable::Storer",

aws/rust-runtime/aws-types/src/sdk_config.rs

@@ -19,13 +19,15 @@ pub use aws_credential_types::provider::SharedCredentialsProvider;
 use aws_smithy_async::rt::sleep::AsyncSleep;
 pub use aws_smithy_async::rt::sleep::SharedAsyncSleep;
 pub use aws_smithy_async::time::{SharedTimeSource, TimeSource};
-pub use aws_smithy_checksums::{RequestChecksumCalculation, ResponseChecksumValidation};
 use aws_smithy_runtime_api::client::behavior_version::BehaviorVersion;
 use aws_smithy_runtime_api::client::http::HttpClient;
 pub use aws_smithy_runtime_api::client::http::SharedHttpClient;
 use aws_smithy_runtime_api::client::identity::{ResolveCachedIdentity, SharedIdentityCache};
 pub use aws_smithy_runtime_api::client::stalled_stream_protection::StalledStreamProtectionConfig;
 use aws_smithy_runtime_api::shared::IntoShared;
+pub use aws_smithy_types::checksum_config::{
+    RequestChecksumCalculation, ResponseChecksumValidation,
+};
 pub use aws_smithy_types::retry::RetryConfig;
 pub use aws_smithy_types::timeout::TimeoutConfig;
 use std::collections::HashMap;
@@ -183,7 +185,7 @@ impl Builder {
     /// # Examples
     /// ```
     /// use aws_types::SdkConfig;
-    /// use aws_smithy_checksums::RequestChecksumCalculation;
+    /// use aws_smithy_types::checksum_config::RequestChecksumCalculation;
     /// let config = SdkConfig::builder().request_checksum_calculation(RequestChecksumCalculation::WhenSupported).build();
     /// ```
     pub fn request_checksum_calculation(
@@ -207,7 +209,7 @@ impl Builder {
     /// # Examples
     /// ```
     /// use aws_types::SdkConfig;
-    /// use aws_smithy_checksums::ResponseChecksumValidation;
+    /// use aws_smithy_types::checksum_config::ResponseChecksumValidation;
     /// let config = SdkConfig::builder().response_checksum_validation(ResponseChecksumValidation::WhenSupported).build();
     /// ```
     pub fn response_checksum_validation(

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/HttpRequestChecksumDecorator.kt

@@ -220,8 +220,8 @@ class HttpRequestChecksumConfigCustomization(private val codegenContext: ClientC
             *preludeScope,
             "RequestChecksumCalculation" to
                 configReexport(
-                    RuntimeType.smithyChecksums(rc)
-                        .resolve("RequestChecksumCalculation"),
+                    RuntimeType.smithyTypes(rc)
+                        .resolve("checksum_config::RequestChecksumCalculation"),
                 ),
         )
 

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/HttpRequestChecksumMutationInterceptorGenerator.kt

@@ -93,8 +93,8 @@ class HttpRequestChecksumMutationInterceptorGenerator : ClientCodegenDecorator {
                                 "Error" to interceptors.resolve("context::Error"),
                                 "RuntimeComponents" to RuntimeType.runtimeComponents(rc),
                                 "RequestChecksumCalculation" to
-                                    CargoDependency.smithyChecksums(rc).toType()
-                                        .resolve("RequestChecksumCalculation"),
+                                    CargoDependency.smithyTypes(rc).toType()
+                                        .resolve("checksum_config::RequestChecksumCalculation"),
                             )
                         }
 

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/HttpResponseChecksumDecorator.kt

@@ -191,8 +191,8 @@ class HttpResponseChecksumConfigCustomization(private val codegenContext: Client
             *preludeScope,
             "ResponseChecksumValidation" to
                 configReexport(
-                    RuntimeType.smithyChecksums(rc)
-                        .resolve("ResponseChecksumValidation"),
+                    RuntimeType.smithyTypes(rc)
+                        .resolve("checksum_config::ResponseChecksumValidation"),
                 ),
         )
 

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/HttpResponseChecksumMutationInterceptorGenerator.kt

@@ -94,8 +94,8 @@ class HttpResponseChecksumMutationInterceptorGenerator : ClientCodegenDecorator
                                 "Error" to interceptors.resolve("context::Error"),
                                 "RuntimeComponents" to RuntimeType.runtimeComponents(rc),
                                 "ResponseChecksumValidation" to
-                                    CargoDependency.smithyChecksums(rc).toType()
-                                        .resolve("ResponseChecksumValidation"),
+                                    CargoDependency.smithyTypes(rc).toType()
+                                        .resolve("checksum_config::ResponseChecksumValidation"),
                             )
                         }
 

rust-runtime/aws-smithy-checksums/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aws-smithy-checksums"
-version = "0.60.13"
+version = "0.62.0"
 authors = [
     "AWS Rust SDK Team <[email protected]>",
     "Zelda Hessler <[email protected]>",

rust-runtime/aws-smithy-checksums/external-types.toml

@@ -1,7 +1,5 @@
 allowed_external_types = [
     "aws_smithy_types::body::SdkBody",
-    "aws_smithy_types::config_bag::storable::StoreReplace",
-    "aws_smithy_types::config_bag::storable::Storable",
     "bytes::bytes::Bytes",
     "http::header::map::HeaderMap",
     "http::header::name::HeaderName",