highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-09-26 19:46:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for passing in an external ID when using S3 assume role (#1290)

Browse Source
This commit is contained in:
Riyadh Al Nur
2024-05-25 21:26:21 +02:00
committed by GitHub
parent e703f6d4d0
commit 259b66e5e9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.go
View File

@@ -107,6 +107,7 @@ var (
S3Region string
S3Endpoint string
S3AssumeRoleArn string
S3AssumeRoleExternalID string
S3MultiRegion bool
S3DecryptionClientEnabled bool
@@ -303,6 +304,7 @@ func Reset() {
S3Region = ""
S3Endpoint = ""
S3AssumeRoleArn = ""
S3AssumeRoleExternalID = ""
S3MultiRegion = false
S3DecryptionClientEnabled = false
GCSEnabled = false
@@ -514,6 +516,7 @@ func Configure() error {
configurators.String(&S3Region, "IMGPROXY_S3_REGION")
configurators.String(&S3Endpoint, "IMGPROXY_S3_ENDPOINT")
configurators.String(&S3AssumeRoleArn, "IMGPROXY_S3_ASSUME_ROLE_ARN")
configurators.String(&S3AssumeRoleExternalID, "IMGPROXY_S3_ASSUME_ROLE_EXTERNAL_ID")
configurators.Bool(&S3MultiRegion, "IMGPROXY_S3_MULTI_REGION")
configurators.Bool(&S3DecryptionClientEnabled, "IMGPROXY_S3_USE_DECRYPTION_CLIENT")

6
transport/s3/s3.go
View File

@@ -66,7 +66,11 @@ func New() (http.RoundTripper, error) {
}
if len(config.S3AssumeRoleArn) != 0 {
creds := stscreds.NewAssumeRoleProvider(sts.NewFromConfig(conf), config.S3AssumeRoleArn)
creds := stscreds.NewAssumeRoleProvider(sts.NewFromConfig(conf), config.S3AssumeRoleArn, func(o *stscreds.AssumeRoleOptions) {
if len(config.S3AssumeRoleExternalID) != 0 {
o.ExternalID = aws.String(config.S3AssumeRoleExternalID)
}
})
conf.Credentials = creds
}