Remove Bucket param from S3 request URIs (#3446)

In E2.0, the rule set handles adding the Bucket to the request URI so we remove
it from the model to prevent the marshallers from adding it to the path.

Author: dagnir

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/DefaultCustomizationProcessor.java

@@ -35,7 +35,8 @@ public static CodegenCustomizationProcessor getProcessorFor(
                 new OperationModifiersProcessor(config.getOperationModifiers()),
                 new RemoveExceptionMessagePropertyProcessor(),
                 new UseLegacyEventGenerationSchemeProcessor(),
-                new NewAndLegacyEventStreamProcessor()
-        );
+                new NewAndLegacyEventStreamProcessor(),
+                new S3RemoveBucketFromUriProcessor()
+                );
     }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/S3RemoveBucketFromUriProcessor.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.codegen.customization.processors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor;
+import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
+import software.amazon.awssdk.codegen.model.service.Operation;
+import software.amazon.awssdk.codegen.model.service.ServiceModel;
+import software.amazon.awssdk.utils.StringUtils;
+
+/**
+ * With Endpoints 2.0, the endpoint rule set for S3 is responsible for taking the {@code Bucket} parameter from the input and
+ * adding it to the request URI. To make this work, we preprocess the model to remove it from the HTTP definition so that the
+ * marshallers don't add it to the path as well.
+ */
+public class S3RemoveBucketFromUriProcessor implements CodegenCustomizationProcessor {
+    private static final Logger log = LoggerFactory.getLogger(S3RemoveBucketFromUriProcessor.class);
+
+    @Override
+    public void preprocess(ServiceModel serviceModel) {
+        if (!isS3(serviceModel)) {
+            return;
+        }
+
+        log.info("Preprocessing S3 model to remove {Bucket} from request URIs");
+
+        serviceModel.getOperations().forEach(this::removeBucketFromUriIfNecessary);
+    }
+
+    @Override
+    public void postprocess(IntermediateModel intermediateModel) {
+        // no-op
+    }
+
+    private boolean isS3(ServiceModel serviceModel) {
+        return "S3".equals(serviceModel.getMetadata().getServiceId());
+    }
+
+    private void removeBucketFromUriIfNecessary(String opName, Operation operation) {
+        String requestUri = operation.getHttp().getRequestUri();
+        String newUri = StringUtils.replaceOnce(requestUri, "/{Bucket}", "");
+
+        log.info("{}: replacing existing request URI '{}' with '{}", opName, requestUri, newUri);
+
+        operation.getHttp().setRequestUri(newUri);
+    }
+}

codegen/src/test/java/software/amazon/awssdk/codegen/customization/processors/S3RemoveBucketFromUriProcessorTest.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.codegen.customization.processors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import software.amazon.awssdk.codegen.model.service.Http;
+import software.amazon.awssdk.codegen.model.service.Operation;
+import software.amazon.awssdk.codegen.model.service.ServiceMetadata;
+import software.amazon.awssdk.codegen.model.service.ServiceModel;
+
+public class S3RemoveBucketFromUriProcessorTest {
+    private static final String WITH_BUCKET_URI_OPERATION = "WithBucketInUri";
+    private static final String WITHOUT_BUCKET_URI_OPERATION = "WithoutBucketInUri";
+    private static final String WITH_BUCKET_URI = "/{Bucket}/{Key+}";
+    private static final String WITHOUT_BUCKET_URI = "/{Key+}";
+
+    private final S3RemoveBucketFromUriProcessor processor = new S3RemoveBucketFromUriProcessor();
+
+    @Test
+    public void preprocess_serviceNotS3_doesNotModifyUri() {
+        ServiceModel nonS3 = createServiceModel("NonS3");
+        processor.preprocess(nonS3);
+
+        Map<String, Operation> operations = nonS3.getOperations();
+
+        assertThat(operations.get(WITH_BUCKET_URI_OPERATION).getHttp().getRequestUri()).isEqualTo(WITH_BUCKET_URI);
+        assertThat(operations.get(WITHOUT_BUCKET_URI_OPERATION).getHttp().getRequestUri()).isEqualTo(WITHOUT_BUCKET_URI);
+    }
+
+    @Test
+    public void preprocess_serviceIsS3_operationHasBucket_modifiesUri() {
+        ServiceModel s3 = createServiceModel("S3");
+        processor.preprocess(s3);
+
+        Map<String, Operation> operations = s3.getOperations();
+
+        assertThat(operations.get(WITH_BUCKET_URI_OPERATION).getHttp().getRequestUri()).isEqualTo("/{Key+}");
+    }
+
+    @Test
+    public void preprocess_serviceIsS3_operationDoesNotHaveBucket_noModification() {
+        ServiceModel s3 = createServiceModel("S3");
+        processor.preprocess(s3);
+
+        Map<String, Operation> operations = s3.getOperations();
+
+        assertThat(operations.get(WITHOUT_BUCKET_URI_OPERATION).getHttp().getRequestUri()).isEqualTo(WITHOUT_BUCKET_URI);
+    }
+
+    private static ServiceModel createServiceModel(String serviceId) {
+        ServiceModel model = new ServiceModel();
+
+        ServiceMetadata serviceMetadata = new ServiceMetadata();
+        serviceMetadata.setServiceId(serviceId);
+        model.setMetadata(serviceMetadata);
+
+        Operation operationWithBucketInUri = new Operation()
+            .withHttp(new Http().withRequestUri(WITH_BUCKET_URI));
+
+        Operation operationWithoutBucketInUri = new Operation()
+            .withHttp(new Http().withRequestUri(WITHOUT_BUCKET_URI));
+
+        Map<String, Operation> operations = new HashMap<>();
+        operations.put(WITH_BUCKET_URI_OPERATION, operationWithBucketInUri);
+        operations.put(WITHOUT_BUCKET_URI_OPERATION, operationWithoutBucketInUri);
+
+        model.setOperations(operations);
+
+        return model;
+    }
+}