-
Notifications
You must be signed in to change notification settings - Fork 189
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes 137. Add installer client factory, refreshing credentials provi…
…der, and tests. (#142) * Fixes 137. Add installer client factory, refreshing credentials provider, and tests. This commit resolves issue 137 by adding a new AwsClientBuilder Factory to the installer which automatically applies default configurations: one of which being a new RefreshingProfileDefaultCredentialsProvider, which acts just the same as the DefaultCredentialsProvider, but automatically refreshing profile credentials by recreating the underlying provider on each resolveCredentials call. * fix some checkstyle violations and reduce the allowed count in installer * clean up unnecessary imports and log lines * s/BoostAwsClientBuilderFactory/AwsClientBuilderFactory/, fix memory leak in ProfileUtils test, move IAM global region override to client factory * upgrade installer aws-java-sdk to latest to fix TooManyRequests error in update Co-authored-by: PoeppingT <[email protected]>
- Loading branch information
Showing
8 changed files
with
632 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
130 changes: 130 additions & 0 deletions
130
...n/java/com/amazon/aws/partners/saasfactory/saasboost/clients/AwsClientBuilderFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| /** | ||
| * 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License 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 com.amazon.aws.partners.saasfactory.saasboost.clients; | ||
|
|
||
| import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; | ||
| import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder; | ||
| import software.amazon.awssdk.core.SdkClient; | ||
| import software.amazon.awssdk.regions.Region; | ||
| import software.amazon.awssdk.services.apigateway.ApiGatewayClient; | ||
| import software.amazon.awssdk.services.apigateway.ApiGatewayClientBuilder; | ||
| import software.amazon.awssdk.services.cloudformation.CloudFormationClient; | ||
| import software.amazon.awssdk.services.cloudformation.CloudFormationClientBuilder; | ||
| import software.amazon.awssdk.services.ecr.EcrClient; | ||
| import software.amazon.awssdk.services.ecr.EcrClientBuilder; | ||
| import software.amazon.awssdk.services.iam.IamClient; | ||
| import software.amazon.awssdk.services.iam.IamClientBuilder; | ||
| import software.amazon.awssdk.services.lambda.LambdaClient; | ||
| import software.amazon.awssdk.services.lambda.LambdaClientBuilder; | ||
| import software.amazon.awssdk.services.quicksight.QuickSightClient; | ||
| import software.amazon.awssdk.services.quicksight.QuickSightClientBuilder; | ||
| import software.amazon.awssdk.services.s3.S3Client; | ||
| import software.amazon.awssdk.services.s3.S3ClientBuilder; | ||
| import software.amazon.awssdk.services.ssm.SsmClient; | ||
| import software.amazon.awssdk.services.ssm.SsmClientBuilder; | ||
| import software.amazon.awssdk.services.sts.StsClient; | ||
| import software.amazon.awssdk.services.sts.StsClientBuilder; | ||
|
|
||
| public class AwsClientBuilderFactory { | ||
|
|
||
| private static final AwsCredentialsProvider DEFAULT_CREDENTIALS_PROVIDER = | ||
| RefreshingProfileDefaultCredentialsProvider.builder().build(); | ||
|
|
||
| private final Region awsRegion; | ||
| private final AwsCredentialsProvider credentialsProvider; | ||
|
|
||
| private AwsClientBuilderFactory(Builder builder) { | ||
| // passing no region or a null region to any of the AWS Client Builders | ||
| // leads to the default region from the configured profile being used | ||
| this.awsRegion = builder.defaultRegion; | ||
| this.credentialsProvider = builder.awsCredentialsProvider != null | ||
| ? builder.awsCredentialsProvider | ||
| : DEFAULT_CREDENTIALS_PROVIDER; | ||
| } | ||
|
|
||
| // VisibleForTesting | ||
| <C extends SdkClient, B extends AwsClientBuilder<B, C>> B decorateBuilderWithDefaults(B builder) { | ||
| return builder | ||
| .credentialsProvider(credentialsProvider) | ||
| .region(awsRegion); | ||
| } | ||
|
|
||
| public ApiGatewayClientBuilder apiGatewayBuilder() { | ||
| return decorateBuilderWithDefaults(ApiGatewayClient.builder()); | ||
| } | ||
|
|
||
| public CloudFormationClientBuilder cloudFormationBuilder() { | ||
| return decorateBuilderWithDefaults(CloudFormationClient.builder()); | ||
| } | ||
|
|
||
| public EcrClientBuilder ecrBuilder() { | ||
| return decorateBuilderWithDefaults(EcrClient.builder()); | ||
| } | ||
|
|
||
| public IamClientBuilder iamBuilder() { | ||
| // IAM is not regionalized: all endpoints except us-gov and aws-cn use the AWS_GLOBAL region | ||
| // ref: https://docs.aws.amazon.com/general/latest/gr/iam-service.html | ||
| return decorateBuilderWithDefaults(IamClient.builder()).region(Region.AWS_GLOBAL); | ||
| } | ||
|
|
||
| public LambdaClientBuilder lambdaBuilder() { | ||
| return decorateBuilderWithDefaults(LambdaClient.builder()); | ||
| } | ||
|
|
||
| public QuickSightClientBuilder quickSightBuilder() { | ||
| return decorateBuilderWithDefaults(QuickSightClient.builder()); | ||
| } | ||
|
|
||
| public S3ClientBuilder s3Builder() { | ||
| return decorateBuilderWithDefaults(S3Client.builder()); | ||
| } | ||
|
|
||
| public SsmClientBuilder ssmBuilder() { | ||
| return decorateBuilderWithDefaults(SsmClient.builder()); | ||
| } | ||
|
|
||
| public StsClientBuilder stsBuilder() { | ||
| return decorateBuilderWithDefaults(StsClient.builder()); | ||
| } | ||
|
|
||
| public static Builder builder() { | ||
| return new Builder(); | ||
| } | ||
|
|
||
| public static class Builder { | ||
| private Region defaultRegion; | ||
| private AwsCredentialsProvider awsCredentialsProvider; | ||
|
|
||
| private Builder() { | ||
|
|
||
| } | ||
|
|
||
| public Builder region(Region defaultRegion) { | ||
| this.defaultRegion = defaultRegion; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder credentialsProvider(AwsCredentialsProvider awsCredentialsProvider) { | ||
| this.awsCredentialsProvider = awsCredentialsProvider; | ||
| return this; | ||
| } | ||
|
|
||
| public AwsClientBuilderFactory build() { | ||
| return new AwsClientBuilderFactory(this); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.