don't serde the bucket (aws#2204)

isaiahvita · Jul 25, 2023 · 262596c · 262596c
1 parent efb08f7
commit 262596c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 679 deletions.
diff --git a/Makefile b/Makefile
@@ -81,6 +81,10 @@ generate: smithy-generate update-requires gen-repo-mod-replace update-module-met
 gen-config-asserts gen-internal-codegen copy-attributevalue-feature gen-mod-dropreplace-smithy-. min-go-version-. \
 tidy-modules-. add-module-license-files gen-aws-ptrs format
 
+generate-tmpreplace-smithy: smithy-generate update-requires gen-repo-mod-replace update-module-metadata smithy-annotate-stable \
+gen-config-asserts gen-internal-codegen copy-attributevalue-feature gen-mod-replace-smithy-. min-go-version-. \
+tidy-modules-. add-module-license-files gen-aws-ptrs format gen-mod-dropreplace-smithy-.
+
 smithy-generate:
 	cd codegen && ./gradlew clean build -Plog-tests && ./gradlew clean
 

diff --git a/...ftware/amazon/smithy/aws/go/codegen/customization/S3HttpLabelBucketFilterIntegration.java b/...ftware/amazon/smithy/aws/go/codegen/customization/S3HttpLabelBucketFilterIntegration.java
@@ -2,6 +2,7 @@
 
 import software.amazon.smithy.go.codegen.GoSettings;
 import software.amazon.smithy.go.codegen.integration.GoIntegration;
+import software.amazon.smithy.go.codegen.trait.NoSerializeTrait;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.traits.HttpLabelTrait;
 import software.amazon.smithy.model.transform.ModelTransformer;
@@ -14,13 +15,13 @@ public Model preprocessModel(Model model, GoSettings settings) {
             return model;
         }
 
-        return ModelTransformer.create().removeTraitsIf(model, (shape, trait) -> {
-            if (trait instanceof HttpLabelTrait) {
-                return shape.asMemberShape()
+        return ModelTransformer.create().mapTraits(model, (shape, trait) -> {
+            if (!(trait instanceof HttpLabelTrait)) return trait;
+
+            boolean isBucket = shape.asMemberShape()
                     .map(s -> s.getMemberName().equals("Bucket"))
                     .orElse(false);
-            }
-            return false;
+            return isBucket ? new NoSerializeTrait() : trait;
         });
     }
 }