Skip to content

Commit

Permalink
Upgrade Smithy to 1.47 (#3552)
Browse files Browse the repository at this point in the history
This PR upgrades Smithy to 1.47.0. The new S3 tests needed to be
excluded in the server tests since they fail to compile for the same
reason as the other ones that are excluded.

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
  • Loading branch information
jdisanti authored Apr 8, 2024
1 parent 8bb11b8 commit 1c454bc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 31 deletions.
26 changes: 0 additions & 26 deletions codegen-core/common-test-models/rest-json-extras.smithy
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,6 @@ use smithy.test#httpRequestTests
use smithy.test#httpResponseTests
use smithy.framework#ValidationException

// TODO(https://github.com/smithy-lang/smithy/pull/2167): Remove this test once it's fixed in Smithy
apply AllQueryStringTypes @httpRequestTests([
{
id: "RestJsonZeroAndFalseQueryValuesFixed"
documentation: "Query values of 0 and false are serialized"
protocol: restJson1
method: "GET"
uri: "/AllQueryStringTypesInput"
body: ""
queryParams: [
"Integer=0"
"Boolean=false"
]
params: {
queryInteger: 0
queryBoolean: false
queryParamsMapOfStringList: {
Integer: ["0"]
Boolean: ["false"]
}
}
}
])

apply QueryPrecedence @httpRequestTests([
{
id: "UrlParamsKeyEncoding",
Expand Down Expand Up @@ -90,8 +66,6 @@ service RestJsonExtras {
CaseInsensitiveErrorOperation,
EmptyStructWithContentOnWireOp,
QueryPrecedence,
// TODO(https://github.com/smithy-lang/smithy/pull/2167): Remove this test once it's fixed in Smithy
AllQueryStringTypes,
],
errors: [ExtraError]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -813,10 +813,6 @@ class ServerProtocolTestGenerator(
FailingTest(RestJson, "RestJsonEndpointTrait", TestType.Request),
FailingTest(RestJson, "RestJsonEndpointTraitWithHostLabel", TestType.Request),
FailingTest(RestJson, "RestJsonOmitsEmptyListQueryValues", TestType.Request),
// TODO(https://github.com/smithy-lang/smithy/pull/2167): BEGIN Remove this failing test once it's fixed in Smithy
FailingTest(RestJson, "RestJsonZeroAndFalseQueryValues", TestType.Request),
FailingTest(RestJsonExtras, "RestJsonZeroAndFalseQueryValues", TestType.Request),
// TODO(https://github.com/smithy-lang/smithy/pull/2167): END Remove this failing test once it's fixed in Smithy
// Tests involving `@range` on floats.
// Pending resolution from the Smithy team, see https://github.com/smithy-lang/smithy-rs/issues/2007.
FailingTest(RestJsonValidation, "RestJsonMalformedRangeFloat_case0", TestType.MalformedRequest),
Expand Down Expand Up @@ -915,6 +911,8 @@ class ServerProtocolTestGenerator(
// RestXml S3 tests that fail to compile
"S3EscapeObjectKeyInUriLabel",
"S3EscapePathObjectKeyInUriLabel",
"S3PreservesLeadingDotSegmentInUriLabel",
"S3PreservesEmbeddedDotSegmentInUriLabel",
)

// TODO(https://github.com/awslabs/smithy/issues/1506)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ kotlin.code.style=official

# codegen
smithyGradlePluginVersion=0.9.0
smithyVersion=1.45.0
smithyVersion=1.47.0
allowLocalDeps=false

# kotlin
Expand Down

0 comments on commit 1c454bc

Please sign in to comment.