Merge branch 'main' into http1x-support

smithy-lang · Jan 24, 2024 · f412db0 · f412db0
2 parents 3f716f8 + 5e20575
commit f412db0
Show file tree

Hide file tree

Showing 55 changed files with 2,143 additions and 2,257 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 <!-- Do not manually edit this file. Use the `changelogger` tool. -->
+January 18th, 2024
+==================
+**New this release:**
+- (client, [smithy-rs#3318](https://github.com/smithy-lang/smithy-rs/issues/3318)) `EndpointPrefix` and `apply_endpoint` moved from aws-smithy-http to aws-smithy-runtime-api so that is in a stable (1.x) crate. A deprecated type alias was left in place with a note showing the new location.
+- (client, [smithy-rs#3325](https://github.com/smithy-lang/smithy-rs/issues/3325)) The `Metadata` storable was moved from aws_smithy_http into aws_smithy_runtime_api. A deprecated type alias was left in place with a note showing where the new location is.
+
+
 January 10th, 2024
 ==================
 **New this release:**

diff --git a/CHANGELOG.next.toml b/CHANGELOG.next.toml
@@ -12,29 +12,11 @@
 # author = "rcoh"
 
 [[aws-sdk-rust]]
-message = "`EndpointPrefix` and `apply_endpoint` moved from aws-smithy-http to aws-smithy-runtime-api so that is in a stable (1.x) crate. A deprecated type alias was left in place with a note showing the new location."
-references = ["smithy-rs#3318"]
+message = "The types in the aws-http crate were moved into aws-runtime. Deprecated type aliases were put in place to point to the new locations."
+references = ["smithy-rs#3355"]
 meta = { "breaking" = false, "tada" = false, "bug" = false }
 author = "jdisanti"
 
-[[smithy-rs]]
-message = "`EndpointPrefix` and `apply_endpoint` moved from aws-smithy-http to aws-smithy-runtime-api so that is in a stable (1.x) crate. A deprecated type alias was left in place with a note showing the new location."
-references = ["smithy-rs#3318"]
-meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client"}
-author = "jdisanti"
-
-[[smithy-rs]]
-message = "The `Metadata` storable was moved from aws_smithy_http into aws_smithy_runtime_api. A deprecated type alias was left in place with a note showing where the new location is."
-references = ["smithy-rs#3325"]
-meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client" }
-author = "jdisanti"
-
-[[aws-sdk-rust]]
-message = "Fix bug where overriding the credentials at the operation level failed if credentials were already set."
-references = ["aws-sdk-rust#901", "smithy-rs#3363"]
-meta = { "breaking" = false, "bug" = true, "tada" = false }
-author = "rcoh"
-
 [[smithy-rs]]
 message = "Add `try_into_http1x` and `try_from_http1x` to Request and Response container types."
 references = ["aws-sdk-rust#977", "smithy-rs#3365", "smithy-rs#3373"]

diff --git a/aws/SDK_CHANGELOG.next.json b/aws/SDK_CHANGELOG.next.json
@@ -5,36 +5,6 @@
 {
   "smithy-rs": [],
   "aws-sdk-rust": [
-    {
-      "message": "Fix `config::Builder::set_credentials_provider` to override a credentials provider previously set.",
-      "meta": {
-        "bug": true,
-        "breaking": false,
-        "tada": false
-      },
-      "author": "ysaito1001",
-      "references": [
-        "aws-sdk-rust#973",
-        "smithy-rs#3278"
-      ],
-      "since-commit": "529b3f03e2b945ea2e5e879183ccfd8e74b7377c",
-      "age": 5
-    },
-    {
-      "message": "`config::Config::credentials_provider` has been broken since `release-2023-11-15` and is now marked as `deprecated` explicitly.",
-      "meta": {
-        "bug": false,
-        "breaking": false,
-        "tada": false
-      },
-      "author": "ysaito1001",
-      "references": [
-        "smithy-rs#3251",
-        "smithy-rs#3278"
-      ],
-      "since-commit": "529b3f03e2b945ea2e5e879183ccfd8e74b7377c",
-      "age": 5
-    },
     {
       "message": "Loading native TLS trusted certs for the default HTTP client now only occurs if the default HTTP client is not overridden in config.",
       "meta": {
@@ -47,7 +17,7 @@
         "smithy-rs#3262"
       ],
       "since-commit": "fc335cbc87e70aa63895828fca55b51795b94a6c",
-      "age": 4
+      "age": 5
     },
     {
       "message": "Client creation now takes microseconds instead of milliseconds.\nPreviously, it would take 2-3 milliseconds for each client instantiation due to time spent compiling regexes.\nFor applications that used several clients, this would increase start-up time in cases where it really matters,\nsuch as for AWS Lambda cold starts. This time was improved by both changing regex implementation and caching the\nresult of the compilation.",
@@ -62,7 +32,7 @@
         "smithy-rs#3269"
       ],
       "since-commit": "fc335cbc87e70aa63895828fca55b51795b94a6c",
-      "age": 4
+      "age": 5
     },
     {
       "message": "Add `test_credentials` to `ConfigLoader` in `aws_config`. This allows the following pattern during tests:\n\n```rust\nasync fn main() {\n    let conf = aws_config::defaults(BehaviorVersion::latest())\n        .test_credentials()\n        .await;\n}\n```\n\nThis is designed for unit tests and using local mocks like DynamoDB Local and LocalStack with the SDK.\n",
@@ -77,7 +47,7 @@
         "aws-sdk-rust#971"
       ],
       "since-commit": "fc335cbc87e70aa63895828fca55b51795b94a6c",
-      "age": 4
+      "age": 5
     },
     {
       "message": "Improve the error messages for when auth fails to select an auth scheme for a request.",
@@ -92,7 +62,7 @@
         "smithy-rs#3277"
       ],
       "since-commit": "fc335cbc87e70aa63895828fca55b51795b94a6c",
-      "age": 4
+      "age": 5
     },
     {
       "message": "Fix documentation and examples on HyperConnector and HyperClientBuilder.",
@@ -107,7 +77,7 @@
         "smithy-rs#3282"
       ],
       "since-commit": "fc335cbc87e70aa63895828fca55b51795b94a6c",
-      "age": 4
+      "age": 5
     },
     {
       "message": "All generated docs now include docsrs labels when features are required",
@@ -122,7 +92,7 @@
         "smithy-rs#3295"
       ],
       "since-commit": "fc335cbc87e70aa63895828fca55b51795b94a6c",
-      "age": 4
+      "age": 5
     },
     {
       "message": "`crate::event_receiver::EventReceiver` is now re-exported as `crate::primitives::event_stream::EventReceiver` when a service supports event stream operations.",
@@ -136,7 +106,7 @@
         "smithy-rs#3305"
       ],
       "since-commit": "9f0ba850e03241f657e2e40ca185780e0a5878cb",
-      "age": 3
+      "age": 4
     },
     {
       "message": "Add support for constructing [`SdkBody`] and [`ByteStream`] from `http-body` 1.0 bodies. Note that this is initial support and works via a backwards compatibility shim to http-body 0.4. Hyper 1.0 is not supported.",
@@ -151,7 +121,7 @@
         "aws-sdk-rust#977"
       ],
       "since-commit": "e235a2fd9ec45335a3b2018028c2d3a2ac13ffdf",
-      "age": 1
+      "age": 2
     },
     {
       "message": " Add `PaginationStreamExt` extension trait to `aws-smithy-types-convert` behind the `convert-streams` feature. This makes it possible to treat a paginator as a [`futures_core::Stream`](https://docs.rs/futures-core/latest/futures_core/stream/trait.Stream.html), allowing customers to use stream combinators like [`map`](https://docs.rs/tokio-stream/latest/tokio_stream/trait.StreamExt.html#method.map) and [`filter`](https://docs.rs/tokio-stream/latest/tokio_stream/trait.StreamExt.html#method.filter).\n\nExample:\n\n```rust\nuse aws_smithy_types_convert::stream::PaginationStreamExt\nlet stream = s3_client.list_objects_v2().bucket(\"...\").into_paginator().send().into_stream_03x();\n```\n",
@@ -165,7 +135,7 @@
         "smithy-rs#3299"
       ],
       "since-commit": "e235a2fd9ec45335a3b2018028c2d3a2ac13ffdf",
-      "age": 1
+      "age": 2
     },
     {
       "message": "Serialize 0/false in query parameters, and ignore actual default value during serialization instead of just 0/false. See [changelog discussion](https://github.com/smithy-lang/smithy-rs/discussions/3312) for details.",
@@ -180,7 +150,7 @@
         "smithy-rs#3312"
       ],
       "since-commit": "e235a2fd9ec45335a3b2018028c2d3a2ac13ffdf",
-      "age": 1
+      "age": 2
     },
     {
       "message": "Add `as_service_err()` to `SdkError` to allow checking the type of an error is without taking ownership.",
@@ -196,7 +166,7 @@
         "aws-sdk-rust#1010"
       ],
       "since-commit": "e235a2fd9ec45335a3b2018028c2d3a2ac13ffdf",
-      "age": 1
+      "age": 2
     },
     {
       "message": "Fix bug in `CredentialsProcess` provider where `expiry` was incorrectly treated as a required field.",
@@ -211,7 +181,7 @@
         "aws-sdk-rust#1021"
       ],
       "since-commit": "e235a2fd9ec45335a3b2018028c2d3a2ac13ffdf",
-      "age": 1
+      "age": 2
     },
     {
       "message": "~/.aws/config and ~/.aws/credentials now parse keys in a case-insensitive way. This means the `AWS_SECRET_ACCESS_KEY` is supported in addition to `aws_secret_access_key`.",
@@ -227,6 +197,50 @@
         "smithy-rs#3344"
       ],
       "since-commit": "e235a2fd9ec45335a3b2018028c2d3a2ac13ffdf",
+      "age": 2
+    },
+    {
+      "message": "`EndpointPrefix` and `apply_endpoint` moved from aws-smithy-http to aws-smithy-runtime-api so that is in a stable (1.x) crate. A deprecated type alias was left in place with a note showing the new location.",
+      "meta": {
+        "bug": false,
+        "breaking": false,
+        "tada": false
+      },
+      "author": "jdisanti",
+      "references": [
+        "smithy-rs#3318"
+      ],
+      "since-commit": "edf6e77bfa991aef9afa5acf293a911f7982511a",
+      "age": 1
+    },
+    {
+      "message": "Fix bug where overriding the credentials at the operation level failed if credentials were already set.",
+      "meta": {
+        "bug": true,
+        "breaking": false,
+        "tada": false
+      },
+      "author": "rcoh",
+      "references": [
+        "aws-sdk-rust#901",
+        "smithy-rs#3363"
+      ],
+      "since-commit": "edf6e77bfa991aef9afa5acf293a911f7982511a",
+      "age": 1
+    },
+    {
+      "message": "Add `apply_to_request_http1x` to `aws-sigv4` to enable signing http = 1.0 requests.",
+      "meta": {
+        "bug": false,
+        "breaking": false,
+        "tada": true
+      },
+      "author": "rcoh",
+      "references": [
+        "aws-sdk-rust#1041",
+        "smithy-rs#3366"
+      ],
+      "since-commit": "edf6e77bfa991aef9afa5acf293a911f7982511a",
       "age": 1
     }
   ],

diff --git a/aws/rust-runtime/aws-config/Cargo.toml b/aws/rust-runtime/aws-config/Cargo.toml
@@ -23,7 +23,6 @@ allow-compilation = []
 
 [dependencies]
 aws-credential-types = { path = "../../sdk/build/aws-sdk/sdk/aws-credential-types", features = ["test-util"] }
-aws-http = { path = "../../sdk/build/aws-sdk/sdk/aws-http" }
 aws-sdk-sts = { path = "../../sdk/build/aws-sdk/sdk/sts", default-features = false }
 aws-smithy-async = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-async" }
 aws-smithy-http = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-http" }

diff --git a/aws/rust-runtime/aws-config/src/imds/client.rs b/aws/rust-runtime/aws-config/src/imds/client.rs
@@ -11,8 +11,7 @@ use crate::imds::client::error::{BuildError, ImdsError, InnerImdsError, InvalidE
 use crate::imds::client::token::TokenRuntimePlugin;
 use crate::provider_config::ProviderConfig;
 use crate::PKG_VERSION;
-use aws_http::user_agent::{ApiMetadata, AwsUserAgent};
-use aws_runtime::user_agent::UserAgentInterceptor;
+use aws_runtime::user_agent::{ApiMetadata, AwsUserAgent, UserAgentInterceptor};
 use aws_smithy_runtime::client::orchestrator::operation::Operation;
 use aws_smithy_runtime::client::retries::strategy::StandardRetryStrategy;
 use aws_smithy_runtime_api::box_error::BoxError;

diff --git a/aws/rust-runtime/aws-http/Cargo.toml b/aws/rust-runtime/aws-http/Cargo.toml
@@ -1,25 +1,14 @@
 [package]
 name = "aws-http"
-version = "0.0.0-smithy-rs-head"
+version = "0.60.5"
 authors = ["AWS Rust SDK Team <[email protected]>", "Russell Cohen <[email protected]>"]
-description = "HTTP specific AWS SDK behaviors."
+description = "This crate is no longer used by the AWS SDK and is deprecated."
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/smithy-lang/smithy-rs"
 
 [dependencies]
-aws-smithy-runtime-api = { path = "../../../rust-runtime/aws-smithy-runtime-api", features = ["client"] }
-aws-smithy-types = { path = "../../../rust-runtime/aws-smithy-types", features = ["http-body-0-4-x"] }
-aws-types = { path = "../aws-types" }
-bytes = "1.1"
-http = "0.2.3"
-http-body = "0.4.5"
-tracing = "0.1"
-pin-project-lite = "0.2.9"
-
-[dev-dependencies]
-bytes-utils = "0.1.2"
-tokio = { version = "1.23.1", features = ["macros", "rt", "time"] }
+aws-runtime = { path = "../aws-runtime", features = ["http-02x"] }
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/aws/rust-runtime/aws-http/README.md b/aws/rust-runtime/aws-http/README.md
@@ -1,9 +1,6 @@
 # aws-http
 
-This crate provides middleware for AWS SDKs using HTTP including:
-* Generalized retry policy
-* Middleware for setting `User-Agent` headers based on runtime configuration
-* Credential loading async middleware
+This crate is no longer used by the AWS SDK and is deprecated.
 
 <!-- anchor_start:footer -->
 This crate is part of the [AWS SDK for Rust](https://awslabs.github.io/aws-sdk-rust/) and the [smithy-rs](https://github.com/smithy-lang/smithy-rs) code generator. In most cases, it should not be used directly.

diff --git a/aws/rust-runtime/aws-http/external-types.toml b/aws/rust-runtime/aws-http/external-types.toml
@@ -1,11 +1,3 @@
 allowed_external_types = [
-    "aws_smithy_runtime_api::http::headers::Headers",
-    "aws_smithy_types::body::Error",
-    "aws_smithy_types::config_bag::storable::Storable",
-    "aws_smithy_types::config_bag::storable::StoreReplace",
-    "aws_smithy_types::error::metadata::Builder",
-    "aws_types::app_name::AppName",
-    "aws_types::os_shim_internal::Env",
-    "bytes::bytes::Bytes",
-    "http_body::Body",
+    "aws_runtime::*",
 ]