Server Test

Server Test

rev. 4086b1854579bc6eae24dce129090ceaa6b97f5e

Files changed:

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/protocol_serde/shape_streaming_operation_input.rs

@@ -1,1 +20,15 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
     crate::sigv4_event_stream::SigV4Receiver<
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
     let receiver = crate::sigv4_event_stream::SigV4Receiver::new(unmarshaller, body);
     Ok(receiver)
-15
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/protocol_serde/shape_streaming_operation_with_initial_data_input.rs

@@ -1,1 +20,15 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
     crate::sigv4_event_stream::SigV4Receiver<
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
     let receiver = crate::sigv4_event_stream::SigV4Receiver::new(unmarshaller, body);
     Ok(receiver)
-15
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/protocol_serde/shape_streaming_operation_with_initial_response_input.rs

@@ -1,1 +20,15 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
     crate::sigv4_event_stream::SigV4Receiver<
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
     let receiver = crate::sigv4_event_stream::SigV4Receiver::new(unmarshaller, body);
     Ok(receiver)
-15
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/protocol_serde/shape_streaming_operation_with_optional_data_input.rs

@@ -1,1 +20,15 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
     crate::sigv4_event_stream::SigV4Receiver<
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
     let receiver = crate::sigv4_event_stream::SigV4Receiver::new(unmarshaller, body);
     Ok(receiver)
-15
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/sigv4_event_stream.rs

@@ -1,1 +155,249 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /// Wrapper for event stream messages that may be signed
 /// Receiver wrapper that handles SigV4 signed event stream messages
 #[derive(Debug)]
 pub struct SigV4Receiver<T, E> {
     inner: ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<T>,
         crate::sigv4_event_stream::SignedEventError<E>,
     >,
     initial_signature: ::std::option::Option<crate::sigv4_event_stream::SignatureInfo>,
-+
+}
-+
 impl<T, E> SigV4Receiver<T, E> {
     pub fn new(
         unmarshaller: impl ::aws_smithy_eventstream::frame::UnmarshallMessage<Output = T, Error = E>
             + ::std::marker::Send
             + ::std::marker::Sync
             + 'static,
         body: ::aws_smithy_types::body::SdkBody,
     ) -> Self {
         let sigv4_unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
         Self {
             inner: ::aws_smithy_http::event_stream::Receiver::new(sigv4_unmarshaller, body),
             initial_signature: ::std::option::Option::None,
-+
+        }
-+
+    }
-+
     /// Get the signature from the initial message, if it was signed
     pub fn initial_signature(
         &self,
     ) -> ::std::option::Option<&crate::sigv4_event_stream::SignatureInfo> {
         self.initial_signature.as_ref()
-+
+    }
-+
     /// Try to receive an initial message of the given type.
     /// Handles SigV4-wrapped messages by extracting the inner message first.
     pub async fn try_recv_initial(
         &mut self,
         message_type: ::aws_smithy_http::event_stream::InitialMessageType,
     ) -> ::std::result::Result<
         ::std::option::Option<::aws_smithy_types::event_stream::Message>,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::sigv4_event_stream::SignedEventError<E>,
             ::aws_smithy_types::event_stream::RawMessage,
         >,
-+
+    >
     where
         E: std::error::Error + 'static,
-+
+    {
         let result = self
             .inner
             .try_recv_initial_with_preprocessor(message_type, |message| {
                 match crate::sigv4_event_stream::extract_signed_message(&message) {
                     ::std::result::Result::Ok(MaybeSignedMessage::Signed {
                         message: inner,
                         signature,
                     }) => {
                         ::std::result::Result::Ok((inner, ::std::option::Option::Some(signature)))
-+
+                    }
                     ::std::result::Result::Ok(MaybeSignedMessage::Unsigned) => {
                         ::std::result::Result::Ok((message, ::std::option::Option::None))
-+
+                    }
                     ::std::result::Result::Err(err) => ::std::result::Result::Err(
                         ::aws_smithy_runtime_api::client::result::ResponseError::builder()
                             .raw(::aws_smithy_types::event_stream::RawMessage::Decoded(
                                 message,
                             ))
                             .source(err)
                             .build(),
                     ),
-+
+                }
             })
             .await?;
         match result {
             ::std::option::Option::Some((message, signature)) => {
                 self.initial_signature = signature;
                 ::std::result::Result::Ok(::std::option::Option::Some(message))
-+
+            }
             ::std::option::Option::None => ::std::result::Result::Ok(::std::option::Option::None),
-+
+        }
-+
+    }
-+
     /// Receive the next event from the stream
     /// The SigV4Unmarshaller handles unwrapping, so we just pass through
     pub async fn recv(
         &mut self,
     ) -> ::std::result::Result<
         ::std::option::Option<crate::sigv4_event_stream::SignedEvent<T>>,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::sigv4_event_stream::SignedEventError<E>,
             ::aws_smithy_types::event_stream::RawMessage,
         >,
-+
+    >
     where
         E: std::error::Error + 'static,
-+
+    {
         self.inner.recv().await
-+
+    }
-+
+}
-+
 /// Wrapper for event stream messages that may be signed
 #[derive(Debug, Clone)]
 pub struct SignedEvent<T> {
     /// The actual event message
     pub message: T,
     /// Signature information if the message was signed
     pub signature: ::std::option::Option<crate::sigv4_event_stream::SignatureInfo>,
-107
+}
-108
 /// Error wrapper for signed event stream errors
 #[derive(Debug)]
 pub enum SignedEventError<E> {
     /// Error from the underlying event stream
     Event(E),
     /// Error extracting signed message
     InvalidSignedEvent(crate::sigv4_event_stream::ExtractionError),
-116
+}
-117
 impl<E> From<E> for SignedEventError<E> {
     fn from(err: E) -> Self {
         SignedEventError::Event(err)
-121
+    }
-122
+}
-123
 /// Information extracted from a signed event stream message
 #[non_exhaustive]
 #[derive(Debug, Clone)]
 #[derive(Debug, Clone, PartialEq)]
 pub struct SignatureInfo {
     /// The chunk signature bytes from the `:chunk-signature` header
     pub chunk_signature: Vec<u8>,
     /// The timestamp from the `:date` header
     pub timestamp: ::std::time::SystemTime,
-132
+}
-133
 /// Error type for signed message extraction operations
 #[non_exhaustive]
 #[derive(Debug)]
 pub enum ExtractionError {
     /// The payload could not be decoded as a valid message
     #[non_exhaustive]
     InvalidPayload {
         error: ::aws_smithy_eventstream::error::Error,
     },
     /// The timestamp header is missing or has an invalid format
     #[non_exhaustive]
     InvalidTimestamp,
--
+}
--
 /// Unmarshaller wrapper that handles SigV4 signed event stream messages
 #[derive(Debug)]
 pub struct SigV4Unmarshaller<T> {
     inner: T,
-138
+}
-139
 impl<T> SigV4Unmarshaller<T> {
     pub fn new(inner: T) -> Self {
         Self { inner }
-143
+    }
-144
+}
-145
 impl<T> ::aws_smithy_eventstream::frame::UnmarshallMessage for SigV4Unmarshaller<T>
 where
     T: ::aws_smithy_eventstream::frame::UnmarshallMessage,
-149
+{
     type Output = crate::sigv4_event_stream::SignedEvent<T::Output>;
     type Error = crate::sigv4_event_stream::SignedEventError<T::Error>;
-152
     fn unmarshall(
         &self,
         message: &::aws_smithy_types::event_stream::Message,
     ) -> ::std::result::Result<
         ::aws_smithy_eventstream::frame::UnmarshalledMessage<Self::Output, Self::Error>,
         ::aws_smithy_eventstream::error::Error,
     > {
         // First, try to extract the signed message
         match crate::sigv4_event_stream::extract_signed_message(message) {
             Ok(MaybeSignedMessage::Signed {
             ::std::result::Result::Ok(MaybeSignedMessage::Signed {
                 message: inner_message,
                 signature,
             }) => {
                 // Process the inner message with the base unmarshaller
                 match self.inner.unmarshall(&inner_message) {
                     Ok(unmarshalled) => match unmarshalled {
                     ::std::result::Result::Ok(unmarshalled) => match unmarshalled {
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(event) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(
                                 crate::sigv4_event_stream::SignedEvent {
                                     message: event,
                                     signature: Some(signature),
                                 },
                             ))
                             ::std::result::Result::Ok(
                                 ::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(
                                     crate::sigv4_event_stream::SignedEvent {
                                         message: event,
                                         signature: ::std::option::Option::Some(signature),
                                     },
                                 ),
-+
+                            )
-178
+                        }
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(err) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                                 crate::sigv4_event_stream::SignedEventError::Event(err),
                             ))
                             ::std::result::Result::Ok(
                                 ::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                                     crate::sigv4_event_stream::SignedEventError::Event(err),
                                 ),
-+
+                            )
-185
+                        }
                     },
                     Err(err) => Err(err),
                     ::std::result::Result::Err(err) => ::std::result::Result::Err(err),
-188
+                }
-189
+            }
             Ok(MaybeSignedMessage::Unsigned) => {
             ::std::result::Result::Ok(MaybeSignedMessage::Unsigned) => {
                 // Process unsigned message directly
                 match self.inner.unmarshall(message) {
                     Ok(unmarshalled) => match unmarshalled {
                     ::std::result::Result::Ok(unmarshalled) => match unmarshalled {
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(event) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(
                                 crate::sigv4_event_stream::SignedEvent {
                                     message: event,
                                     signature: None,
                                 },
                             ))
                             ::std::result::Result::Ok(
                                 ::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(
                                     crate::sigv4_event_stream::SignedEvent {
                                         message: event,
                                         signature: ::std::option::Option::None,
                                     },
                                 ),
-+
+                            )
-203
+                        }
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(err) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                                 crate::sigv4_event_stream::SignedEventError::Event(err),
                             ))
                             ::std::result::Result::Ok(
                                 ::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                                     crate::sigv4_event_stream::SignedEventError::Event(err),
                                 ),
-+
+                            )
-210
+                        }
                     },
                     Err(err) => Err(err),
                     ::std::result::Result::Err(err) => ::std::result::Result::Err(err),
-213
+                }
-214
+            }
             Err(extraction_err) => Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                 crate::sigv4_event_stream::SignedEventError::InvalidSignedEvent(extraction_err),
             )),
             ::std::result::Result::Err(extraction_err) => ::std::result::Result::Ok(
                 ::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                     crate::sigv4_event_stream::SignedEventError::InvalidSignedEvent(extraction_err),
                 ),
             ),
-220
+        }
-221
+    }
-222
+}
-223
 /// Result of extracting a potentially signed message
 #[derive(Debug)]
 pub enum MaybeSignedMessage {
     /// Message was signed and has been extracted
     Signed {
         /// The inner message that was signed

↧ Expand context

         message: ::aws_smithy_types::event_stream::Message,
         /// Signature information from the outer message
         signature: crate::sigv4_event_stream::SignatureInfo,
     },
     /// Message was not signed (no `:chunk-signature` header present)
     Unsigned,
-236
+}
-237
 /// Extracts the inner message from a potentially signed event stream message.
 pub fn extract_signed_message(
     message: &::aws_smithy_types::event_stream::Message,
 ) -> ::std::result::Result<MaybeSignedMessage, crate::sigv4_event_stream::ExtractionError> {
     // Check if message has chunk signature
     let mut chunk_signature = None;
     let mut timestamp = None;
-245
     for header in message.headers() {
         match header.name().as_str() {
             ":chunk-signature" => {
                 if let ::aws_smithy_types::event_stream::HeaderValue::ByteArray(bytes) =

@@ -166,260 +0,325 @@

↥ Expand context

                     })?);
                 } else {
                     return Err(crate::sigv4_event_stream::ExtractionError::InvalidTimestamp);
-263
+                }
-264
+            }
             _ => {}
-266
+        }
-267
+    }
-268
     let Some(chunk_signature) = chunk_signature else {
         return Ok(MaybeSignedMessage::Unsigned);
     };
-272
     let Some(timestamp) = timestamp else {
         return Err(crate::sigv4_event_stream::ExtractionError::InvalidTimestamp);
     };
-276
     // Extract inner message
     let cursor = ::std::io::Cursor::new(message.payload());
     let inner_message = ::aws_smithy_eventstream::frame::read_message_from(cursor)

         .map_err(|err| crate::sigv4_event_stream::ExtractionError::InvalidPayload { error: err })?;
-281
     Ok(MaybeSignedMessage::Signed {
         message: inner_message,
         signature: crate::sigv4_event_stream::SignatureInfo {
             chunk_signature,
             timestamp,
         },
     })
-289
+}
-+
 /// Error type for signed message extraction operations
 #[non_exhaustive]
 #[derive(Debug)]
 pub enum ExtractionError {
     /// The payload could not be decoded as a valid message
     #[non_exhaustive]
     InvalidPayload {
         error: ::aws_smithy_eventstream::error::Error,
     },
     /// The timestamp header is missing or has an invalid format
     #[non_exhaustive]
     InvalidTimestamp,
-+
+}
-+
 impl ::std::fmt::Display for ExtractionError {
     fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
         match self {
             ExtractionError::InvalidPayload { error } => {
                 write!(f, "invalid payload: {}", error)
-+
+            }
             ExtractionError::InvalidTimestamp => {
                 write!(f, "invalid or missing timestamp header")
-+
+            }
-+
+        }
-+
+    }
-+
+}
-+
 impl ::std::error::Error for ExtractionError {
     fn source(&self) -> ::std::option::Option<&(dyn ::std::error::Error + 'static)> {
         match self {
             ExtractionError::InvalidPayload { error } => ::std::option::Option::Some(error),
             ExtractionError::InvalidTimestamp => ::std::option::Option::None,
-+
+        }
-+
+    }
-+
+}

Pages: 1 2