Skip to content

Commit 3b49e3b

Browse files
committed
fix(s3-control): default config.signingEscapePath to false
1 parent ab145a1 commit 3b49e3b

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

clients/client-s3-control/src/runtimeConfig.shared.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ export const getRuntimeConfig = (config: S3ControlClientConfig) => ({
1414
logger: config?.logger ?? ({} as __Logger),
1515
regionInfoProvider: config?.regionInfoProvider ?? defaultRegionInfoProvider,
1616
serviceId: config?.serviceId ?? "S3 Control",
17+
signingEscapePath: config?.signingEscapePath ?? false,
1718
urlParser: config?.urlParser ?? parseUrl,
1819
});

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddS3ControlDependency.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,28 @@
1818
import static software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin.Convention.HAS_CONFIG;
1919
import static software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin.Convention.HAS_MIDDLEWARE;
2020

21+
import java.util.Collections;
2122
import java.util.List;
23+
import java.util.Map;
2224
import java.util.Optional;
25+
import java.util.function.Consumer;
26+
2327
import software.amazon.smithy.aws.traits.ServiceTrait;
28+
import software.amazon.smithy.codegen.core.SymbolProvider;
2429
import software.amazon.smithy.model.Model;
2530
import software.amazon.smithy.model.shapes.MemberShape;
2631
import software.amazon.smithy.model.shapes.OperationShape;
2732
import software.amazon.smithy.model.shapes.ServiceShape;
2833
import software.amazon.smithy.model.shapes.Shape;
2934
import software.amazon.smithy.model.traits.RequiredTrait;
3035
import software.amazon.smithy.model.transform.ModelTransformer;
36+
import software.amazon.smithy.typescript.codegen.LanguageTarget;
3137
import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
38+
import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
3239
import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;
3340
import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
3441
import software.amazon.smithy.utils.ListUtils;
42+
import software.amazon.smithy.utils.MapUtils;
3543
import software.amazon.smithy.utils.SmithyInternalApi;
3644

3745
/**
@@ -81,6 +89,25 @@ public Model preprocessModel(Model model, TypeScriptSettings settings) {
8189
});
8290
}
8391

92+
@Override
93+
public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
94+
TypeScriptSettings settings, Model model,
95+
SymbolProvider symbolProvider, LanguageTarget target
96+
) {
97+
if (!isS3Control(settings.getService(model))) {
98+
return Collections.emptyMap();
99+
}
100+
switch (target) {
101+
case SHARED:
102+
return MapUtils.of("signingEscapePath", writer -> {
103+
writer.write("false");
104+
});
105+
case NODE:
106+
default:
107+
return Collections.emptyMap();
108+
}
109+
}
110+
84111
private static boolean isS3Control(ServiceShape service) {
85112
String serviceId = service.getTrait(ServiceTrait.class).map(ServiceTrait::getSdkId).orElse("");
86113
return serviceId.equals("S3 Control");

0 commit comments

Comments
 (0)