Remove httpLabel trait from Bucket members (#2173)

aws · Jul 31, 2023 · 5a56b8a · 5a56b8a
1 parent 7cb6d19
commit 5a56b8a
Show file tree

Hide file tree

Showing 163 changed files with 2,096 additions and 1,328 deletions.
diff --git a/...ftware/amazon/smithy/aws/go/codegen/customization/S3HttpLabelBucketFilterIntegration.java b/...ftware/amazon/smithy/aws/go/codegen/customization/S3HttpLabelBucketFilterIntegration.java
@@ -0,0 +1,26 @@
+package software.amazon.smithy.aws.go.codegen.customization;
+
+import software.amazon.smithy.go.codegen.GoSettings;
+import software.amazon.smithy.go.codegen.integration.GoIntegration;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.traits.HttpLabelTrait;
+import software.amazon.smithy.model.transform.ModelTransformer;
+
+public class S3HttpLabelBucketFilterIntegration implements GoIntegration {
+
+    @Override
+    public Model preprocessModel(Model model, GoSettings settings) {
+        if (!S3ModelUtils.isServiceS3(model, settings.getService(model))) {
+            return model;
+        }
+
+        return ModelTransformer.create().removeTraitsIf(model, (shape, trait) -> {
+            if (trait instanceof HttpLabelTrait) {
+                return shape.asMemberShape()
+                    .map(s -> s.getMemberName().equals("Bucket"))
+                    .orElse(false);
+            }
+            return false;
+        });
+    }
+}
diff --git a/...n/src/main/java/software/amazon/smithy/aws/go/codegen/customization/S3UpdateEndpoint.java b/...n/src/main/java/software/amazon/smithy/aws/go/codegen/customization/S3UpdateEndpoint.java
@@ -135,20 +135,6 @@ public void processFinalizedModel(GoSettings settings, Model model) {
                     symbolProvider.toSymbol(operation).getName(),
                     UPDATE_ENDPOINT_INTERNAL_ADDER
             );
-
-            runtimeClientPlugins.add(RuntimeClientPlugin.builder()
-                    .operationPredicate((m, s, o) -> {
-                        if (!isS3SharedService(m, s)) {
-                            return false;
-                        }
-                        return o.equals(operation);
-                    })
-                    .registerMiddleware(MiddlewareRegistrar.builder()
-                            .resolvedFunction(SymbolUtils.createValueSymbolBuilder(helperFuncName)
-                                    .build())
-                            .useClientOptions()
-                            .build())
-                    .build());
         }
     }
 

diff --git a/...n/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration b/...n/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
@@ -55,4 +55,5 @@ software.amazon.smithy.aws.go.codegen.AwsEndpointResolverBuiltInGenerator
 software.amazon.smithy.aws.go.codegen.customization.S3ControlHostPrefixAccountIdFilterIntegration
 software.amazon.smithy.aws.go.codegen.customization.S3HttpPathBucketFilterIntegration
 software.amazon.smithy.aws.go.codegen.customization.S3HostPrefixRequestRouteFilterIntegration
+software.amazon.smithy.aws.go.codegen.customization.S3HttpLabelBucketFilterIntegration
 software.amazon.smithy.aws.go.codegen.AwsEndpointAuthSchemeGenerator
diff --git a/service/s3/api_op_AbortMultipartUpload.go b/service/s3/api_op_AbortMultipartUpload.go
diff --git a/service/s3/api_op_CompleteMultipartUpload.go b/service/s3/api_op_CompleteMultipartUpload.go
diff --git a/service/s3/api_op_CopyObject.go b/service/s3/api_op_CopyObject.go
diff --git a/service/s3/api_op_CreateBucket.go b/service/s3/api_op_CreateBucket.go
diff --git a/service/s3/api_op_CreateMultipartUpload.go b/service/s3/api_op_CreateMultipartUpload.go
diff --git a/service/s3/api_op_DeleteBucket.go b/service/s3/api_op_DeleteBucket.go
diff --git a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go
diff --git a/service/s3/api_op_DeleteBucketCors.go b/service/s3/api_op_DeleteBucketCors.go
diff --git a/service/s3/api_op_DeleteBucketEncryption.go b/service/s3/api_op_DeleteBucketEncryption.go
diff --git a/service/s3/api_op_DeleteBucketIntelligentTieringConfiguration.go b/service/s3/api_op_DeleteBucketIntelligentTieringConfiguration.go
diff --git a/service/s3/api_op_DeleteBucketInventoryConfiguration.go b/service/s3/api_op_DeleteBucketInventoryConfiguration.go
diff --git a/service/s3/api_op_DeleteBucketLifecycle.go b/service/s3/api_op_DeleteBucketLifecycle.go
diff --git a/service/s3/api_op_DeleteBucketMetricsConfiguration.go b/service/s3/api_op_DeleteBucketMetricsConfiguration.go
diff --git a/service/s3/api_op_DeleteBucketOwnershipControls.go b/service/s3/api_op_DeleteBucketOwnershipControls.go
diff --git a/service/s3/api_op_DeleteBucketPolicy.go b/service/s3/api_op_DeleteBucketPolicy.go
diff --git a/service/s3/api_op_DeleteBucketReplication.go b/service/s3/api_op_DeleteBucketReplication.go
diff --git a/service/s3/api_op_DeleteBucketTagging.go b/service/s3/api_op_DeleteBucketTagging.go
diff --git a/service/s3/api_op_DeleteBucketWebsite.go b/service/s3/api_op_DeleteBucketWebsite.go
diff --git a/service/s3/api_op_DeleteObject.go b/service/s3/api_op_DeleteObject.go
diff --git a/service/s3/api_op_DeleteObjectTagging.go b/service/s3/api_op_DeleteObjectTagging.go
diff --git a/service/s3/api_op_DeleteObjects.go b/service/s3/api_op_DeleteObjects.go
diff --git a/service/s3/api_op_DeletePublicAccessBlock.go b/service/s3/api_op_DeletePublicAccessBlock.go
diff --git a/service/s3/api_op_GetBucketAccelerateConfiguration.go b/service/s3/api_op_GetBucketAccelerateConfiguration.go
diff --git a/service/s3/api_op_GetBucketAcl.go b/service/s3/api_op_GetBucketAcl.go
diff --git a/service/s3/api_op_GetBucketAnalyticsConfiguration.go b/service/s3/api_op_GetBucketAnalyticsConfiguration.go
diff --git a/service/s3/api_op_GetBucketCors.go b/service/s3/api_op_GetBucketCors.go
diff --git a/service/s3/api_op_GetBucketEncryption.go b/service/s3/api_op_GetBucketEncryption.go
diff --git a/service/s3/api_op_GetBucketIntelligentTieringConfiguration.go b/service/s3/api_op_GetBucketIntelligentTieringConfiguration.go
diff --git a/service/s3/api_op_GetBucketInventoryConfiguration.go b/service/s3/api_op_GetBucketInventoryConfiguration.go
diff --git a/service/s3/api_op_GetBucketLifecycleConfiguration.go b/service/s3/api_op_GetBucketLifecycleConfiguration.go
diff --git a/service/s3/api_op_GetBucketLocation.go b/service/s3/api_op_GetBucketLocation.go
diff --git a/service/s3/api_op_GetBucketLogging.go b/service/s3/api_op_GetBucketLogging.go
diff --git a/service/s3/api_op_GetBucketMetricsConfiguration.go b/service/s3/api_op_GetBucketMetricsConfiguration.go
diff --git a/service/s3/api_op_GetBucketNotificationConfiguration.go b/service/s3/api_op_GetBucketNotificationConfiguration.go