Merge branch 'aws:main' into refactor/fix_deprecated_for_ioutil

komisan19 · web-flow · commit 60e7b1542eb4 · 2025-01-14T23:56:15.000+09:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -39,6 +39,37 @@ To send us a pull request, please:
 GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
 
+### Changelog Documents
+
+(You can SKIP this step if you are only changing the code generator, and not the runtime).
+
+When submitting a pull request please include a changelog file on a folder named `.changelog`.
+These are used to generate the content `CHANGELOG.md` and Release Notes. The format of the file is as follows:
+
+```
+{
+    "id": "12345678-1234-1234-1234-123456789012"
+    "type": "bugfix"
+    "collapse": true
+    "description": "Fix improper use of printf-style functions.",
+    "modules": [
+        "."
+    ]
+}
+```
+
+* id: a UUID. This should also be used for the name of the file, so if your id is `12345678-1234-1234-1234-123456789012` the file should be named `12345678-1234-1234-1234-123456789012.json/`
+* type: one of the following:
+ * bugfix: Fixing an existing bug
+ * Feature: Adding a new feature to an existing service
+ * Release: Releasing a new module
+ * Dependency: Updating dependencies
+ * Announcement: Making an announcement, like deprecation of a module
+* collapse: whether this change should appear separately on the release notes on every module listed on `modules` (`"collapse": false`), or if it should show up as a single entry (`"collapse": true`)
+ * For the smithy-go repository this should always be `false`
+* description: Description of this change. Most of the times is the same as the title of the PR
+* modules: which Go modules does this change impact. The root module is expressed as "."
+
 
 ## Finding contributions to work on
 Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start.
diff --git a/Makefile b/Makefile
@@ -98,5 +98,12 @@ module-version:
 ##############
 .PHONY: install-changelog
 
+external-changelog:
+	mkdir -p .changelog
+	cp changelog-template.json .changelog/00000000-0000-0000-0000-000000000000.json
+	@echo "Generate a new UUID and update the file at .changelog/00000000-0000-0000-0000-000000000000.json"
+	@echo "Make sure to rename the file with your new id, like .changelog/12345678-1234-1234-1234-123456789012.json"
+	@echo "See CONTRIBUTING.md 'Changelog Documents' and an example at https://github.com/aws/smithy-go/pull/543/files"
+
 install-changelog:
 	go install ${REPOTOOLS_MODULE}/cmd/changelog@${REPOTOOLS_VERSION}
diff --git a/changelog-template.json b/changelog-template.json
@@ -0,0 +1,9 @@
+{
+    "id": "00000000-0000-0000-0000-000000000000",
+    "type": "feature|bugfix|dependency",
+    "description": "Description of your changes",
+    "collapse": false,
+    "modules": [
+        "."
+    ]
+}
diff --git a/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/GoJmespathExpressionGenerator.java b/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/GoJmespathExpressionGenerator.java
@@ -16,6 +16,7 @@
 package software.amazon.smithy.go.codegen;
 
 import static software.amazon.smithy.go.codegen.GoWriter.goTemplate;
+import static software.amazon.smithy.go.codegen.SymbolUtils.isNilable;
 import static software.amazon.smithy.go.codegen.SymbolUtils.isPointable;
 import static software.amazon.smithy.go.codegen.SymbolUtils.sliceOf;
 import static software.amazon.smithy.go.codegen.util.ShapeUtil.BOOL_SHAPE;
@@ -280,7 +281,21 @@ private Variable visitProjection(ProjectionExpression expr, Variable current) {
 
     private Variable visitSub(Subexpression expr, Variable current) {
         var left = visit(expr.getLeft(), current);
-        return visit(expr.getRight(), left);
+        if (!isNilable(left.type)) {
+            return visit(expr.getRight(), left);
+        }
+
+        var lookahead = new GoJmespathExpressionGenerator(ctx, new GoWriter(""))
+                .generate(expr.getRight(), left);
+        var ident = nextIdent();
+        writer.write("var $L $P", ident, lookahead.type);
+        writer.write("if $L != nil {", left.ident);
+        writer.indent();
+        var inner = visit(expr.getRight(), left);
+        writer.write("$L = $L", ident, inner.ident);
+        writer.dedent();
+        writer.write("}");
+        return new Variable(inner.shape, ident, inner.type);
     }
 
     private Variable visitField(FieldExpression expr, Variable current) {
diff --git a/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/integration/Waiters.java b/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/integration/Waiters.java
@@ -670,6 +670,7 @@ private void generateRetryable(
                     });
 
                     writer.write("");
+                    writer.write("if err != nil { return false, err }");
                     writer.write("return true, nil");
                 });
     }
diff --git a/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/integration/Waiters2.java b/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/integration/Waiters2.java
@@ -649,6 +649,7 @@ private void generateRetryable(
                     });
 
                     writer.write("");
+                    writer.write("if err != nil { return false, err }");
                     writer.write("return true, nil");
                 });
     }
diff --git a/codegen/smithy-go-codegen/src/test/java/software/amazon/smithy/go/codegen/GoJmespathExpressionGeneratorTest.java b/codegen/smithy-go-codegen/src/test/java/software/amazon/smithy/go/codegen/GoJmespathExpressionGeneratorTest.java
@@ -124,7 +124,11 @@ public void testSubexpression() {
         assertThat(actual.ident(), Matchers.equalTo("v2"));
         assertThat(writer.toString(), Matchers.containsString("""
                 v1 := input.Nested
-                v2 := v1.NestedField
+                var v2 *string
+                if v1 != nil {
+                    v3 := v1.NestedField
+                    v2 = v3
+                }
                 """));
     }
 
@@ -304,14 +308,18 @@ public void testComparatorStringLHSNil() {
                 "input"
         ));
         assertThat(actual.shape(), Matchers.equalTo(ShapeUtil.BOOL_SHAPE));
-        assertThat(actual.ident(), Matchers.equalTo("v4"));
+        assertThat(actual.ident(), Matchers.equalTo("v5"));
         assertThat(writer.toString(), Matchers.containsString("""
                 v1 := input.Nested
-                v2 := v1.NestedField
-                v3 := "foo"
-                var v4 bool
+                var v2 *string
+                if v1 != nil {
+                    v3 := v1.NestedField
+                    v2 = v3
+                }
+                v4 := "foo"
+                var v5 bool
                 if v2 != nil   {
-                    v4 = string(*v2) == string(v3)
+                    v5 = string(*v2) == string(v4)
                 }
                 """));
     }
@@ -327,14 +335,18 @@ public void testComparatorStringRHSNil() {
                 "input"
         ));
         assertThat(actual.shape(), Matchers.equalTo(ShapeUtil.BOOL_SHAPE));
-        assertThat(actual.ident(), Matchers.equalTo("v4"));
+        assertThat(actual.ident(), Matchers.equalTo("v5"));
         assertThat(writer.toString(), Matchers.containsString("""
                 v1 := "foo"
                 v2 := input.Nested
-                v3 := v2.NestedField
-                var v4 bool
+                var v3 *string
+                if v2 != nil {
+                    v4 := v2.NestedField
+                    v3 = v4
+                }
+                var v5 bool
                 if   v3 != nil {
-                    v4 = string(v1) == string(*v3)
+                    v5 = string(v1) == string(*v3)
                 }
                 """));
     }
@@ -350,14 +362,18 @@ public void testComparatorStringBothNil() {
                 "input"
         ));
         assertThat(actual.shape(), Matchers.equalTo(ShapeUtil.BOOL_SHAPE));
-        assertThat(actual.ident(), Matchers.equalTo("v4"));
+        assertThat(actual.ident(), Matchers.equalTo("v5"));
         assertThat(writer.toString(), Matchers.containsString("""
                 v1 := input.Nested
-                v2 := v1.NestedField
-                v3 := input.SimpleShape
-                var v4 bool
-                if v2 != nil && v3 != nil {
-                    v4 = string(*v2) == string(*v3)
+                var v2 *string
+                if v1 != nil {
+                    v3 := v1.NestedField
+                    v2 = v3
+                }
+                v4 := input.SimpleShape
+                var v5 bool
+                if v2 != nil && v4 != nil {
+                    v5 = string(*v2) == string(*v4)
                 }
                 """));
     }

Original file line number	Diff line number	Diff line change
`@@ -670,6 +670,7 @@ private void generateRetryable(`
`670`	`670`	`});`
`671`	`671`
`672`	`672`	`writer.write("");`
	`673`	`+ writer.write("if err != nil { return false, err }");`
`673`	`674`	`writer.write("return true, nil");`
`674`	`675`	`});`
`675`	`676`	`}`
Original file line number	Diff line number	Diff line change
`@@ -649,6 +649,7 @@ private void generateRetryable(`
`649`	`649`	`});`
`650`	`650`
`651`	`651`	`writer.write("");`
	`652`	`+ writer.write("if err != nil { return false, err }");`
`652`	`653`	`writer.write("return true, nil");`
`653`	`654`	`});`
`654`	`655`	`}`