fix(codegen): limit the Bucket param dedupe to S3 service

Author: kuhe

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java

@@ -30,6 +30,7 @@
 import java.util.function.Consumer;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import software.amazon.smithy.aws.traits.ServiceTrait;
 import software.amazon.smithy.codegen.core.CodegenException;
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.codegen.core.SymbolProvider;
@@ -96,9 +97,12 @@ public abstract class HttpBindingProtocolGenerator implements ProtocolGenerator
     private final boolean isErrorCodeInBody;
     private final EventStreamGenerator eventStreamGenerator = new EventStreamGenerator();
     private final LinkedHashMap<String, String> headerBuffer = new LinkedHashMap<>();
-    private final Set<String> contextParamDeduplicationControlSet = SetUtils.of(
+    private final Set<String> contextParamDeduplicationParamControlSet = SetUtils.of(
         "Bucket"
     );
+    private final Set<String> contextParamDeduplicationServiceControlSet = SetUtils.of(
+        "S3"
+    );
 
     /**
      * Creates a Http binding protocol generator.
@@ -735,6 +739,11 @@ private void writeResolvedPath(
                 .getContextParams(context.getModel().getShape(operation.getInputShape()).get())
             : Collections.emptyMap();
 
+        String serviceId = context.getService()
+            .getTrait(ServiceTrait.class)
+            .map(ServiceTrait::getSdkId)
+            .orElse("");
+
         // Always write the bound path, but only the actual segments.
         writer.write("let resolvedPath = `$L` + $S;",
                 "${basePath?.endsWith('/') ? basePath.slice(0, -1) : (basePath || '')}",
@@ -751,8 +760,9 @@ private void writeResolvedPath(
                         // do not want to include it in the operation URI to be resolved.
                         // We use this logic plus a temporary control-list, since it is not yet known
                         // how many services and param names will have this issue.
-
-                        return !(isContextParam && contextParamDeduplicationControlSet.contains(content));
+                        return !(isContextParam
+                            && contextParamDeduplicationParamControlSet.contains(content)
+                            && contextParamDeduplicationServiceControlSet.contains(serviceId));
                     })
                     .map(Segment::toString)
                     .collect(Collectors.joining("/"))