Remove deprecations from rust-runtime

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

@@ -5,11 +5,7 @@
 
 use aws_smithy_runtime_api::client::result::SdkError;
 use aws_smithy_runtime_api::http::{Headers, Response};
-use aws_smithy_types::error::metadata::{
-    Builder as ErrorMetadataBuilder, ErrorMetadata, ProvideErrorMetadata,
-};
-#[allow(deprecated)]
-use aws_smithy_types::error::Unhandled;
+use aws_smithy_types::error::metadata::{Builder as ErrorMetadataBuilder, ErrorMetadata};
 
 const EXTENDED_REQUEST_ID: &str = "s3_extended_request_id";
 
@@ -37,13 +33,6 @@ impl RequestIdExt for ErrorMetadata {
     }
 }
 
-#[allow(deprecated)]
-impl RequestIdExt for Unhandled {
-    fn extended_request_id(&self) -> Option<&str> {
-        self.meta().extended_request_id()
-    }
-}
-
 impl<B> RequestIdExt for Response<B> {
     fn extended_request_id(&self) -> Option<&str> {
         self.headers().extended_request_id()
@@ -92,7 +81,7 @@ mod test {
     fn handle_missing_header() {
         let resp =
             Response::try_from(http::Response::builder().status(400).body("").unwrap()).unwrap();
-        let mut builder = aws_smithy_types::Error::builder().message("123");
+        let mut builder = ErrorMetadata::builder().message("123");
         builder = apply_extended_request_id(builder, resp.headers());
         assert_eq!(builder.build().extended_request_id(), None);
     }

aws/rust-runtime/aws-runtime/src/retries/classifiers.rs

@@ -167,7 +167,7 @@ mod test {
     #[test]
     fn classify_generic() {
         let policy = AwsErrorCodeClassifier::<ErrorMetadata>::new();
-        let err = aws_smithy_types::Error::builder().code("SlowDown").build();
+        let err = ErrorMetadata::builder().code("SlowDown").build();
         let test_response = http::Response::new("OK").map(SdkBody::from);
 
         let mut ctx = InterceptorContext::new(Input::doesnt_matter());
@@ -180,7 +180,7 @@ mod test {
     #[test]
     fn test_retry_after_header() {
         let policy = AwsErrorCodeClassifier::<ErrorMetadata>::new();
-        let err = aws_smithy_types::Error::builder().code("SlowDown").build();
+        let err = ErrorMetadata::builder().code("SlowDown").build();
         let res = http::Response::builder()
             .header("x-amz-retry-after", "5000")
             .body("retry later")

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

@@ -8,12 +8,7 @@
 use aws_smithy_runtime_api::client::result::SdkError;
 use aws_smithy_runtime_api::http::Headers;
 use aws_smithy_runtime_api::http::Response;
-use aws_smithy_types::error::metadata::{
-    Builder as ErrorMetadataBuilder, ErrorMetadata, ProvideErrorMetadata,
-};
-
-#[allow(deprecated)]
-use aws_smithy_types::error::Unhandled;
+use aws_smithy_types::error::metadata::{Builder as ErrorMetadataBuilder, ErrorMetadata};
 
 /// Constant for the [`ErrorMetadata`] extra field that contains the request ID
 const AWS_REQUEST_ID: &str = "aws_request_id";
@@ -40,13 +35,6 @@ impl RequestId for ErrorMetadata {
     }
 }
 
-#[allow(deprecated)]
-impl RequestId for Unhandled {
-    fn request_id(&self) -> Option<&str> {
-        self.meta().request_id()
-    }
-}
-
 impl<B> RequestId for Response<B> {
     fn request_id(&self) -> Option<&str> {
         self.headers().request_id()

aws/sdk/integration-tests/dynamodb/benches/deserialization_bench.rs

@@ -6,7 +6,7 @@
 use aws_sdk_dynamodb::operation::query::QueryOutput;
 use aws_smithy_runtime_api::client::orchestrator::HttpResponse;
 use aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin;
-use aws_smithy_runtime_api::client::ser_de::{ResponseDeserializer, SharedResponseDeserializer};
+use aws_smithy_runtime_api::client::ser_de::{DeserializeResponse, SharedResponseDeserializer};
 use aws_smithy_types::body::SdkBody;
 use criterion::{criterion_group, criterion_main, Criterion};
 

codegen-client/src/test/kotlin/software/amazon/smithy/rust/codegen/client/smithy/customizations/HttpAuthDecoratorTest.kt

@@ -113,7 +113,6 @@ class HttpAuthDecoratorTest {
                         IdentityFuture, ResolveIdentity, SharedIdentityResolver,
                     };
                     use aws_smithy_runtime_api::box_error::BoxError;
-                    use aws_smithy_runtime_api::client::auth::Signer;
                     use aws_smithy_runtime_api::client::runtime_components::RuntimeComponents;
                     use aws_smithy_runtime_api::client::runtime_components::{
                         GetIdentityResolver, RuntimeComponentsBuilder,
@@ -164,7 +163,7 @@ class HttpAuthDecoratorTest {
                     #[derive(Debug)]
                     struct CustomIdentity(String);
 
-                    impl Signer for CustomSigner {
+                    impl Sign for CustomSigner {
                         fn sign_http_request(
                             &self,
                             request: &mut HttpRequest,

codegen-client/src/test/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/error/OperationErrorGeneratorTest.kt

@@ -53,11 +53,12 @@ class OperationErrorGeneratorTest {
                     name = "generates_combined_error_enums",
                     test = """
                         use crate::operation::greeting::GreetingError;
+                        use aws_smithy_types::error::ErrorMetadata;
 
                         let error = GreetingError::InvalidGreeting(
                             InvalidGreeting::builder()
                                 .message("an error")
-                                .meta(aws_smithy_types::Error::builder().code("InvalidGreeting").message("an error").build())
+                                .meta(ErrorMetadata::builder().code("InvalidGreeting").message("an error").build())
                                 .build()
                         );
                         assert_eq!(format!("{}", error), "InvalidGreeting: an error");
@@ -71,7 +72,7 @@ class OperationErrorGeneratorTest {
                         assert_eq!(error.is_complex_error(), false);
 
                         // Unhandled variants properly delegate message.
-                        let error = GreetingError::generic(aws_smithy_types::Error::builder().message("hello").build());
+                        let error = GreetingError::generic(ErrorMetadata::builder().message("hello").build());
                         assert_eq!(error.meta().message(), Some("hello"));
 
                         let error = GreetingError::unhandled("some other error");

codegen-server/python/src/main/kotlin/software/amazon/smithy/rust/codegen/server/python/smithy/generators/PythonServerEventStreamWrapperGenerator.kt

@@ -85,6 +85,7 @@ class PythonServerEventStreamWrapperGenerator(
             "MarshallMessage" to RuntimeType.smithyEventStream(runtimeConfig).resolve("frame::MarshallMessage"),
             "SignMessage" to RuntimeType.smithyEventStream(runtimeConfig).resolve("frame::SignMessage"),
             "MessageStreamAdapter" to RuntimeType.smithyHttp(runtimeConfig).resolve("event_stream::MessageStreamAdapter"),
+            "SdkError" to RuntimeType.sdkError(runtimeConfig),
         )
 
     fun render(writer: RustWriter) {
@@ -227,7 +228,7 @@ class PythonServerEventStreamWrapperGenerator(
                         match next {
                             Ok(Some(data)) => Ok(#{PyO3}::Python::with_gil(|py| #{PyO3}::IntoPy::into_py(data, py))),
                             Ok(None) => Err(#{PyO3}::exceptions::PyStopAsyncIteration::new_err("stream exhausted")),
-                            Err(#{SmithyHttp}::result::SdkError::ServiceError(service_err)) => Err(service_err.into_err().into()),
+                            Err(#{SdkError}::ServiceError(service_err)) => Err(service_err.into_err().into()),
                             Err(err) => Err(#{PyO3}::exceptions::PyRuntimeError::new_err(err.to_string())),
                         }
                     })?;

rust-runtime/aws-smithy-http/src/event_stream/sender.rs

@@ -5,6 +5,7 @@
 
 use aws_smithy_eventstream::frame::{write_message_to, MarshallMessage, SignMessage};
 use aws_smithy_runtime_api::client::result::SdkError;
+use aws_smithy_types::error::ErrorMetadata;
 use bytes::Bytes;
 use futures_core::Stream;
 use std::error::Error as StdError;
@@ -55,7 +56,7 @@ where
 #[derive(Debug)]
 pub struct MessageStreamError {
     kind: MessageStreamErrorKind,
-    pub(crate) meta: aws_smithy_types::Error,
+    pub(crate) meta: ErrorMetadata,
 }
 
 #[derive(Debug)]
@@ -72,8 +73,8 @@ impl MessageStreamError {
         }
     }
 
-    /// Creates the `MessageStreamError::Unhandled` variant from a `aws_smithy_types::Error`.
-    pub fn generic(err: aws_smithy_types::Error) -> Self {
+    /// Creates the `MessageStreamError::Unhandled` variant from an [`ErrorMetadata`].
+    pub fn generic(err: ErrorMetadata) -> Self {
         Self {
             meta: err.clone(),
             kind: MessageStreamErrorKind::Unhandled(err.into()),
@@ -82,7 +83,7 @@ impl MessageStreamError {
 
     /// Returns error metadata, which includes the error code, message,
     /// request ID, and potentially additional information.
-    pub fn meta(&self) -> &aws_smithy_types::Error {
+    pub fn meta(&self) -> &ErrorMetadata {
         &self.meta
     }
 }

rust-runtime/aws-smithy-http/src/lib.rs

@@ -15,7 +15,6 @@
 //! - Endpoint support
 //! - HTTP header deserialization
 //! - Event streams
-//! - [`ByteStream`](byte_stream::ByteStream): a misuse-resistant abstraction for streaming binary data
 //!
 //! | Feature        | Description |
 //! |----------------|-------------|
@@ -25,8 +24,6 @@
 #![allow(clippy::derive_partial_eq_without_eq)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-pub mod body;
-pub mod byte_stream;
 pub mod endpoint;
 // Marked as `doc(hidden)` because a type in the module is used both by this crate and by the code
 // generator, but not by external users. Also, by the module being `doc(hidden)` instead of it being
@@ -40,10 +37,8 @@ pub mod operation;
 pub mod query;
 #[doc(hidden)]
 pub mod query_writer;
-pub mod result;
 
 #[cfg(feature = "event-stream")]
 pub mod event_stream;
 
-pub mod connection;
 mod urlencode;

rust-runtime/aws-smithy-http/src/operation.rs

@@ -9,19 +9,6 @@
 use aws_smithy_types::config_bag::{Storable, StoreReplace};
 use std::borrow::Cow;
 
-//TODO(runtimeCratesVersioningCleanup): Re-point those who use the deprecated type aliases to
-// directly depend on `aws_smithy_types` and remove the type aliases below.
-/// Errors for operations
-pub mod error {
-    /// An error occurred attempting to build an `Operation` from an input.
-    #[deprecated(note = "Moved to `aws_smithy_types::error::operation::BuildError`.")]
-    pub type BuildError = aws_smithy_types::error::operation::BuildError;
-
-    /// An error that occurs when serialization of an operation fails.
-    #[deprecated(note = "Moved to `aws_smithy_types::error::operation::SerializationError`.")]
-    pub type SerializationError = aws_smithy_types::error::operation::SerializationError;
-}
-
 /// Metadata added to the [`ConfigBag`](aws_smithy_types::config_bag::ConfigBag) that identifies the API being called.
 #[derive(Clone, Debug)]
 pub struct Metadata {

rust-runtime/aws-smithy-runtime-api/src/client/auth.rs

@@ -81,9 +81,6 @@ impl Storable for AuthSchemeOptionResolverParams {
     type Storer = StoreReplace<Self>;
 }
 
-#[deprecated(note = "Renamed to ResolveAuthSchemeOptions.")]
-pub use ResolveAuthSchemeOptions as AuthSchemeOptionResolver;
-
 /// Resolver for auth scheme options.
 ///
 /// The orchestrator needs to select an auth scheme to sign requests with, and potentially
@@ -192,9 +189,6 @@ impl ValidateConfig for SharedAuthScheme {}
 
 impl_shared_conversions!(convert SharedAuthScheme from AuthScheme using SharedAuthScheme::new);
 
-#[deprecated(note = "Renamed to Sign.")]
-pub use Sign as Signer;
-
 /// Signing implementation for an auth scheme.
 pub trait Sign: Send + Sync + fmt::Debug {
     /// Sign the given request with the given identity, components, and config.