Skip to content

Simplify implementation of rendering prefix headers #1841

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
david-perez merged 2 commits into from
Oct 20, 2022
Merged

Simplify implementation of rendering prefix headers #1841

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f4cbf1
Simplify implementation of rendering prefix headers
david-perez Oct 11, 2022
f08ed26
Merge branch 'main' into davidpz/simplify-implementation-of-rendering…
david-perez Oct 20, 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
46 changes: 26 additions & 20 deletions ...n/software/amazon/smithy/rust/codegen/core/smithy/generators/http/HttpBindingGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,13 +471,15 @@ class HttpBindingGenerator(
}

private fun RustWriter.renderHeaders(httpBinding: HttpBinding) {
check(httpBinding.location == HttpLocation.HEADER)
val memberShape = httpBinding.member
val memberType = model.expectShape(memberShape.target)
val targetShape = model.expectShape(memberShape.target)
val memberSymbol = symbolProvider.toSymbol(memberShape)
val memberName = symbolProvider.toMemberName(memberShape)
ifSet(memberType, memberSymbol, "&input.$memberName") { field ->
val isListHeader = memberType is CollectionShape
listForEach(memberType, field) { innerField, targetId ->

ifSet(targetShape, memberSymbol, "&input.$memberName") { field ->
val isListHeader = targetShape is CollectionShape
listForEach(targetShape, field) { innerField, targetId ->
val innerMemberType = model.expectShape(targetId)
if (innerMemberType.isPrimitive()) {
val encoder = CargoDependency.SmithyTypes(runtimeConfig).asType().member("primitive::Encoder")
Expand All @@ -491,9 +493,14 @@ class HttpBindingGenerator(
"""
let header_value = $safeName;
let header_value = http::header::HeaderValue::try_from(&*header_value).map_err(|err| {
#{build_error}::InvalidField { field: "$memberName", details: format!("`{}` cannot be used as a header value: {}", &${
memberShape.redactIfNecessary(model, "header_value")
}, err)}
#{build_error}::InvalidField {
field: "$memberName",
details: format!(
"`{}` cannot be used as a header value: {}",
&${memberShape.redactIfNecessary(model, "header_value")},
err,
)
}
})?;
builder = builder.header("${httpBinding.locationName}", header_value);
""",
Expand All @@ -505,35 +512,34 @@ class HttpBindingGenerator(
}

private fun RustWriter.renderPrefixHeader(httpBinding: HttpBinding) {
check(httpBinding.location == HttpLocation.PREFIX_HEADERS)
val memberShape = httpBinding.member
val memberType = model.expectShape(memberShape.target)
val targetShape = model.expectShape(memberShape.target, MapShape::class.java)
val memberSymbol = symbolProvider.toSymbol(memberShape)
val memberName = symbolProvider.toMemberName(memberShape)
val target = when (memberType) {
is CollectionShape -> model.expectShape(memberType.member.target)
is MapShape -> model.expectShape(memberType.value.target)
else -> UNREACHABLE("unexpected member for prefix headers: $memberType")
}
ifSet(memberType, memberSymbol, "&input.$memberName") { field ->
val listHeader = memberType is CollectionShape
val valueTargetShape = model.expectShape(targetShape.value.target)

ifSet(targetShape, memberSymbol, "&input.$memberName") { field ->
rustTemplate(
"""
for (k, v) in $field {
use std::str::FromStr;
let header_name = http::header::HeaderName::from_str(&format!("{}{}", "${httpBinding.locationName}", &k)).map_err(|err| {
#{build_error}::InvalidField { field: "$memberName", details: format!("`{}` cannot be used as a header name: {}", k, err)}
})?;
let header_value = ${headerFmtFun(this, target, memberShape, "v", listHeader)};
let header_value = ${headerFmtFun(this, valueTargetShape, memberShape, "v", isListHeader = false)};
let header_value = http::header::HeaderValue::try_from(&*header_value).map_err(|err| {
#{build_error}::InvalidField {
field: "$memberName",
details: format!("`{}` cannot be used as a header value: {}", ${
memberShape.redactIfNecessary(model, "v")
}, err)}
details: format!(
"`{}` cannot be used as a header value: {}",
${memberShape.redactIfNecessary(model, "v")},
err,
)
}
})?;
builder = builder.header(header_name, header_value);
}

""",
"build_error" to runtimeConfig.operationBuildError(),
)
Expand Down