Skip to content

Fix payload deserialization where we need to return an Optional type when the member is non-streaming #1166

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

Merged
merged 5 commits into from
Feb 8, 2022
Merged

Fix payload deserialization where we need to return an Optional type when the member is non-streaming #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b714a8f
Fix payload serialization where we need to return an Optional type wh…
crisidev Feb 7, 2022
d54bc59
Merge branch 'main' into full-s3-model
crisidev Feb 7, 2022
076ec4e
Add little example to simple.smithy covering a required httpPayload i…
crisidev Feb 8, 2022
b27fd90
Fix typo
crisidev Feb 8, 2022
3ac2b85
Fix docstring
crisidev Feb 8, 2022
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
24 changes: 24 additions & 0 deletions codegen-server-test/model/simple.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ service SimpleService {
],
operations: [
Healthcheck,
StoreServiceBlob,
],
}

Expand Down Expand Up @@ -105,3 +106,26 @@ structure HealthcheckInputRequest {
structure HealthcheckOutputResponse {

}

@readonly
@http(method: "GET", uri: "/service/{id}/blob")
@documentation("Stores a blob for a service id")
operation StoreServiceBlob {
input: StoreServiceBlobInput,
output: StoreServiceBlobOutput
}

@documentation("Store a blob for a service id input structure")
structure StoreServiceBlobInput {
@required
@httpLabel
id: ServiceId,
@required
@httpPayload
content: Blob,
}

@documentation("Store a blob for a service id output structure")
structure StoreServiceBlobOutput {

}
7 changes: 5 additions & 2 deletions ...kotlin/software/amazon/smithy/rust/codegen/smithy/generators/http/HttpBindingGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class HttpBindingGenerator(
}

/**
* Generate a function to deserialize `[binding]` from the response payload.
* Generate a function to deserialize `[binding]` from the request / response payload.
*/
fun generateDeserializePayloadFn(
operationShape: OperationShape,
Expand All @@ -181,10 +181,10 @@ class HttpBindingGenerator(
httpMessageType: HttpMessageType = HttpMessageType.RESPONSE
): RuntimeType {
check(binding.location == HttpBinding.Location.PAYLOAD)
val outputT = symbolProvider.toSymbol(binding.member)
val fnName = "deser_payload_${fnName(operationShape, binding)}"
return RuntimeType.forInlineFun(fnName, httpSerdeModule) { rustWriter ->
if (binding.member.isStreaming(model)) {
val outputT = symbolProvider.toSymbol(binding.member)
rustWriter.rustBlock(
"pub fn $fnName(body: &mut #T) -> std::result::Result<#T, #T>",
RuntimeType.sdkBody(runtimeConfig),
Expand All @@ -200,6 +200,9 @@ class HttpBindingGenerator(
}
}
} else {
// The output needs to be Optional when deserializing the payload body or the caller signature
// will not match.
val outputT = symbolProvider.toSymbol(binding.member).makeOptional()
rustWriter.rustBlock("pub fn $fnName(body: &[u8]) -> std::result::Result<#T, #T>", outputT, errorT) {
deserializePayloadBody(
binding,
Expand Down