Skip to content

Small codegen fixes for SigV4 EventStreams #4398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Small codegen fixes for SigV4 EventStreams #4398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...ware/amazon/smithy/rust/codegen/server/smithy/customizations/SigV4EventStreamDecorator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package software.amazon.smithy.rust.codegen.server.smithy.customizations

import software.amazon.smithy.aws.traits.auth.SigV4ATrait
import software.amazon.smithy.aws.traits.auth.SigV4Trait
import software.amazon.smithy.codegen.core.Symbol
import software.amazon.smithy.model.knowledge.ServiceIndex
Expand Down Expand Up @@ -50,8 +51,10 @@ class SigV4EventStreamDecorator : ServerCodegenDecorator {
}
}

internal fun RustSymbolProvider.usesSigAuth(): Boolean =
ServiceIndex.of(model).getAuthSchemes(moduleProviderContext.serviceShape!!).containsKey(SigV4Trait.ID)
internal fun RustSymbolProvider.usesSigAuth(): Boolean {
val authSchemes = ServiceIndex.of(model).getAuthSchemes(moduleProviderContext.serviceShape!!)
return authSchemes.containsKey(SigV4Trait.ID) || authSchemes.containsKey(SigV4ATrait.ID)
}

// Goes from `T` to `SignedEvent<T>`
fun wrapInSignedEvent(
Expand Down
27 changes: 21 additions & 6 deletions ...zon/smithy/rust/codegen/server/smithy/customizations/SigV4EventStreamSupportStructures.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import software.amazon.smithy.rust.codegen.core.rustlang.RustType
import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType
import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType.Companion.preludeScope
import software.amazon.smithy.rust.codegen.core.smithy.mapRustType
import software.amazon.smithy.rust.codegen.core.smithy.rustType
import software.amazon.smithy.rust.codegen.core.util.PANIC
Expand Down Expand Up @@ -77,11 +78,12 @@ object SigV4EventStreamSupportStructures {
##[derive(Debug, Clone)]
pub struct SignatureInfo {
/// The chunk signature bytes from the `:chunk-signature` header
pub chunk_signature: Vec<u8>,
pub chunk_signature: #{Vec}<u8>,
/// The timestamp from the `:date` header
pub timestamp: #{SystemTime},
}
""",
*preludeScope,
"SystemTime" to RuntimeType.std.resolve("time::SystemTime"),
)
}
Expand Down Expand Up @@ -116,18 +118,25 @@ object SigV4EventStreamSupportStructures {
##[derive(Debug)]
pub enum SignedEventError<E> {
/// Error from the underlying event stream
Event(E),
Event {
/// The error from the underlying event stream
error: E,
/// Signature information if the message was signed
signature: #{Option}<#{SignatureInfo}>,
},
/// Error extracting signed message
InvalidSignedEvent(#{ExtractionError}),
}

impl<E> From<E> for SignedEventError<E> {
fn from(err: E) -> Self {
SignedEventError::Event(err)
SignedEventError::Event { error: err, signature: None }
}
}
""",
"ExtractionError" to extractionError(runtimeConfig),
"SignatureInfo" to signatureInfo(),
*preludeScope,
)
}

Expand Down Expand Up @@ -182,11 +191,14 @@ object SigV4EventStreamSupportStructures {
#{UnmarshalledMessage}::Event(event) => {
Ok(#{UnmarshalledMessage}::Event(#{SignedEvent} {
message: event,
signature: Some(signature),
signature: Some(signature.clone()),
}))
}
#{UnmarshalledMessage}::Error(err) => {
Ok(#{UnmarshalledMessage}::Error(#{SignedEventError}::Event(err)))
Ok(#{UnmarshalledMessage}::Error(#{SignedEventError}::Event {
error: err,
signature: Some(signature),
}))
}
},
Err(err) => Err(err),
Expand All @@ -203,7 +215,10 @@ object SigV4EventStreamSupportStructures {
}))
}
#{UnmarshalledMessage}::Error(err) => {
Ok(#{UnmarshalledMessage}::Error(#{SignedEventError}::Event(err)))
Ok(#{UnmarshalledMessage}::Error(#{SignedEventError}::Event {
error: err,
signature: None,
}))
}
},
Err(err) => Err(err),
Expand Down
Loading