Skip to content

feat: load different sdk defaults value from defaults mode #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ final class RuntimeConfigGenerator {
private final Map<String, Consumer<TypeScriptWriter>> nodeRuntimeConfigDefaults = MapUtils.of(
"requestHandler", writer -> {
writer.addDependency(TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER);
writer.addImport("NodeHttpHandler", "NodeHttpHandler",
writer.addImport("NodeHttpHandler", "RequestHandler",
TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER.packageName);
writer.write("new NodeHttpHandler()");
writer.write("new RequestHandler(defaultConfigProvider)");
},
"sha256", writer -> {
writer.addDependency(TypeScriptDependency.AWS_SDK_HASH_NODE);
Expand Down Expand Up @@ -94,9 +94,9 @@ final class RuntimeConfigGenerator {
private final Map<String, Consumer<TypeScriptWriter>> browserRuntimeConfigDefaults = MapUtils.of(
"requestHandler", writer -> {
writer.addDependency(TypeScriptDependency.AWS_SDK_FETCH_HTTP_HANDLER);
writer.addImport("FetchHttpHandler", "FetchHttpHandler",
writer.addImport("FetchHttpHandler", "RequestHandler",
TypeScriptDependency.AWS_SDK_FETCH_HTTP_HANDLER.packageName);
writer.write("new FetchHttpHandler()");
writer.write("new RequestHandler(defaultConfigProvider)");
},
"sha256", writer -> {
writer.addDependency(TypeScriptDependency.AWS_CRYPTO_SHA256_BROWSER);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ public enum TypeScriptDependency implements SymbolDependencyContainer {

AWS_SDK_UTIL_WAITERS("dependencies", "@aws-sdk/util-waiter", false),

AWS_SDK_UTIL_DEFAULTS_MODE_NODE("dependencies", "@aws-sdk/util-defaults-mode-node", true),
AWS_SDK_UTIL_DEFAULTS_MODE_BROWSER("dependencies", "@aws-sdk/util-defaults-mode-browser", true),

// Conditionally added when httpChecksumRequired trait exists
MD5_BROWSER("dependencies", "@aws-sdk/md5-js", false),
STREAM_HASHER_NODE("dependencies", "@aws-sdk/hash-stream-node", false),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Copyright 2019 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.smithy.typescript.codegen.integration;

import software.amazon.smithy.codegen.core.SymbolProvider;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
import software.amazon.smithy.utils.SmithyInternalApi;

/**
* Adds defaults mode dependencies if needed.
*/
@SmithyInternalApi
public class AddDefaultsModeDependency implements TypeScriptIntegration {
@Override
public void addConfigInterfaceFields(
TypeScriptSettings settings,
Model model,
SymbolProvider symbolProvider,
TypeScriptWriter writer
) {
// Dependencies used in the default runtime config template.
writer.addDependency(TypeScriptDependency.AWS_SDK_UTIL_DEFAULTS_MODE_BROWSER);
writer.addDependency(TypeScriptDependency.AWS_SDK_UTIL_DEFAULTS_MODE_NODE);
writer.addImport("DefaultsMode", "DefaultsMode", TypeScriptDependency.AWS_SMITHY_CLIENT.packageName);
writer.addImport("Provider", "Provider", TypeScriptDependency.AWS_SDK_TYPES.packageName);
writer.writeDocs("The {@link DefaultsMode} that will be used to determine how certain default configuration "
+ "options are resolved in the SDK.");
writer.write("defaultsMode?: DefaultsMode | Provider<DefaultsMode>;");
}
}
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
software.amazon.smithy.typescript.codegen.integration.AddEventStreamDependency
software.amazon.smithy.typescript.codegen.integration.AddChecksumRequiredDependency
software.amazon.smithy.typescript.codegen.integration.AddChecksumRequiredDependency
software.amazon.smithy.typescript.codegen.integration.AddDefaultsModeDependency
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import { ${clientConfigName} } from "${clientModuleName}";
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
import { resolveDefaultsModeConfig } from "@aws-sdk/util-defaults-mode-browser";

/**
* @internal
*/
export const getRuntimeConfig = (config: ${clientConfigName}) => {
const defaultsMode = resolveDefaultsModeConfig(config);
const defaultConfigProvider = () => defaultsMode().then(loadConfigsForDefaultMode);
const clientSharedValues = getSharedRuntimeConfig(config);
return {
...clientSharedValues,
...config,
runtime: "browser",
defaultsMode,
${customizations}
};
};
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import { ${clientConfigName} } from "${clientModuleName}";
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
import { resolveDefaultsModeConfig } from "@aws-sdk/util-defaults-mode-node";

/**
* @internal
*/
export const getRuntimeConfig = (config: ${clientConfigName}) => {
const defaultsMode = resolveDefaultsModeConfig(config);
const defaultConfigProvider = () => defaultsMode().then(loadConfigsForDefaultMode);
const clientSharedValues = getSharedRuntimeConfig(config);
return {
...clientSharedValues,
...config,
runtime: "node",
defaultsMode,
${customizations}
};
};