Upgrade to Smithy 1.39 (#2290)

.github/workflows/codegen.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ main ]
 
+env:
+  # get owner of the repository. used by forks.
+  SMITHY_GO_REPOSITORY: ${{ github.event.pull_request.head.repo.owner.login }}/smithy-go
+
 jobs:
   codegen-test:
     name: SDK Codegen Test
@@ -38,17 +42,18 @@ jobs:
       with:
         go-version: ${{ matrix.go-version }}
 
-    - uses: actions/checkout@v2
-      with:
-        repository: aws/smithy-go
-        path: tmp-smithy-go
+    - name: Find smithy-go
+      shell: bash
+      env:
+        RUNNER_TMPDIR: ${{ runner.temp }}
+      run: ./ci-find-smithy-go.sh
 
     - name: Build and publish smithy-go
-      working-directory: tmp-smithy-go
+      working-directory: ${{ runner.temp }}/smithy-go
       run: make smithy-publish-local
 
     - name: Cleanup smithy-go
-      run: rm -rf tmp-smithy-go
+      run: rm -rf ${{ runner.temp }}/smithy-go
 
     - name: SDK Codegen
       run: make smithy-generate

.github/workflows/go.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   EACHMODULE_CONCURRENCY: 2
-  SMITHY_GO_REPOSITORY: ${{ vars.SMITHY_GO_REPOSITORY }}
+  SMITHY_GO_REPOSITORY: ${{ github.event.pull_request.head.repo.owner.login }}/smithy-go
   GIT_PAT: ${{ secrets.CI_GIT_PAT}}
 
 jobs:

codegen/gradle.properties

@@ -1,2 +1,2 @@
-smithyVersion=1.37.0
+smithyVersion=1.39.0
 smithyGradleVersion=0.7.0

codegen/smithy-aws-go-codegen/build.gradle.kts

@@ -44,6 +44,7 @@ dependencies {
     api("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
     api("software.amazon.smithy:smithy-aws-iam-traits:$smithyVersion")
     api("software.amazon.smithy:smithy-aws-cloudformation-traits:$smithyVersion")
+    api("software.amazon.smithy:smithy-aws-endpoints:$smithyVersion")
     api("software.amazon.smithy:smithy-diff:$smithyVersion")
     api("software.amazon.smithy.go:smithy-go-codegen:0.1.0")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.0")

codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsFnProvider.java

@@ -3,8 +3,7 @@
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.go.codegen.SymbolUtils;
 import software.amazon.smithy.go.codegen.endpoints.FnProvider;
-import software.amazon.smithy.rulesengine.language.syntax.fn.FunctionDefinition;
-
+import software.amazon.smithy.rulesengine.language.syntax.expressions.functions.FunctionDefinition;
 
 public class AwsFnProvider implements FnProvider {
     @Override
@@ -15,8 +14,8 @@ public Symbol fnFor(String name) {
             case "aws.parseArn" -> SymbolUtils.createValueSymbolBuilder("ParseARN",
                     AwsGoDependency.AWS_ENDPOINT_RULESFN).build();
             case "aws.isVirtualHostableS3Bucket" ->
-                    SymbolUtils.createValueSymbolBuilder("IsVirtualHostableS3Bucket",
-                    AwsGoDependency.AWS_ENDPOINT_RULESFN).build();
+                SymbolUtils.createValueSymbolBuilder("IsVirtualHostableS3Bucket",
+                        AwsGoDependency.AWS_ENDPOINT_RULESFN).build();
 
             default -> null;
         };

codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsProtocolUtils.java

@@ -142,6 +142,12 @@ static void generateHttpProtocolTests(GenerationContext context) {
                         .operation(ShapeId.from("aws.protocoltests.restxml#PutWithContentEncoding"))
                         .addTestName("SDKAppliedContentEncoding_restXml")
                         .addTestName("SDKAppendedGzipAfterProvidedEncoding_restXml")
+                        .build(),
+                HttpProtocolUnitTestGenerator.SkipTest.builder()
+                        .service(ShapeId.from("aws.protocoltests.restxml#RestXml"))
+                        .operation(ShapeId.from("aws.protocoltests.restxml#HttpPayloadWithUnion"))
+                        .addTestName("RestXmlHttpPayloadWithUnion")
+                        .addTestName("RestXmlHttpPayloadWithUnsetUnion")
                         .build()
                 ));
 
@@ -158,6 +164,22 @@ static void generateHttpProtocolTests(GenerationContext context) {
                         .service(ShapeId.from("aws.protocoltests.restxml#RestXml"))
                         .operation(ShapeId.from("aws.protocoltests.restxml#HttpPrefixHeaders"))
                         .addTestName("HttpPrefixHeadersAreNotPresent")
+                        .build(),
+
+                HttpProtocolUnitTestGenerator.SkipTest.builder()
+                        .service(ShapeId.from("aws.protocoltests.restjson#RestJson"))
+                        .operation(ShapeId.from("aws.protocoltests.restjson#JsonUnions"))
+                        .addTestName("RestJsonDeserializeIgnoreType")
+                        .build(),
+                HttpProtocolUnitTestGenerator.SkipTest.builder()
+                        .service(ShapeId.from("aws.protocoltests.json10#JsonRpc10"))
+                        .operation(ShapeId.from("aws.protocoltests.json10#JsonUnions"))
+                        .addTestName("AwsJson10DeserializeIgnoreType")
+                        .build(),
+                HttpProtocolUnitTestGenerator.SkipTest.builder()
+                        .service(ShapeId.from("aws.protocoltests.json#JsonProtocol"))
+                        .operation(ShapeId.from("aws.protocoltests.json#JsonUnions"))
+                        .addTestName("AwsJson11DeserializeIgnoreType")
                         .build()
         ));