From a5fcf9f700827eb20ab9390b89d7f07015eb2d6c Mon Sep 17 00:00:00 2001 From: Isaiah Vita <82135527+isaiahvita@users.noreply.github.com> Date: Tue, 12 Sep 2023 08:13:55 -0700 Subject: [PATCH] Upgrade to smithy core to latest (#2271) --- codegen/gradle.properties | 4 +- .../aws/go/codegen/AwsProtocolUtils.java | 40 ++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/codegen/gradle.properties b/codegen/gradle.properties index 04885b86c70..544c84cf73e 100644 --- a/codegen/gradle.properties +++ b/codegen/gradle.properties @@ -1,2 +1,2 @@ -smithyVersion=1.27.2 -smithyGradleVersion=0.6.0 +smithyVersion=1.37.0 +smithyGradleVersion=0.7.0 diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsProtocolUtils.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsProtocolUtils.java index 0b94ebc976c..5997086aed0 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsProtocolUtils.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsProtocolUtils.java @@ -105,7 +105,45 @@ static void generateHttpProtocolTests(GenerationContext context) { }) .build()); - Set inputSkipTests = new TreeSet<>(SetUtils.of()); + // skip request compression tests, not yet implemented in the SDK + Set inputSkipTests = new TreeSet<>(SetUtils.of( + HttpProtocolUnitTestGenerator.SkipTest.builder() + .service(ShapeId.from("aws.protocoltests.json10#JsonRpc10")) + .operation(ShapeId.from("aws.protocoltests.json10#PutWithContentEncoding")) + .addTestName("SDKAppliedContentEncoding_awsJson1_0") + .addTestName("SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsJson1_0") + .build(), + HttpProtocolUnitTestGenerator.SkipTest.builder() + .service(ShapeId.from("aws.protocoltests.json#JsonProtocol")) + .operation(ShapeId.from("aws.protocoltests.json#PutWithContentEncoding")) + .addTestName("SDKAppliedContentEncoding_awsJson1_1") + .addTestName("SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsJson1_1") + .build(), + HttpProtocolUnitTestGenerator.SkipTest.builder() + .service(ShapeId.from("aws.protocoltests.query#AwsQuery")) + .operation(ShapeId.from("aws.protocoltests.query#PutWithContentEncoding")) + .addTestName("SDKAppliedContentEncoding_awsQuery") + .addTestName("SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsQuery") + .build(), + HttpProtocolUnitTestGenerator.SkipTest.builder() + .service(ShapeId.from("aws.protocoltests.ec2#AwsEc2")) + .operation(ShapeId.from("aws.protocoltests.ec2#PutWithContentEncoding")) + .addTestName("SDKAppliedContentEncoding_ec2Query") + .addTestName("SDKAppendsGzipAndIgnoresHttpProvidedEncoding_ec2Query") + .build(), + HttpProtocolUnitTestGenerator.SkipTest.builder() + .service(ShapeId.from("aws.protocoltests.restjson#RestJson")) + .operation(ShapeId.from("aws.protocoltests.restjson#PutWithContentEncoding")) + .addTestName("SDKAppliedContentEncoding_restJson1") + .addTestName("SDKAppendedGzipAfterProvidedEncoding_restJson1") + .build(), + HttpProtocolUnitTestGenerator.SkipTest.builder() + .service(ShapeId.from("aws.protocoltests.restxml#RestXml")) + .operation(ShapeId.from("aws.protocoltests.restxml#PutWithContentEncoding")) + .addTestName("SDKAppliedContentEncoding_restXml") + .addTestName("SDKAppendedGzipAfterProvidedEncoding_restXml") + .build() + )); Set outputSkipTests = new TreeSet<>(SetUtils.of( // REST-JSON optional (SHOULD) test cases