Skip to content

Fix #1418 Expose AwsCredentialsProvider to AmazonS3InstallationService #1419

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

Merged
seratch merged 1 commit into from
Jan 15, 2025
Merged

Fix #1418 Expose AwsCredentialsProvider to AmazonS3InstallationService #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 29 additions & 4 deletions bolt/src/main/java/com/slack/api/bolt/service/builtin/AmazonS3InstallationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
import software.amazon.awssdk.core.ResponseBytes;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.core.sync.ResponseTransformer;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.*;

import java.io.IOException;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Optional;
Expand All @@ -26,19 +28,38 @@
public class AmazonS3InstallationService implements InstallationService {

private final String bucketName;
private AwsCredentialsProvider credentialsProvider;

private final AwsCredentialsProvider credentialsProvider;
private final Region region;
private final URI endpointOverride;

private boolean historicalDataEnabled;

public AmazonS3InstallationService(String bucketName) {
this(bucketName, DefaultCredentialsProvider.create(), null, null);
}

public AmazonS3InstallationService(String bucketName, AwsCredentialsProvider credentialsProvider) {
this(bucketName, credentialsProvider, null, null);
}

public AmazonS3InstallationService(
String bucketName,
AwsCredentialsProvider credentialsProvider,
Region region,
String endpointOverride
) {
this.bucketName = bucketName;
this.credentialsProvider = credentialsProvider;
this.region = (region != null || System.getenv("AWS_REGION") == null) ? region : Region.of(System.getenv("AWS_REGION"));
this.endpointOverride = (endpointOverride != null && !endpointOverride.isEmpty()) ? URI.create(endpointOverride) : null;
Copy link
Copy Markdown

@bruceadowns bruceadowns Jan 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
this.endpointOverride = (endpointOverride != null && !endpointOverride.isEmpty()) ? URI.create(endpointOverride) : null;
this.endpointOverride = StringUtils.isBlank(endpointOverride) ? null : URI.create(endpointOverride);

}

@Override
public Initializer initializer() {
return (app) -> {
// The first access to S3 tends to be slow on AWS Lambda.
this.credentialsProvider = DefaultCredentialsProvider.create();
AwsCredentials credentials = createCredentials(credentialsProvider);
AwsCredentials credentials = createCredentials(this.credentialsProvider);
if (credentials == null || credentials.accessKeyId() == null) {
throw new IllegalStateException("AWS credentials not found");
}
Expand Down Expand Up @@ -304,7 +325,11 @@ protected AwsCredentials createCredentials(AwsCredentialsProvider provider) {
}

protected S3Client createS3Client() {
return S3Client.builder().credentialsProvider(this.credentialsProvider).build();
return S3Client.builder()
.credentialsProvider(this.credentialsProvider)
.region(this.region)
.endpointOverride(this.endpointOverride)
.build();
}

private String getInstallerKey(Installer i) {
Expand Down
32 changes: 28 additions & 4 deletions bolt/src/main/java/com/slack/api/bolt/service/builtin/AmazonS3OAuthStateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
import software.amazon.awssdk.core.ResponseBytes;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.core.sync.ResponseTransformer;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.*;

import java.net.URI;
import java.nio.charset.StandardCharsets;

/**
Expand All @@ -23,18 +25,36 @@
public class AmazonS3OAuthStateService implements OAuthStateService {

private final String bucketName;
private AwsCredentialsProvider credentialsProvider;

private final AwsCredentialsProvider credentialsProvider;
private final Region region;
private final URI endpointOverride;

public AmazonS3OAuthStateService(String bucketName) {
this(bucketName, DefaultCredentialsProvider.create());
}

public AmazonS3OAuthStateService(String bucketName, AwsCredentialsProvider credentialsProvider) {
this(bucketName, credentialsProvider, null, null);
}

public AmazonS3OAuthStateService(
String bucketName,
AwsCredentialsProvider credentialsProvider,
Region region,
String endpointOverride
) {
this.bucketName = bucketName;
this.credentialsProvider = credentialsProvider;
this.region = (region != null || System.getenv("AWS_REGION") == null) ? region : Region.of(System.getenv("AWS_REGION"));
this.endpointOverride = (endpointOverride != null && !endpointOverride.isEmpty()) ? URI.create(endpointOverride) : null;
}

@Override
public Initializer initializer() {
return (app) -> {
// The first access to S3 tends to be slow on AWS Lambda.
this.credentialsProvider = DefaultCredentialsProvider.create();
AwsCredentials credentials = createCredentials(credentialsProvider);
AwsCredentials credentials = createCredentials(this.credentialsProvider);
if (credentials == null || credentials.accessKeyId() == null) {
throw new IllegalStateException("AWS credentials not found");
}
Expand Down Expand Up @@ -103,7 +123,11 @@ protected AwsCredentials createCredentials(AwsCredentialsProvider provider) {
}

protected S3Client createS3Client() {
return S3Client.builder().credentialsProvider(this.credentialsProvider).build();
return S3Client.builder()
.credentialsProvider(this.credentialsProvider)
.region(this.region)
.endpointOverride(this.endpointOverride)
.build();
}

private String getKey(String state) {
Expand Down