Skip to content
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

feat(region-config): add aws region runtime extension codegen #5157

Merged
merged 2 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,20 @@

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.logging.Logger;
import software.amazon.smithy.aws.traits.ServiceTrait;
import software.amazon.smithy.aws.typescript.codegen.extensions.AwsRegionExtensionConfiguration;
import software.amazon.smithy.codegen.core.SymbolProvider;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.shapes.ServiceShape;
import software.amazon.smithy.typescript.codegen.LanguageTarget;
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.typescript.codegen.extensions.ExtensionConfigurationInterface;
import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
import software.amazon.smithy.utils.MapUtils;
import software.amazon.smithy.utils.SmithyInternalApi;
Expand Down Expand Up @@ -130,6 +133,11 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
return runtimeConfigs;
}

@Override
public List<ExtensionConfigurationInterface> getExtensionConfigurationInterfaces() {
return List.of(new AwsRegionExtensionConfiguration());
}

private Map<String, Consumer<TypeScriptWriter>> getDefaultConfig(
LanguageTarget target,
TypeScriptSettings settings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
import java.util.Map;
import java.util.Properties;
import software.amazon.smithy.codegen.core.SymbolDependency;
import software.amazon.smithy.codegen.core.SymbolDependencyContainer;
import software.amazon.smithy.typescript.codegen.PackageContainer;
import software.amazon.smithy.typescript.codegen.Dependency;
import software.amazon.smithy.utils.IoUtils;
import software.amazon.smithy.utils.SmithyInternalApi;

Expand All @@ -36,7 +35,7 @@
* this package.
*/
@SmithyInternalApi
public enum AwsDependency implements PackageContainer, SymbolDependencyContainer {
public enum AwsDependency implements Dependency {

MIDDLEWARE_SIGNING(NORMAL_DEPENDENCY, "@aws-sdk/middleware-signing"),
MIDDLEWARE_TOKEN(NORMAL_DEPENDENCY, "@aws-sdk/middleware-token"),
Expand Down Expand Up @@ -86,7 +85,9 @@ public enum AwsDependency implements PackageContainer, SymbolDependencyContainer
MIDDLEWARE_API_KEY(NORMAL_DEPENDENCY, "@aws-sdk/middleware-api-key"),

// feat(experimentalIdentityAndAuth): Conditionally added when @httpBearerAuth is used in an AWS service
TOKEN_PROVIDERS(NORMAL_DEPENDENCY, "@aws-sdk/token-providers");
TOKEN_PROVIDERS(NORMAL_DEPENDENCY, "@aws-sdk/token-providers"),
TYPES(NORMAL_DEPENDENCY, "@aws-sdk/types"),
REGION_CONFIG_RESOLVER(NORMAL_DEPENDENCY, "@aws-sdk/region-config-resolver");

public final String packageName;
public final String version;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* 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.smithy.aws.typescript.codegen.extensions;

import software.amazon.smithy.aws.typescript.codegen.AwsDependency;
import software.amazon.smithy.typescript.codegen.Dependency;
import software.amazon.smithy.typescript.codegen.extensions.ExtensionConfigurationInterface;
import software.amazon.smithy.utils.Pair;

public class AwsRegionExtensionConfiguration implements ExtensionConfigurationInterface {
@Override
public Pair<String, Dependency> name() {
return Pair.of("AwsRegionExtensionConfiguration", AwsDependency.TYPES);
}

@Override
public Pair<String, Dependency> getExtensionConfigurationFn() {
return Pair.of("getAwsRegionExtensionConfiguration", AwsDependency.REGION_CONFIG_RESOLVER);
}

@Override
public Pair<String, Dependency> resolveRuntimeConfigFn() {
return Pair.of("resolveAwsRegionExtensionConfiguration", AwsDependency.REGION_CONFIG_RESOLVER);
}
}
1 change: 1 addition & 0 deletions packages/token-providers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"@smithy/util-defaults-mode-node": "^2.0.10",
"@smithy/util-retry": "^2.0.0",
"@smithy/util-utf8": "^2.0.0",
"@smithy/querystring-builder": "^2.0.6",
syall marked this conversation as resolved.
Show resolved Hide resolved
"tslib": "^2.5.0"
},
"devDependencies": {
Expand Down