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

Upgrade Smithy to 1.50.0 #3728

Merged
merged 9 commits into from
Jul 5, 2024
Merged

Upgrade Smithy to 1.50.0 #3728

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
92f4806
Upgrade Smithy to 1.50.0
ysaito1001 Jun 27, 2024
0b749be
Remove rest-xml-extras which now comes from upstream Smithy
ysaito1001 Jun 28, 2024
5b2e9a2
Merge branch 'main' into ysaito/upgrade-smithy-1-50-0
ysaito1001 Jul 1, 2024
e0db4c5
Add RestJson defaults tests to a list of failing tests
ysaito1001 Jul 1, 2024
b4aaf2b
Register broken test as such instead of `FailingTest
ysaito1001 Jul 1, 2024
4cd8599
Merge branch 'main' into ysaito/upgrade-smithy-1-50-0
Velfi Jul 2, 2024
21130aa
Add some context to a newly added failing test
ysaito1001 Jul 2, 2024
e8db527
Update `TODO` for a failing test to point to an issue
ysaito1001 Jul 3, 2024
3508b6b
Update TODO to show that it applies to the next 4 tests
ysaito1001 Jul 5, 2024
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
11 changes: 1 addition & 10 deletions codegen-client-test/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,7 @@ val allCodegenTests = listOf(
ClientTest(
"aws.protocoltests.restjson#RestJsonExtras",
"rest_json_extras",
dependsOn = listOf(
"rest-json-extras.smithy",
// TODO(https://github.com/smithy-lang/smithy/pull/2310): Can be deleted when consumed in next Smithy version.
"rest-json-extras-2310.smithy",
// TODO(https://github.com/smithy-lang/smithy/pull/2314): Can be deleted when consumed in next Smithy version.
"rest-json-extras-2314.smithy",
// TODO(https://github.com/smithy-lang/smithy/pull/2315): Can be deleted when consumed in next Smithy version.
// TODO(https://github.com/smithy-lang/smithy/pull/2331): Can be deleted when consumed in next Smithy version.
"rest-json-extras-2315.smithy",
),
dependsOn = listOf("rest-json-extras.smithy"),
),
ClientTest("aws.protocoltests.misc#MiscService", "misc", dependsOn = listOf("misc.smithy")),
ClientTest("aws.protocoltests.restxml#RestXml", "rest_xml", addMessageToErrors = false),
Expand Down
36 changes: 35 additions & 1 deletion ...azon/smithy/rust/codegen/client/smithy/generators/protocol/ClientProtocolTestGenerator.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.client.smithy.generators.protocol

import software.amazon.smithy.model.node.NumberNode
import software.amazon.smithy.model.shapes.DoubleShape
import software.amazon.smithy.model.shapes.FloatShape
import software.amazon.smithy.model.shapes.OperationShape
Expand All @@ -27,7 +28,9 @@ import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.Broke
import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.FailingTest
import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.ProtocolSupport
import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.ProtocolTestGenerator
import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.ServiceShapeId
import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.ServiceShapeId.AWS_JSON_10
import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.ServiceShapeId.REST_JSON
import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.TestCase
import software.amazon.smithy.rust.codegen.core.util.PANIC
import software.amazon.smithy.rust.codegen.core.util.dq
Expand Down Expand Up @@ -73,7 +76,38 @@ class ClientProtocolTestGenerator(
FailingTest.RequestTest(AWS_JSON_10, "AwsJson10ClientPopulatesDefaultsValuesWhenMissingInResponse"),
FailingTest.RequestTest(AWS_JSON_10, "AwsJson10ClientUsesExplicitlyProvidedMemberValuesOverDefaults"),
FailingTest.RequestTest(AWS_JSON_10, "AwsJson10ClientPopulatesDefaultValuesInInput"),
FailingTest.RequestTest(REST_JSON, "RestJsonClientPopulatesDefaultValuesInInput"),
FailingTest.RequestTest(REST_JSON, "RestJsonClientUsesExplicitlyProvidedMemberValuesOverDefaults"),
)

private val BrokenTests:
Set<BrokenTest> =
setOf(
BrokenTest.ResponseTest(
ServiceShapeId.REST_JSON,
"RestJsonClientIgnoresDefaultValuesIfMemberValuesArePresentInResponse",
howToFixItFn = ::fixRestJsonClientIgnoresDefaultValuesIfMemberValuesArePresentInResponse,
inAtLeast = setOf("1.50.0"),
trackedIn =
setOf(
// TODO(https://github.com/smithy-lang/smithy/pull/2341)
"https://github.com/smithy-lang/smithy/pull/2341",
),
),
)

private fun fixRestJsonClientIgnoresDefaultValuesIfMemberValuesArePresentInResponse(
testCase: TestCase.ResponseTest,
): TestCase.ResponseTest {
val fixedParams =
testCase.testCase.params.toBuilder().withMember("defaultTimestamp", NumberNode.from(2)).build()
return TestCase.ResponseTest(
testCase.testCase.toBuilder()
.params(fixedParams)
.build(),
testCase.targetShape,
)
}
}

override val appliesTo: AppliesTo
Expand All @@ -85,7 +119,7 @@ class ClientProtocolTestGenerator(
override val disabledTests: Set<String>
get() = emptySet()
override val brokenTests: Set<BrokenTest>
get() = emptySet()
get() = BrokenTests

override val logger: Logger = Logger.getLogger(javaClass.name)

Expand Down
35 changes: 0 additions & 35 deletions codegen-core/common-test-models/rest-json-extras-2310.smithy
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions codegen-core/common-test-models/rest-json-extras-2314.smithy
View file
Open in desktop

This file was deleted.

133 changes: 0 additions & 133 deletions codegen-core/common-test-models/rest-json-extras-2315.smithy
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions codegen-core/common-test-models/rest-json-extras.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@ service RestJsonExtras {
CaseInsensitiveErrorOperation,
EmptyStructWithContentOnWireOp,
QueryPrecedence,
// TODO(https://github.com/smithy-lang/smithy/pull/2314)
HttpPayloadTraits2,
// TODO(https://github.com/smithy-lang/smithy/pull/2310)
MalformedContentTypeWithBody2,
// TODO(https://github.com/smithy-lang/smithy/pull/2315)
HttpEnumPayload2,
HttpStringPayload2,
],
errors: [ExtraError]
}
Expand Down
53 changes: 0 additions & 53 deletions codegen-core/common-test-models/rest-xml-extras.smithy
View file
Open in desktop

This file was deleted.

16 changes: 1 addition & 15 deletions codegen-server-test/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,7 @@ val allCodegenTests = "../codegen-core/common-test-models".let { commonModels ->
CodegenTest(
"aws.protocoltests.restjson#RestJsonExtras",
"rest_json_extras",
imports = listOf(
"$commonModels/rest-json-extras.smithy",
// TODO(https://github.com/smithy-lang/smithy/pull/2310): Can be deleted when consumed in next Smithy version.
"$commonModels/rest-json-extras-2310.smithy",
// TODO(https://github.com/smithy-lang/smithy/pull/2314): Can be deleted when consumed in next Smithy version.
"$commonModels/rest-json-extras-2314.smithy",
// TODO(https://github.com/smithy-lang/smithy/pull/2315): Can be deleted when consumed in next Smithy version.
// TODO(https://github.com/smithy-lang/smithy/pull/2331): Can be deleted when consumed in next Smithy version.
"$commonModels/rest-json-extras-2315.smithy",
),
imports = listOf("$commonModels/rest-json-extras.smithy"),
),
CodegenTest(
"aws.protocoltests.restjson.validation#RestJsonValidation",
Expand Down Expand Up @@ -100,11 +91,6 @@ val allCodegenTests = "../codegen-core/common-test-models".let { commonModels ->
"pokemon-service-awsjson-server-sdk",
imports = listOf("$commonModels/pokemon-awsjson.smithy", "$commonModels/pokemon-common.smithy"),
),
CodegenTest(
"aws.protocoltests.restxml#RestXmlExtras",
"rest_xml_extras",
imports = listOf("$commonModels/rest-xml-extras.smithy"),
),
)
}

Expand Down
Loading