upgrade to smithy 1.49 (#511)

aws · May 10, 2024 · 7afc826 · 7afc826
1 parent 86d581f
commit 7afc826
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 23 deletions.
diff --git a/codegen/gradle.properties b/codegen/gradle.properties
@@ -1,2 +1,2 @@
-smithyVersion=1.47.0
+smithyVersion=1.49.0
 smithyGradleVersion=0.7.0
diff --git a/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/SymbolUtils.java b/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/SymbolUtils.java
@@ -223,4 +223,8 @@ public static boolean isNilable(Symbol symbol) {
                 || symbol.getProperty(SymbolUtils.GO_SLICE).isPresent()
                 || symbol.getProperty(SymbolUtils.GO_MAP).isPresent();
     }
+
+    public static Symbol pointerTo(Symbol symbol) {
+        return symbol.toBuilder().putProperty(POINTABLE, true).build();
+    }
 }
diff --git a/...main/java/software/amazon/smithy/go/codegen/endpoints/EndpointClientPluginsGenerator.java b/...main/java/software/amazon/smithy/go/codegen/endpoints/EndpointClientPluginsGenerator.java
@@ -15,9 +15,10 @@
 
 package software.amazon.smithy.go.codegen.endpoints;
 
+import static software.amazon.smithy.go.codegen.endpoints.EndpointParametersGenerator.parameterAsSymbol;
+
 import java.util.ArrayList;
 import java.util.List;
-import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.go.codegen.GoSettings;
 import software.amazon.smithy.go.codegen.SymbolUtils;
 import software.amazon.smithy.go.codegen.integration.ConfigField;
@@ -44,16 +45,6 @@ private static String getExportedParameterName(Parameter parameter) {
         return StringUtils.capitalize(parameter.getName().getName().getValue());
     }
 
-    private static Symbol parameterAsSymbol(Parameter parameter) {
-        return switch (parameter.getType()) {
-            case STRING -> SymbolUtils.createPointableSymbolBuilder("string")
-                    .putProperty(SymbolUtils.GO_UNIVERSE_TYPE, true).build();
-
-            case BOOLEAN -> SymbolUtils.createPointableSymbolBuilder("bool")
-                    .putProperty(SymbolUtils.GO_UNIVERSE_TYPE, true).build();
-        };
-    }
-
     @Override
     public List<RuntimeClientPlugin> getClientPlugins() {
         runtimeClientPlugins.add(RuntimeClientPlugin.builder()

diff --git a/...rc/main/java/software/amazon/smithy/go/codegen/endpoints/EndpointParametersGenerator.java b/...rc/main/java/software/amazon/smithy/go/codegen/endpoints/EndpointParametersGenerator.java
@@ -19,6 +19,7 @@
 import static software.amazon.smithy.go.codegen.GoWriter.goBlockTemplate;
 import static software.amazon.smithy.go.codegen.GoWriter.goDocTemplate;
 import static software.amazon.smithy.go.codegen.GoWriter.goTemplate;
+import static software.amazon.smithy.go.codegen.SymbolUtils.pointerTo;
 
 import java.io.Serializable;
 import java.util.Comparator;
@@ -27,7 +28,9 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+import software.amazon.smithy.codegen.core.CodegenException;
 import software.amazon.smithy.codegen.core.Symbol;
+import software.amazon.smithy.go.codegen.GoUniverseTypes;
 import software.amazon.smithy.go.codegen.GoWriter;
 import software.amazon.smithy.go.codegen.SmithyGoDependency;
 import software.amazon.smithy.go.codegen.SymbolUtils;
@@ -149,12 +152,11 @@ private GoWriter.Writable generateDefaultsMethod(Parameters parameters) {
 
     private GoWriter.Writable generateDefaultValue(Parameter parameter, Value defaultValue) {
         return switch (parameter.getType()) {
-            case STRING -> goTemplate("$ptrString:T($value:S)", MapUtils.of(
-                    "ptrString", SymbolUtils.createValueSymbolBuilder("String", SmithyGoDependency.SMITHY_PTR).build(),
-                    "value", defaultValue.expectStringValue()));
-            case BOOLEAN -> goTemplate("$ptrBool:T($value:L)", MapUtils.of(
-                    "ptrBool", SymbolUtils.createValueSymbolBuilder("Bool", SmithyGoDependency.SMITHY_PTR).build(),
-                    "value", defaultValue.expectBooleanValue()));
+            case STRING -> goTemplate("$T($S)",
+                    SmithyGoDependency.SMITHY_PTR.func("String"), defaultValue.expectStringValue());
+            case BOOLEAN -> goTemplate("$T($L)",
+                    SmithyGoDependency.SMITHY_PTR.func("Bool"), defaultValue.expectBooleanValue());
+            case STRING_ARRAY -> throw new CodegenException("unsupported endpoint parameter type stringArray");
         };
     }
 
@@ -197,11 +199,9 @@ private GoWriter.Writable generateValidationMethod(Parameters parameters) {
 
     public static Symbol parameterAsSymbol(Parameter parameter) {
         return switch (parameter.getType()) {
-            case STRING -> SymbolUtils.createPointableSymbolBuilder("string")
-                    .putProperty(SymbolUtils.GO_UNIVERSE_TYPE, true).build();
-
-            case BOOLEAN -> SymbolUtils.createPointableSymbolBuilder("bool")
-                    .putProperty(SymbolUtils.GO_UNIVERSE_TYPE, true).build();
+            case STRING -> pointerTo(GoUniverseTypes.String);
+            case BOOLEAN -> pointerTo(GoUniverseTypes.Bool);
+            case STRING_ARRAY -> throw new CodegenException("unsupported endpoint parameter type stringArray");
         };
     }