do NOT serialize empty lists in ec2query (#2630)

aws · May 10, 2024 · 0ac88f6 · 0ac88f6
1 parent 0457ec5
commit 0ac88f6
Show file tree

Hide file tree

Showing 17 changed files with 828 additions and 31 deletions.
diff --git a/.changelog/2781886a806d48bda53e5be2992aa455.json b/.changelog/2781886a806d48bda53e5be2992aa455.json
@@ -0,0 +1,8 @@
+{
+    "id": "2781886a-806d-48bd-a53e-5be2992aa455",
+    "type": "bugfix",
+    "description": "Fix serialization behavior of empty lists.",
+    "modules": [
+        "service/ec2"
+    ]
+}
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/src/main/java/software/amazon/smithy/aws/go/codegen/Ec2QueryShapeSerVisitor.java b/...-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/Ec2QueryShapeSerVisitor.java
@@ -3,8 +3,12 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import software.amazon.smithy.aws.traits.protocols.Ec2QueryNameTrait;
+import software.amazon.smithy.go.codegen.GoWriter;
 import software.amazon.smithy.go.codegen.integration.ProtocolGenerator.GenerationContext;
+import software.amazon.smithy.go.codegen.knowledge.GoPointableIndex;
+import software.amazon.smithy.model.shapes.CollectionShape;
 import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.Shape;
 import software.amazon.smithy.model.shapes.ShapeType;
 import software.amazon.smithy.model.traits.TimestampFormatTrait.Format;
 import software.amazon.smithy.model.traits.XmlNameTrait;
@@ -51,6 +55,14 @@ protected String getSerializedLocationName(MemberShape memberShape, String defau
                 .orElse(defaultValue));
     }
 
+    // EC2Query specifically does not serialize non-nil, empty lists
+    protected void serializeCollection(GenerationContext context, CollectionShape shape) {
+        context.getWriter().get()
+                .write("if len(v) == 0 { return nil }");
+
+        super.serializeCollection(context, shape);
+    }
+
     @Override
     protected boolean isFlattened(GenerationContext context, MemberShape memberShape) {
         // All lists, sets, and maps are flattened in aws.ec2.

diff --git a/internal/protocoltest/ec2query/api_op_QueryLists_test.go b/internal/protocoltest/ec2query/api_op_QueryLists_test.go
diff --git a/internal/protocoltest/ec2query/serializers.go b/internal/protocoltest/ec2query/serializers.go
diff --git a/internal/protocoltest/restxml/api_op_GreetingWithErrors_test.go b/internal/protocoltest/restxml/api_op_GreetingWithErrors_test.go
diff --git a/internal/protocoltest/smithyrpcv2cbor/api_op_EmptyInputOutput_test.go b/internal/protocoltest/smithyrpcv2cbor/api_op_EmptyInputOutput_test.go
diff --git a/internal/protocoltest/smithyrpcv2cbor/api_op_NoInputOutput_test.go b/internal/protocoltest/smithyrpcv2cbor/api_op_NoInputOutput_test.go
diff --git a/internal/protocoltest/smithyrpcv2cbor/api_op_OperationWithDefaults_test.go b/internal/protocoltest/smithyrpcv2cbor/api_op_OperationWithDefaults_test.go
diff --git a/internal/protocoltest/smithyrpcv2cbor/api_op_OptionalInputOutput_test.go b/internal/protocoltest/smithyrpcv2cbor/api_op_OptionalInputOutput_test.go
diff --git a/internal/protocoltest/smithyrpcv2cbor/api_op_RecursiveShapes_test.go b/internal/protocoltest/smithyrpcv2cbor/api_op_RecursiveShapes_test.go
diff --git a/internal/protocoltest/smithyrpcv2cbor/api_op_RpcV2CborDenseMaps_test.go b/internal/protocoltest/smithyrpcv2cbor/api_op_RpcV2CborDenseMaps_test.go
diff --git a/internal/protocoltest/smithyrpcv2cbor/api_op_RpcV2CborLists_test.go b/internal/protocoltest/smithyrpcv2cbor/api_op_RpcV2CborLists_test.go
diff --git a/internal/protocoltest/smithyrpcv2cbor/api_op_RpcV2CborSparseMaps_test.go b/internal/protocoltest/smithyrpcv2cbor/api_op_RpcV2CborSparseMaps_test.go