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.

Sign up for GitHub

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

Jump to bottom

Fix/destination s3 default provider #14231

Merged
merged 5 commits into from
Jun 30, 2022
Merged

Fix/destination s3 default provider #14231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0dee54d
Merge pull request #1 from airbytehq/master
remlabm May 17, 2022
e1407e4
Merge branch 'airbytehq:master' into master
remlabm May 19, 2022
4c8909b
Merge branch 'airbytehq:master' into master
xorl Jun 28, 2022
2b06d3e
Updated INSTANCE_PROFILE to use AWSDefaultProfileCredential.
Jun 28, 2022
b36b4a4
Merge branch 'master' into fix/destination_s3_default_provider
xorl Jun 29, 2022
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
6 changes: 3 additions & 3 deletions ...tination-s3/src/main/java/io/airbyte/integrations/destination/s3/S3DestinationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import io.airbyte.integrations.destination.s3.credential.S3AccessKeyCredentialConfig;
import io.airbyte.integrations.destination.s3.credential.S3CredentialConfig;
import io.airbyte.integrations.destination.s3.credential.S3CredentialType;
import io.airbyte.integrations.destination.s3.credential.S3InstanceProfileCredentialConfig;
import io.airbyte.integrations.destination.s3.credential.S3AWSDefaultProfileCredentialConfig;
import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -88,7 +88,7 @@ public static S3DestinationConfig getS3DestinationConfig(final JsonNode config)
if (config.has("access_key_id")) {
credentialConfig = new S3AccessKeyCredentialConfig(config.get("access_key_id").asText(), config.get("secret_access_key").asText());
} else {
credentialConfig = new S3InstanceProfileCredentialConfig();
credentialConfig = new S3AWSDefaultProfileCredentialConfig();
}
builder = builder.withCredentialConfig(credentialConfig);

Expand Down Expand Up @@ -154,7 +154,7 @@ protected AmazonS3 createS3Client() {
final AWSCredentialsProvider credentialsProvider = credentialConfig.getS3CredentialsProvider();
final S3CredentialType credentialType = credentialConfig.getCredentialType();

if (credentialType == S3CredentialType.INSTANCE_PROFILE) {
if (credentialType == S3CredentialType.DEFAULT_PROFILE) {
return AmazonS3ClientBuilder.standard()
.withRegion(bucketRegion)
.withCredentials(credentialsProvider)
Expand Down
22 changes: 22 additions & 0 deletions ...o/airbyte/integrations/destination/s3/credential/S3AWSDefaultProfileCredentialConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.integrations.destination.s3.credential;

import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;

public class S3AWSDefaultProfileCredentialConfig implements S3CredentialConfig {

@Override
public S3CredentialType getCredentialType() {
return S3CredentialType.DEFAULT_PROFILE;
}

@Override
public AWSCredentialsProvider getS3CredentialsProvider() {
return new DefaultAWSCredentialsProviderChain();
}

}
2 changes: 1 addition & 1 deletion ...-s3/src/main/java/io/airbyte/integrations/destination/s3/credential/S3CredentialType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
public enum S3CredentialType {

ACCESS_KEY,
INSTANCE_PROFILE
DEFAULT_PROFILE

}