Remove deprecated ResolveAwsEndpoint and related interfaces. (#2464)

* Remove deprecated ResolveAwsEndpoint and related interfaces.

* update changelog with pointer

* Rename AwsEndpointDecorator to have a more appropriate name

* Allow endpoint resolver to be omitted

Author: rcoh

CHANGELOG.next.toml

@@ -288,7 +288,6 @@ references = ["smithy-rs#2448"]
 meta = { "breaking" = true, "tada" = false, "bug" = false, "target" = "client" }
 author = "jdisanti"
 
-
 [[smithy-rs]]
 message = "Fix bug in timestamp format resolution. Prior to this fix, the timestamp format may have been incorrect if set on the target instead of on the member."
 references = ["smithy-rs#2226"]
@@ -339,8 +338,6 @@ references = ["smithy-rs#2467"]
 meta = { "breaking" = true, "tada" = true, "bug" = false, "target" = "all" }
 author = "Velfi"
 
-###############
-
 [[aws-sdk-rust]]
 message = """Default connector provided by `aws-config` now respects `ConnectorSettings`.
 
@@ -353,6 +350,14 @@ references = ["smithy-rs#2471", "smithy-rs#2333", "smithy-rs#2151"]
 meta = { "breaking" = false, "tada" = false, "bug" = true }
 author = "rcoh"
 
+[[aws-sdk-rust]] # remove interfaces
+message = """Remove deprecated `ResolveAwsEndpoint` interfaces.
+[For details see the longform changelog entry](https://github.com/awslabs/aws-sdk-rust/discussions/755).
+"""
+author = "rcoh"
+references = ["smithy-rs#2390", "smithy-rs#1784"]
+meta = { "breaking" = true, "tada" = false, "bug" = false }
+
 [[smithy-rs]] # tokio-upgrade
 message = "Increase Tokio version to 1.23.1 for all crates. This is to address [RUSTSEC-2023-0001](https://rustsec.org/advisories/RUSTSEC-2023-0001)"
 references = ["smithy-rs#2474"]

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

@@ -159,7 +159,6 @@ mod loader {
     use aws_smithy_types::timeout::TimeoutConfig;
     use aws_types::app_name::AppName;
     use aws_types::docs_for;
-    use aws_types::endpoint::ResolveAwsEndpoint;
     use aws_types::SdkConfig;
 
     use crate::connector::default_connector;
@@ -181,7 +180,6 @@ mod loader {
         app_name: Option<AppName>,
         credentials_cache: Option<CredentialsCache>,
         credentials_provider: Option<SharedCredentialsProvider>,
-        endpoint_resolver: Option<Arc<dyn ResolveAwsEndpoint>>,
         endpoint_url: Option<String>,
         region: Option<Box<dyn ProvideRegion>>,
         retry_config: Option<RetryConfig>,
@@ -345,36 +343,6 @@ mod loader {
             self
         }
 
-        /// Override the endpoint resolver used for **all** AWS Services
-        ///
-        /// This method is deprecated. Use [`Self::endpoint_url`] instead.
-        ///
-        /// This method will override the endpoint resolver used for **all** AWS services. This mainly
-        /// exists to set a static endpoint for tools like `LocalStack`. For live traffic, AWS services
-        /// require the service-specific endpoint resolver they load by default.
-        ///
-        /// # Examples
-        ///
-        /// Use a static endpoint for all services
-        /// ```no_run
-        /// # async fn create_config() -> Result<(), aws_smithy_http::endpoint::error::InvalidEndpointError> {
-        /// use aws_config::endpoint::Endpoint;
-        ///
-        /// let sdk_config = aws_config::from_env()
-        ///     .endpoint_resolver(Endpoint::immutable("http://localhost:1234")?)
-        ///     .load()
-        ///     .await;
-        /// # Ok(())
-        /// # }
-        #[deprecated(note = "use `.endpoint_url(...)` instead")]
-        pub fn endpoint_resolver(
-            mut self,
-            endpoint_resolver: impl ResolveAwsEndpoint + 'static,
-        ) -> Self {
-            self.endpoint_resolver = Some(Arc::new(endpoint_resolver));
-            self
-        }
-
         /// Provides the ability to programmatically override the profile files that get loaded by the SDK.
         ///
         /// The [`Default`] for `ProfileFiles` includes the default SDK config and credential files located in
@@ -600,8 +568,6 @@ mod loader {
                 SharedCredentialsProvider::new(builder.build().await)
             };
 
-            let endpoint_resolver = self.endpoint_resolver;
-
             let mut builder = SdkConfig::builder()
                 .region(region)
                 .retry_config(retry_config)
@@ -610,7 +576,6 @@ mod loader {
                 .credentials_provider(credentials_provider)
                 .http_connector(http_connector);
 
-            builder.set_endpoint_resolver(endpoint_resolver);
             builder.set_app_name(app_name);
             builder.set_sleep_impl(sleep_impl);
             builder.set_endpoint_url(self.endpoint_url);

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

@@ -5,84 +5,17 @@
 
 #![allow(clippy::derive_partial_eq_without_eq)]
 
-use std::collections::HashMap;
 use std::error::Error;
 use std::fmt;
-use std::sync::Arc;
 
-use aws_smithy_http::endpoint::error::ResolveEndpointError;
-use aws_smithy_http::endpoint::ResolveEndpoint;
 use aws_smithy_http::middleware::MapRequest;
 use aws_smithy_http::operation::Request;
 use aws_smithy_types::endpoint::Endpoint as SmithyEndpoint;
 use aws_smithy_types::Document;
 
-pub use aws_types::endpoint::{AwsEndpoint, BoxError, CredentialScope, ResolveAwsEndpoint};
 use aws_types::region::{Region, SigningRegion};
 use aws_types::SigningService;
 
-#[doc(hidden)]
-pub struct Params {
-    region: Option<Region>,
-}
-
-impl Params {
-    pub fn new(region: Option<Region>) -> Self {
-        Self { region }
-    }
-}
-
-#[doc(hidden)]
-pub struct EndpointShim(Arc<dyn ResolveAwsEndpoint>);
-impl EndpointShim {
-    pub fn from_resolver(resolver: impl ResolveAwsEndpoint + 'static) -> Self {
-        Self(Arc::new(resolver))
-    }
-
-    pub fn from_arc(arc: Arc<dyn ResolveAwsEndpoint>) -> Self {
-        Self(arc)
-    }
-}
-
-impl<T> ResolveEndpoint<T> for EndpointShim
-where
-    T: Clone + Into<Params>,
-{
-    fn resolve_endpoint(&self, params: &T) -> Result<SmithyEndpoint, ResolveEndpointError> {
-        let params: Params = params.clone().into();
-        let aws_endpoint = self
-            .0
-            .resolve_endpoint(
-                params
-                    .region
-                    .as_ref()
-                    .ok_or_else(|| ResolveEndpointError::message("no region in params"))?,
-            )
-            .map_err(|err| {
-                ResolveEndpointError::message("failure resolving endpoint").with_source(Some(err))
-            })?;
-        let uri = aws_endpoint.endpoint().uri();
-        let mut auth_scheme =
-            HashMap::from([("name".to_string(), Document::String("sigv4".into()))]);
-        if let Some(region) = aws_endpoint.credential_scope().region() {
-            auth_scheme.insert(
-                "signingRegion".to_string(),
-                region.as_ref().to_string().into(),
-            );
-        }
-        if let Some(service) = aws_endpoint.credential_scope().service() {
-            auth_scheme.insert(
-                "signingName".to_string(),
-                service.as_ref().to_string().into(),
-            );
-        }
-        Ok(SmithyEndpoint::builder()
-            .url(uri.to_string())
-            .property("authSchemes", vec![Document::Object(auth_scheme)])
-            .build())
-    }
-}
-
 /// Middleware Stage to add authentication information from a Smithy endpoint into the property bag
 ///
 /// AwsAuthStage implements [`MapRequest`](MapRequest). It will:
@@ -95,7 +28,7 @@ pub struct AwsAuthStage;
 #[derive(Debug)]
 enum AwsAuthStageErrorKind {
     NoEndpointResolver,
-    EndpointResolutionError(BoxError),
+    EndpointResolutionError(Box<dyn Error + Send + Sync>),
 }
 
 #[derive(Debug)]

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

@@ -16,9 +16,6 @@
 
 pub mod app_name;
 pub mod build_metadata;
-#[deprecated(since = "0.9.0", note = "renamed to sdk_config")]
-pub mod config;
-pub mod endpoint;
 #[doc(hidden)]
 pub mod os_shim_internal;
 pub mod region;