AWS SDK

AWS SDK

rev. e48ccee0154f81d455955afa85c29300f723084d (ignoring whitespace)

Files changed:

tmp-codegen-diff/aws-sdk/sdk/aws-config/Cargo.toml

@@ -19,19 +79,79 @@
   39     39   
url = "2.5.4"
   40     40   
fastrand = "2.3.0"
   41     41   
   42     42   
[dependencies.aws-credential-types]
   43     43   
path = "../aws-credential-types"
   44     44   
features = ["test-util"]
   45     45   
version = "1.2.11"
   46     46   
   47     47   
[dependencies.aws-runtime]
   48     48   
path = "../aws-runtime"
   49         -
version = "1.5.17"
          49  +
version = "1.5.18"
   50     50   
   51     51   
[dependencies.aws-sdk-sts]
   52     52   
path = "../sts"
   53     53   
default-features = false
   54     54   
version = "0.0.0-local"
   55     55   
   56     56   
[dependencies.aws-smithy-async]
   57     57   
path = "../aws-smithy-async"
   58     58   
version = "1.2.7"
   59     59   

tmp-codegen-diff/aws-sdk/sdk/aws-runtime/Cargo.toml

@@ -1,1 +34,34 @@
    1      1   
# Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2      2   
[package]
    3      3   
name = "aws-runtime"
    4         -
version = "1.5.17"
           4  +
version = "1.5.18"
    5      5   
authors = ["AWS Rust SDK Team <aws-sdk-rust@amazon.com>"]
    6      6   
description = "Runtime support code for the AWS SDK. This crate isn't intended to be used directly."
    7      7   
edition = "2021"
    8      8   
license = "Apache-2.0"
    9      9   
repository = "https://github.com/smithy-lang/smithy-rs"
   10     10   
rust-version = "1.88"
   11     11   
[package.metadata.docs.rs]
   12     12   
all-features = true
   13     13   
targets = ["x86_64-unknown-linux-gnu"]
   14     14   
cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]

tmp-codegen-diff/aws-sdk/sdk/aws-runtime/src/user_agent/metrics.rs

@@ -138,138 +242,240 @@
  158    158   
    CredentialsSsoLegacy,
  159    159   
    CredentialsProfileProcess,
  160    160   
    CredentialsProcess,
  161    161   
    CredentialsBoto2ConfigFile,
  162    162   
    CredentialsAwsSdkStore,
  163    163   
    CredentialsHttp,
  164    164   
    CredentialsImds,
  165    165   
    SsoLoginDevice,
  166    166   
    SsoLoginAuth,
  167    167   
    BearerServiceEnvVars,
  168         -
    ObservabilityTracing,
  169         -
    ObservabilityMetrics,
  170         -
    ObservabilityOtelTracing,
  171    168   
    ObservabilityOtelMetrics,
  172    169   
    CredentialsCognito,
  173    170   
    S3TransferUploadDirectory,
  174    171   
    S3TransferDownloadDirectory,
  175    172   
    CliV1ToV2MigrationDebugMode,
  176    173   
    LoginSameDevice,
  177    174   
    LoginCrossDevice,
  178    175   
    CredentialsProfileLogin,
  179    176   
    CredentialsLogin
  180    177   
);
  181    178   
  182    179   
pub(crate) trait ProvideBusinessMetric {
  183    180   
    fn provide_business_metric(&self) -> Option<BusinessMetric>;
  184    181   
}
  185    182   
  186    183   
impl ProvideBusinessMetric for SmithySdkFeature {
  187    184   
    fn provide_business_metric(&self) -> Option<BusinessMetric> {
  188    185   
        use SmithySdkFeature::*;
  189    186   
        match self {
  190    187   
            Waiter => Some(BusinessMetric::Waiter),
  191    188   
            Paginator => Some(BusinessMetric::Paginator),
  192    189   
            GzipRequestCompression => Some(BusinessMetric::GzipRequestCompression),
  193    190   
            ProtocolRpcV2Cbor => Some(BusinessMetric::ProtocolRpcV2Cbor),
  194    191   
            RetryModeStandard => Some(BusinessMetric::RetryModeStandard),
  195    192   
            RetryModeAdaptive => Some(BusinessMetric::RetryModeAdaptive),
  196    193   
            FlexibleChecksumsReqCrc32 => Some(BusinessMetric::FlexibleChecksumsReqCrc32),
  197    194   
            FlexibleChecksumsReqCrc32c => Some(BusinessMetric::FlexibleChecksumsReqCrc32c),
  198    195   
            FlexibleChecksumsReqCrc64 => Some(BusinessMetric::FlexibleChecksumsReqCrc64),
  199    196   
            FlexibleChecksumsReqSha1 => Some(BusinessMetric::FlexibleChecksumsReqSha1),
  200    197   
            FlexibleChecksumsReqSha256 => Some(BusinessMetric::FlexibleChecksumsReqSha256),
  201    198   
            FlexibleChecksumsReqWhenSupported => {
  202    199   
                Some(BusinessMetric::FlexibleChecksumsReqWhenSupported)
  203    200   
            }
  204    201   
            FlexibleChecksumsReqWhenRequired => {
  205    202   
                Some(BusinessMetric::FlexibleChecksumsReqWhenRequired)
  206    203   
            }
  207    204   
            FlexibleChecksumsResWhenSupported => {
  208    205   
                Some(BusinessMetric::FlexibleChecksumsResWhenSupported)
  209    206   
            }
  210    207   
            FlexibleChecksumsResWhenRequired => {
  211    208   
                Some(BusinessMetric::FlexibleChecksumsResWhenRequired)
  212    209   
            }
         210  +
            ObservabilityOtelMetrics => Some(BusinessMetric::ObservabilityOtelMetrics),
  213    211   
            otherwise => {
  214    212   
                // This may occur if a customer upgrades only the `aws-smithy-runtime-api` crate
  215    213   
                // while continuing to use an outdated version of an SDK crate or the `aws-runtime`
  216    214   
                // crate.
  217    215   
                tracing::warn!(
  218    216   
                    "Attempted to provide `BusinessMetric` for `{otherwise:?}`, which is not recognized in the current version of the `aws-runtime` crate. \
  219    217   
                    Consider upgrading to the latest version to ensure that all tracked features are properly reported in your metrics."
  220    218   
                );
  221    219   
                None
  222    220   
            }

tmp-codegen-diff/aws-sdk/sdk/aws-runtime/src/user_agent/test_data/feature_id_to_metric_value.json

@@ -28,28 +70,67 @@
   48     48   
  "CREDENTIALS_SSO_LEGACY": "u",
   49     49   
  "CREDENTIALS_PROFILE_PROCESS": "v",
   50     50   
  "CREDENTIALS_PROCESS": "w",
   51     51   
  "CREDENTIALS_BOTO2_CONFIG_FILE": "x",
   52     52   
  "CREDENTIALS_AWS_SDK_STORE": "y",
   53     53   
  "CREDENTIALS_HTTP": "z",
   54     54   
  "CREDENTIALS_IMDS": "0",
   55     55   
  "SSO_LOGIN_DEVICE": "1",
   56     56   
  "SSO_LOGIN_AUTH": "2",
   57     57   
  "BEARER_SERVICE_ENV_VARS": "3",
   58         -
  "OBSERVABILITY_TRACING" : "4",
   59         -
  "OBSERVABILITY_METRICS" : "5",
   60         -
  "OBSERVABILITY_OTEL_TRACING" : "6",
   61         -
  "OBSERVABILITY_OTEL_METRICS" : "7",
   62         -
  "CREDENTIALS_COGNITO" : "8",
   63         -
  "S3_TRANSFER_UPLOAD_DIRECTORY" : "9",
   64         -
  "S3_TRANSFER_DOWNLOAD_DIRECTORY": "+",
   65         -
  "CLI_V1_TO_V2_MIGRATION_DEBUG_MODE" : "-",
   66         -
  "LOGIN_SAME_DEVICE" : "AA",
   67         -
  "LOGIN_CROSS_DEVICE" : "AB",
   68         -
  "CREDENTIALS_PROFILE_LOGIN": "AC",
   69         -
  "CREDENTIALS_LOGIN": "AD"
          58  +
  "OBSERVABILITY_OTEL_METRICS": "4",
          59  +
  "CREDENTIALS_COGNITO": "5",
          60  +
  "S3_TRANSFER_UPLOAD_DIRECTORY": "6",
          61  +
  "S3_TRANSFER_DOWNLOAD_DIRECTORY": "7",
          62  +
  "CLI_V1_TO_V2_MIGRATION_DEBUG_MODE": "8",
          63  +
  "LOGIN_SAME_DEVICE": "9",
          64  +
  "LOGIN_CROSS_DEVICE": "+",
          65  +
  "CREDENTIALS_PROFILE_LOGIN": "-",
          66  +
  "CREDENTIALS_LOGIN": "AA"
   70     67   
}

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/Cargo.toml

@@ -1,0 +75,0 @@
    1         -
# Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
[package]
    3         -
name = "aws-smithy-legacy-http"
    4         -
version = "0.62.6"
    5         -
authors = ["AWS Rust SDK Team <aws-sdk-rust@amazon.com>", "Russell Cohen <rcoh@amazon.com>"]
    6         -
description = "Smithy HTTP-0x logic for smithy-rs."
    7         -
edition = "2021"
    8         -
license = "Apache-2.0"
    9         -
repository = "https://github.com/smithy-lang/smithy-rs"
   10         -
rust-version = "1.88"
   11         -
[package.metadata.docs.rs]
   12         -
all-features = true
   13         -
targets = ["x86_64-unknown-linux-gnu"]
   14         -
cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]
   15         -
rustdoc-args = ["--cfg", "docsrs"]
   16         -
   17         -
[features]
   18         -
event-stream = ["aws-smithy-eventstream"]
   19         -
rt-tokio = ["aws-smithy-types/rt-tokio"]
   20         -
   21         -
[dependencies]
   22         -
bytes = "1.10.0"
   23         -
bytes-utils = "0.1"
   24         -
percent-encoding = "2.3.1"
   25         -
pin-project-lite = "0.2.14"
   26         -
pin-utils = "0.1.0"
   27         -
tracing = "0.1.40"
   28         -
futures-core = "0.3.31"
   29         -
   30         -
[dependencies.aws-smithy-eventstream]
   31         -
path = "../aws-smithy-eventstream"
   32         -
optional = true
   33         -
version = "0.60.14"
   34         -
   35         -
[dependencies.aws-smithy-runtime-api]
   36         -
path = "../aws-smithy-runtime-api"
   37         -
features = ["client", "http-02x"]
   38         -
version = "1.9.3"
   39         -
   40         -
[dependencies.aws-smithy-types]
   41         -
path = "../aws-smithy-types"
   42         -
features = ["byte-stream-poll-next", "http-body-0-4-x"]
   43         -
version = "1.3.5"
   44         -
   45         -
[dependencies.http-02x]
   46         -
package = "http"
   47         -
version = "0.2.9"
   48         -
   49         -
[dependencies.http-1x]
   50         -
package = "http"
   51         -
version = "1"
   52         -
   53         -
[dependencies.http-body-04x]
   54         -
package = "http-body"
   55         -
version = "0.4.5"
   56         -
   57         -
[dependencies.futures-util]
   58         -
version = "0.3.29"
   59         -
default-features = false
   60         -
   61         -
[dev-dependencies]
   62         -
async-stream = "0.3"
   63         -
proptest = "1"
   64         -
   65         -
[dev-dependencies.futures-util]
   66         -
version = "0.3.29"
   67         -
default-features = false
   68         -
   69         -
[dev-dependencies.hyper]
   70         -
version = "0.14.26"
   71         -
features = ["stream"]
   72         -
   73         -
[dev-dependencies.tokio]
   74         -
version = "1.23.1"
   75         -
features = ["macros", "rt", "rt-multi-thread"]

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/LICENSE

@@ -1,0 +175,0 @@
    1         -
    2         -
                                 Apache License
    3         -
                           Version 2.0, January 2004
    4         -
                        http://www.apache.org/licenses/
    5         -
    6         -
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    7         -
    8         -
   1. Definitions.
    9         -
   10         -
      "License" shall mean the terms and conditions for use, reproduction,
   11         -
      and distribution as defined by Sections 1 through 9 of this document.
   12         -
   13         -
      "Licensor" shall mean the copyright owner or entity authorized by
   14         -
      the copyright owner that is granting the License.
   15         -
   16         -
      "Legal Entity" shall mean the union of the acting entity and all
   17         -
      other entities that control, are controlled by, or are under common
   18         -
      control with that entity. For the purposes of this definition,
   19         -
      "control" means (i) the power, direct or indirect, to cause the
   20         -
      direction or management of such entity, whether by contract or
   21         -
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
   22         -
      outstanding shares, or (iii) beneficial ownership of such entity.
   23         -
   24         -
      "You" (or "Your") shall mean an individual or Legal Entity
   25         -
      exercising permissions granted by this License.
   26         -
   27         -
      "Source" form shall mean the preferred form for making modifications,
   28         -
      including but not limited to software source code, documentation
   29         -
      source, and configuration files.
   30         -
   31         -
      "Object" form shall mean any form resulting from mechanical
   32         -
      transformation or translation of a Source form, including but
   33         -
      not limited to compiled object code, generated documentation,
   34         -
      and conversions to other media types.
   35         -
   36         -
      "Work" shall mean the work of authorship, whether in Source or
   37         -
      Object form, made available under the License, as indicated by a
   38         -
      copyright notice that is included in or attached to the work
   39         -
      (an example is provided in the Appendix below).
   40         -
   41         -
      "Derivative Works" shall mean any work, whether in Source or Object
   42         -
      form, that is based on (or derived from) the Work and for which the
   43         -
      editorial revisions, annotations, elaborations, or other modifications
   44         -
      represent, as a whole, an original work of authorship. For the purposes
   45         -
      of this License, Derivative Works shall not include works that remain
   46         -
      separable from, or merely link (or bind by name) to the interfaces of,
   47         -
      the Work and Derivative Works thereof.
   48         -
   49         -
      "Contribution" shall mean any work of authorship, including
   50         -
      the original version of the Work and any modifications or additions
   51         -
      to that Work or Derivative Works thereof, that is intentionally
   52         -
      submitted to Licensor for inclusion in the Work by the copyright owner
   53         -
      or by an individual or Legal Entity authorized to submit on behalf of
   54         -
      the copyright owner. For the purposes of this definition, "submitted"
   55         -
      means any form of electronic, verbal, or written communication sent
   56         -
      to the Licensor or its representatives, including but not limited to
   57         -
      communication on electronic mailing lists, source code control systems,
   58         -
      and issue tracking systems that are managed by, or on behalf of, the
   59         -
      Licensor for the purpose of discussing and improving the Work, but
   60         -
      excluding communication that is conspicuously marked or otherwise
   61         -
      designated in writing by the copyright owner as "Not a Contribution."
   62         -
   63         -
      "Contributor" shall mean Licensor and any individual or Legal Entity
   64         -
      on behalf of whom a Contribution has been received by Licensor and
   65         -
      subsequently incorporated within the Work.
   66         -
   67         -
   2. Grant of Copyright License. Subject to the terms and conditions of
   68         -
      this License, each Contributor hereby grants to You a perpetual,
   69         -
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
   70         -
      copyright license to reproduce, prepare Derivative Works of,
   71         -
      publicly display, publicly perform, sublicense, and distribute the
   72         -
      Work and such Derivative Works in Source or Object form.
   73         -
   74         -
   3. Grant of Patent License. Subject to the terms and conditions of
   75         -
      this License, each Contributor hereby grants to You a perpetual,
   76         -
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
   77         -
      (except as stated in this section) patent license to make, have made,
   78         -
      use, offer to sell, sell, import, and otherwise transfer the Work,
   79         -
      where such license applies only to those patent claims licensable
   80         -
      by such Contributor that are necessarily infringed by their
   81         -
      Contribution(s) alone or by combination of their Contribution(s)
   82         -
      with the Work to which such Contribution(s) was submitted. If You
   83         -
      institute patent litigation against any entity (including a
   84         -
      cross-claim or counterclaim in a lawsuit) alleging that the Work
   85         -
      or a Contribution incorporated within the Work constitutes direct
   86         -
      or contributory patent infringement, then any patent licenses
   87         -
      granted to You under this License for that Work shall terminate
   88         -
      as of the date such litigation is filed.
   89         -
   90         -
   4. Redistribution. You may reproduce and distribute copies of the
   91         -
      Work or Derivative Works thereof in any medium, with or without
   92         -
      modifications, and in Source or Object form, provided that You
   93         -
      meet the following conditions:
   94         -
   95         -
      (a) You must give any other recipients of the Work or
   96         -
          Derivative Works a copy of this License; and
   97         -
   98         -
      (b) You must cause any modified files to carry prominent notices
   99         -
          stating that You changed the files; and
  100         -
  101         -
      (c) You must retain, in the Source form of any Derivative Works
  102         -
          that You distribute, all copyright, patent, trademark, and
  103         -
          attribution notices from the Source form of the Work,
  104         -
          excluding those notices that do not pertain to any part of
  105         -
          the Derivative Works; and
  106         -
  107         -
      (d) If the Work includes a "NOTICE" text file as part of its
  108         -
          distribution, then any Derivative Works that You distribute must
  109         -
          include a readable copy of the attribution notices contained
  110         -
          within such NOTICE file, excluding those notices that do not
  111         -
          pertain to any part of the Derivative Works, in at least one
  112         -
          of the following places: within a NOTICE text file distributed
  113         -
          as part of the Derivative Works; within the Source form or
  114         -
          documentation, if provided along with the Derivative Works; or,
  115         -
          within a display generated by the Derivative Works, if and
  116         -
          wherever such third-party notices normally appear. The contents
  117         -
          of the NOTICE file are for informational purposes only and
  118         -
          do not modify the License. You may add Your own attribution
  119         -
          notices within Derivative Works that You distribute, alongside
  120         -
          or as an addendum to the NOTICE text from the Work, provided
  121         -
          that such additional attribution notices cannot be construed
  122         -
          as modifying the License.
  123         -
  124         -
      You may add Your own copyright statement to Your modifications and
  125         -
      may provide additional or different license terms and conditions
  126         -
      for use, reproduction, or distribution of Your modifications, or
  127         -
      for any such Derivative Works as a whole, provided Your use,
  128         -
      reproduction, and distribution of the Work otherwise complies with
  129         -
      the conditions stated in this License.
  130         -
  131         -
   5. Submission of Contributions. Unless You explicitly state otherwise,
  132         -
      any Contribution intentionally submitted for inclusion in the Work
  133         -
      by You to the Licensor shall be under the terms and conditions of
  134         -
      this License, without any additional terms or conditions.
  135         -
      Notwithstanding the above, nothing herein shall supersede or modify
  136         -
      the terms of any separate license agreement you may have executed
  137         -
      with Licensor regarding such Contributions.
  138         -
  139         -
   6. Trademarks. This License does not grant permission to use the trade
  140         -
      names, trademarks, service marks, or product names of the Licensor,
  141         -
      except as required for reasonable and customary use in describing the
  142         -
      origin of the Work and reproducing the content of the NOTICE file.
  143         -
  144         -
   7. Disclaimer of Warranty. Unless required by applicable law or
  145         -
      agreed to in writing, Licensor provides the Work (and each
  146         -
      Contributor provides its Contributions) on an "AS IS" BASIS,
  147         -
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
  148         -
      implied, including, without limitation, any warranties or conditions
  149         -
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
  150         -
      PARTICULAR PURPOSE. You are solely responsible for determining the
  151         -
      appropriateness of using or redistributing the Work and assume any
  152         -
      risks associated with Your exercise of permissions under this License.
  153         -
  154         -
   8. Limitation of Liability. In no event and under no legal theory,
  155         -
      whether in tort (including negligence), contract, or otherwise,
  156         -
      unless required by applicable law (such as deliberate and grossly
  157         -
      negligent acts) or agreed to in writing, shall any Contributor be
  158         -
      liable to You for damages, including any direct, indirect, special,
  159         -
      incidental, or consequential damages of any character arising as a
  160         -
      result of this License or out of the use or inability to use the
  161         -
      Work (including but not limited to damages for loss of goodwill,
  162         -
      work stoppage, computer failure or malfunction, or any and all
  163         -
      other commercial damages or losses), even if such Contributor
  164         -
      has been advised of the possibility of such damages.
  165         -
  166         -
   9. Accepting Warranty or Additional Liability. While redistributing
  167         -
      the Work or Derivative Works thereof, You may choose to offer,
  168         -
      and charge a fee for, acceptance of support, warranty, indemnity,
  169         -
      or other liability obligations and/or rights consistent with this
  170         -
      License. However, in accepting such obligations, You may act only
  171         -
      on Your own behalf and on Your sole responsibility, not on behalf
  172         -
      of any other Contributor, and only if You agree to indemnify,
  173         -
      defend, and hold each Contributor harmless for any liability
  174         -
      incurred by, or claims asserted against, such Contributor by reason
  175         -
      of your accepting any such warranty or additional liability.

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/README.md

@@ -1,0 +18,0 @@
    1         -
# aws-smithy-legacy-http
    2         -
    3         -
**This is a legacy crate that provides support for `http@0.x` and `hyper@0.x`.**
    4         -
    5         -
Core HTTP primitives for service clients generated by [smithy-rs](https://github.com/smithy-lang/smithy-rs) including:
    6         -
- HTTP Body implementation
    7         -
- Endpoint support
    8         -
- HTTP header deserialization
    9         -
- Event streams
   10         -
- `ByteStream`: _(supported on crate feature `rt-tokio` only)_ a misuse-resistant abstraction for streaming binary data
   11         -
   12         -
## Usage
   13         -
   14         -
This crate is used when generating server SDKs without the `http-1x` codegen flag. For new projects, prefer using `aws-smithy-http` which supports `http@1.x` and `hyper@1.x`.
   15         -
   16         -
<!-- anchor_start:footer -->
   17         -
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.
   18         -
<!-- anchor_end:footer -->

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/additional-ci

@@ -1,0 +12,0 @@
    1         -
#!/bin/bash
    2         -
#
    3         -
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
    4         -
# SPDX-License-Identifier: Apache-2.0
    5         -
#
    6         -
    7         -
# This script contains additional CI checks to run for this specific package
    8         -
    9         -
set -e
   10         -
   11         -
echo "### Testing every combination of features (excluding --all-features)"
   12         -
cargo hack test --feature-powerset --exclude-all-features

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/external-types.toml

@@ -1,0 +21,0 @@
    1         -
allowed_external_types = [
    2         -
    "aws_smithy_runtime_api::*",
    3         -
    "aws_smithy_types::*",
    4         -
    "bytes::bytes::Bytes",
    5         -
    "http::error::Error",
    6         -
    "http::header::map::HeaderMap",
    7         -
    "http::header::map::ValueIter",
    8         -
    "http::header::name::HeaderName",
    9         -
    "http::header::value::HeaderValue",
   10         -
    "http::request::Builder",
   11         -
    "http::request::Request",
   12         -
    "http::response::Builder",
   13         -
    "http::response::Response",
   14         -
    "http::uri::Uri",
   15         -
   16         -
    # TODO(https://github.com/smithy-lang/smithy-rs/issues/1193): Once tooling permits it, only allow the following types in the `event-stream` feature
   17         -
    "futures_core::stream::Stream",
   18         -
   19         -
    # TODO(https://github.com/smithy-lang/smithy-rs/issues/1193): Once tooling permits it, only allow the following types in the `event-stream` feature
   20         -
    "aws_smithy_eventstream::*",
   21         -
]

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/fuzz/Cargo.toml

@@ -1,0 +27,0 @@
    1         -
# Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
[[bin]]
    3         -
name = "read_many_from_str"
    4         -
path = "fuzz_targets/read_many_from_str.rs"
    5         -
test = false
    6         -
doc = false
    7         -
    8         -
[package]
    9         -
name = "aws-smithy-http-fuzz"
   10         -
version = "0.0.0"
   11         -
authors = ["Automatically generated"]
   12         -
publish = false
   13         -
edition = "2021"
   14         -
   15         -
[package.metadata]
   16         -
cargo-fuzz = true
   17         -
   18         -
[dependencies]
   19         -
libfuzzer-sys = "=0.4.7"
   20         -
http = "0.2.3"
   21         -
   22         -
[dependencies.aws-smithy-http]
   23         -
path = ".."
   24         -
version = "0.62.6"
   25         -
   26         -
[workspace]
   27         -
members = ["."]

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/fuzz/fuzz_targets/read_many_from_str.rs

@@ -1,0 +19,0 @@
    1         -
/*
    2         -
 * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
    3         -
 * SPDX-License-Identifier: Apache-2.0
    4         -
 */
    5         -
    6         -
#![no_main]
    7         -
use libfuzzer_sys::fuzz_target;
    8         -
    9         -
use aws_smithy_legacy_http::header::read_many_from_str;
   10         -
use http;
   11         -
   12         -
fuzz_target!(|data: &[u8]| {
   13         -
    if let Ok(s) = std::str::from_utf8(data) {
   14         -
        if let Ok(req) = http::Request::builder().header("test", s).body(()) {
   15         -
            // Shouldn't panic
   16         -
            let _ = read_many_from_str::<String>(req.headers().get_all("test").iter());
   17         -
        }
   18         -
    }
   19         -
});

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/proptest-regressions/label.txt

@@ -1,0 +10,0 @@
    1         -
# Seeds for failure cases proptest has generated in the past. It is
    2         -
# automatically read and these particular cases re-run before any
    3         -
# novel cases are generated.
    4         -
#
    5         -
# It is recommended to check this file in to source control so that
    6         -
# everyone who runs the test benefits from these saved cases.
    7         -
cc dfac816a3fc3fff8523f1a1707da0065b72fc3c0d70fce001627a8e2e7ee5e0e # shrinks to s = ">"
    8         -
cc 22bce3cd581f5f5a55e6ba18b1fb027481a496f6b35fee6dc4ef84659b99ddca # shrinks to s = "`"
    9         -
cc be619cccfee48e3bf642cf0f82e98e00dceccbe10963fbaf3a622a68a55a3227 # shrinks to s = "?\""
   10         -
cc 3e0b2e6f64642d7c58e5d2fe9223f75238a874bd8c3812dcb3ecc721d9aa0243 # shrinks to s = " "

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/proptest-regressions/query.txt

@@ -1,0 +9,0 @@
    1         -
# Seeds for failure cases proptest has generated in the past. It is
    2         -
# automatically read and these particular cases re-run before any
    3         -
# novel cases are generated.
    4         -
#
    5         -
# It is recommended to check this file in to source control so that
    6         -
# everyone who runs the test benefits from these saved cases.
    7         -
cc b8ff8401495a7e4b4604f4438d8fc6b0ba63a58ddf58273ddcb3bb511e5cf91a # shrinks to s = "<"
    8         -
cc 59ee40f6a097f80254a91d0ee7d6cde97a353f7ccdf83eddd1d437781019431f # shrinks to s = "\""
    9         -
cc 65e6e5f9082c6cbebf599af889721d30d8ee2388f2f7be372520aa86526c8379 # shrinks to s = ">"

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/src/endpoint.rs

@@ -1,0 +71,0 @@
    1         -
/*
    2         -
 * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
    3         -
 * SPDX-License-Identifier: Apache-2.0
    4         -
 */
    5         -
    6         -
//! Code for resolving an endpoint (URI) that a request should be sent to
    7         -
    8         -
use aws_smithy_runtime_api::client::endpoint::{error::InvalidEndpointError, EndpointPrefix};
    9         -
use std::borrow::Cow;
   10         -
use std::result::Result as StdResult;
   11         -
use std::str::FromStr;
   12         -
   13         -
pub mod error;
   14         -
pub use error::ResolveEndpointError;
   15         -
   16         -
/// An endpoint-resolution-specific Result. Contains either an [`Endpoint`](aws_smithy_types::endpoint::Endpoint) or a [`ResolveEndpointError`].
   17         -
#[deprecated(since = "0.60.1", note = "Was never used.")]
   18         -
pub type Result = std::result::Result<aws_smithy_types::endpoint::Endpoint, ResolveEndpointError>;
   19         -
   20         -
/// Apply `endpoint` to `uri`
   21         -
///
   22         -
/// This method mutates `uri` by setting the `endpoint` on it
   23         -
pub fn apply_endpoint(
   24         -
    uri: &mut http_1x::Uri,
   25         -
    endpoint: &http_1x::Uri,
   26         -
    prefix: Option<&EndpointPrefix>,
   27         -
) -> StdResult<(), InvalidEndpointError> {
   28         -
    let prefix = prefix.map(EndpointPrefix::as_str).unwrap_or("");
   29         -
    let authority = endpoint
   30         -
        .authority()
   31         -
        .as_ref()
   32         -
        .map(|auth| auth.as_str())
   33         -
        .unwrap_or("");
   34         -
    let authority = if !prefix.is_empty() {
   35         -
        Cow::Owned(format!("{prefix}{authority}"))
   36         -
    } else {
   37         -
        Cow::Borrowed(authority)
   38         -
    };
   39         -
    let authority = http_1x::uri::Authority::from_str(&authority).map_err(|err| {
   40         -
        InvalidEndpointError::failed_to_construct_authority(authority.into_owned(), err)
   41         -
    })?;
   42         -
    let scheme = *endpoint
   43         -
        .scheme()
   44         -
        .as_ref()
   45         -
        .ok_or_else(InvalidEndpointError::endpoint_must_have_scheme)?;
   46         -
    let new_uri = http_1x::Uri::builder()
   47         -
        .authority(authority)
   48         -
        .scheme(scheme.clone())
   49         -
        .path_and_query(merge_paths(endpoint, uri).as_ref())
   50         -
        .build()
   51         -
        .map_err(InvalidEndpointError::failed_to_construct_uri)?;
   52         -
    *uri = new_uri;
   53         -
    Ok(())
   54         -
}
   55         -
   56         -
fn merge_paths<'a>(endpoint: &'a http_1x::Uri, uri: &'a http_1x::Uri) -> Cow<'a, str> {
   57         -
    if let Some(query) = endpoint.path_and_query().and_then(|pq| pq.query()) {
   58         -
        tracing::warn!(query = %query, "query specified in endpoint will be ignored during endpoint resolution");
   59         -
    }
   60         -
    let endpoint_path = endpoint.path();
   61         -
    let uri_path_and_query = uri.path_and_query().map(|pq| pq.as_str()).unwrap_or("");
   62         -
    if endpoint_path.is_empty() {
   63         -
        Cow::Borrowed(uri_path_and_query)
   64         -
    } else {
   65         -
        let ep_no_slash = endpoint_path.strip_suffix('/').unwrap_or(endpoint_path);
   66         -
        let uri_path_no_slash = uri_path_and_query
   67         -
            .strip_prefix('/')
   68         -
            .unwrap_or(uri_path_and_query);
   69         -
        Cow::Owned(format!("{ep_no_slash}/{uri_path_no_slash}"))
   70         -
    }
   71         -
}

tmp-codegen-diff/aws-sdk/sdk/aws-smithy-legacy-http/src/endpoint/error.rs

@@ -1,0 +137,0 @@
    1         -
/*
    2         -
 * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
    3         -
 * SPDX-License-Identifier: Apache-2.0
    4         -
 */
    5         -
    6         -
//! Errors related to endpoint resolution and validation
    7         -
    8         -
use std::error::Error;
    9         -
use std::fmt;
   10         -
   11         -
/// Endpoint resolution failed
   12         -
#[derive(Debug)]
   13         -
pub struct ResolveEndpointError {
   14         -
    message: String,
   15         -
    source: Option<Box<dyn Error + Send + Sync>>,
   16         -
}
   17         -
   18         -
impl ResolveEndpointError {
   19         -
    /// Create an [`ResolveEndpointError`] with a message
   20         -
    pub fn message(message: impl Into<String>) -> Self {
   21         -
        Self {
   22         -
            message: message.into(),
   23         -
            source: None,
   24         -
        }
   25         -
    }
   26         -
   27         -
    /// Add a source to the error
   28         -
    pub fn with_source(self, source: Option<Box<dyn Error + Send + Sync>>) -> Self {
   29         -
        Self { source, ..self }
   30         -
    }
   31         -
   32         -
    /// Create a [`ResolveEndpointError`] from a message and a source
   33         -
    pub fn from_source(
   34         -
        message: impl Into<String>,
   35         -
        source: impl Into<Box<dyn Error + Send + Sync>>,
   36         -
    ) -> Self {
   37         -
        Self::message(message).with_source(Some(source.into()))
   38         -
    }
   39         -
}
   40         -
   41         -
impl fmt::Display for ResolveEndpointError {
   42         -
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
   43         -
        write!(f, "{}", self.message)
   44         -
    }
   45         -
}
   46         -
   47         -
impl Error for ResolveEndpointError {
   48         -
    fn source(&self) -> Option<&(dyn Error + 'static)> {
   49         -
        self.source.as_ref().map(|err| err.as_ref() as _)
   50         -
    }
   51         -
}
   52         -
   53         -
#[derive(Debug)]
   54         -
pub(super) enum InvalidEndpointErrorKind {
   55         -
    EndpointMustHaveScheme,
   56         -
    FailedToConstructAuthority {
   57         -
        authority: String,
   58         -
        source: Box<dyn Error + Send + Sync + 'static>,
   59         -
    },
   60         -
    FailedToConstructUri {
   61         -
        source: Box<dyn Error + Send + Sync + 'static>,
   62         -
    },
   63         -
}
   64         -
   65         -
/// An error that occurs when an endpoint is found to be invalid. This usually occurs due to an
   66         -
/// incomplete URI.
   67         -
#[derive(Debug)]
   68         -
pub struct InvalidEndpointError {
   69         -
    pub(super) kind: InvalidEndpointErrorKind,
   70         -
}
   71         -
   72         -
impl InvalidEndpointError {
   73         -
    /// Construct a build error for a missing scheme
   74         -
    pub fn endpoint_must_have_scheme() -> Self {
   75         -
        Self {
   76         -
            kind: InvalidEndpointErrorKind::EndpointMustHaveScheme,
   77         -
        }
   78         -
    }
   79         -
   80         -
    /// Construct a build error for an invalid authority
   81         -
    pub fn failed_to_construct_authority(
   82         -
        authority: impl Into<String>,
   83         -
        source: impl Into<Box<dyn Error + Send + Sync + 'static>>,
   84         -
    ) -> Self {
   85         -
        Self {
   86         -
            kind: InvalidEndpointErrorKind::FailedToConstructAuthority {
   87         -
                authority: authority.into(),
   88         -
                source: source.into(),
   89         -
            },
   90         -
        }
   91         -
    }
   92         -
   93         -
    /// Construct a build error for an invalid URI
   94         -
    pub fn failed_to_construct_uri(
   95         -
        source: impl Into<Box<dyn Error + Send + Sync + 'static>>,
   96         -
    ) -> Self {
   97         -
        Self {
   98         -
            kind: InvalidEndpointErrorKind::FailedToConstructUri {
   99         -
                source: source.into(),
  100         -
            },
  101         -
        }
  102         -
    }
  103         -
}
  104         -
  105         -
impl From<InvalidEndpointErrorKind> for InvalidEndpointError {
  106         -
    fn from(kind: InvalidEndpointErrorKind) -> Self {
  107         -
        Self { kind }
  108         -
    }
  109         -
}
  110         -
  111         -
impl fmt::Display for InvalidEndpointError {
  112         -
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
  113         -
        use InvalidEndpointErrorKind as ErrorKind;
  114         -
        match &self.kind {
  115         -
            ErrorKind::EndpointMustHaveScheme => write!(f, "endpoint must contain a valid scheme"),
  116         -
            ErrorKind::FailedToConstructAuthority { authority, source: _ } => write!(
  117         -
                f,
  118         -
                "endpoint must contain a valid authority when combined with endpoint prefix: {authority}"
  119         -
            ),
  120         -
            ErrorKind::FailedToConstructUri { .. } => write!(f, "failed to construct URI"),
  121         -
        }
  122         -
    }
  123         -
}
  124         -
  125         -
impl Error for InvalidEndpointError {
  126         -
    fn source(&self) -> Option<&(dyn Error + 'static)> {
  127         -
        use InvalidEndpointErrorKind as ErrorKind;
  128         -
        match &self.kind {
  129         -
            ErrorKind::FailedToConstructUri { source } => Some(source.as_ref()),
  130         -
            ErrorKind::FailedToConstructAuthority {
  131         -
                authority: _,
  132         -
                source,
  133         -
            } => Some(source.as_ref()),
  134         -
            ErrorKind::EndpointMustHaveScheme => None,
  135         -
        }
  136         -
    }
  137         -
}