Skip to content
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

Jump to bottom

Fix @length-constrained collection shapes whose members are not constrained #2103

Merged
merged 4 commits into from
Dec 15, 2022
Merged

Fix @length-constrained collection shapes whose members are not constrained #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
093dd12
Fix `@length`-constrained collection shapes whose members are not con…
david-perez Dec 14, 2022
430291d
Add changelog entry
david-perez Dec 14, 2022
6256685
Merge remote-tracking branch 'upstream/main' into davidpz/fix-length-…
david-perez Dec 14, 2022
66afe38
Merge branch 'main' into davidpz/fix-length-constrained-shapes-whose-…
jjant Dec 15, 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
6 changes: 6 additions & 0 deletions CHANGELOG.next.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
# meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client | server | all"}
# author = "rcoh"

[[smithy-rs]]
message = "In 0.52, `@length`-constrained collection shapes whose members are not constrained made the server code generator crash. This has been fixed."
references = ["smithy-rs#2103"]
meta = { "breaking" = false, "tada" = false, "bug" = true, "target" = "server"}
author = "david-perez"

[[smithy-rs]]
message = "The Rust client codegen plugin is now called `rust-client-codegen` instead of `rust-codegen`. Be sure to update your `smithy-build.json` files to refer to the correct plugin name."
references = ["smithy-rs#2099"]
Expand Down
12 changes: 8 additions & 4 deletions codegen-core/common-test-models/constraints.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,21 +837,25 @@ list RecursiveList {
}

list ConBList {
member: LengthList
member: ConBListInner
}

list ConBListInner {
member: ConB
}

@length(max: 69)
list LengthList {
member: ConB
member: String
}

// TODO(https://github.com/awslabs/smithy-rs/issues/1401): a `set` shape is
// just a `list` shape with `uniqueItems`, which hasn't been implemented yet.
// set ConBSet {
// member: NestedSet
// member: ConBSetInner
// }
//
// set NestedSet {
// set ConBSetInner {
// member: String
// }

Expand Down
4 changes: 3 additions & 1 deletion ...in/software/amazon/smithy/rust/codegen/server/smithy/ConstraintViolationSymbolProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ class ConstraintViolationSymbolProvider(
}

override fun toSymbol(shape: Shape): Symbol {
check(shape.canReachConstrainedShape(model, base))
check(shape.canReachConstrainedShape(model, base)) {
"`ConstraintViolationSymbolProvider` was called on shape that does not reach a constrained shape: $shape"
}

return when (shape) {
is MapShape, is CollectionShape, is UnionShape -> {
Expand Down
3 changes: 1 addition & 2 deletions ...e/amazon/smithy/rust/codegen/server/smithy/generators/UnconstrainedCollectionGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ class UnconstrainedCollectionGenerator(
}

private fun renderTryFromUnconstrainedForConstrained(writer: RustWriter) {
val innerConstraintViolationSymbol = constraintViolationSymbolProvider.toSymbol(innerShape)

writer.rustBlock("impl std::convert::TryFrom<$name> for #{T}", constrainedSymbol) {
rust("type Error = #T;", constraintViolationSymbol)

Expand All @@ -106,6 +104,7 @@ class UnconstrainedCollectionGenerator(
} else {
constrainedShapeSymbolProvider.toSymbol(innerShape)
}
val innerConstraintViolationSymbol = constraintViolationSymbolProvider.toSymbol(innerShape)

rustTemplate(
"""
Expand Down