Cloudwatch: prefer webIdentity over EC2 role (#23452)

73296717 · Dário Nascimento · GitHub · 3acc318d · 73296717 · 73296717
Commit 73296717 authored Apr 09, 2020 by Dário Nascimento Committed by GitHub Apr 08, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

pkg/components/imguploader/s3uploader.go
+1 -1

pkg/tsdb/cloudwatch/credentials.go
+1 -1

No files found.
--- a/pkg/components/imguploader/s3uploader.go
+++ b/pkg/components/imguploader/s3uploader.go
@@ -58,8 +58,8 @@ func (u *S3Uploader) Upload(ctx context.Context, imageDiskPath string) (string, 
 				SecretAccessKey: u.secretKey,
 			}},
 			&credentials.EnvProvider{},
-			remoteCredProvider(sess),
 			webIdentityProvider(sess),
+			remoteCredProvider(sess),
 		})
 	cfg := &aws.Config{
 		Region:           aws.String(u.region),

--- a/pkg/tsdb/cloudwatch/credentials.go
+++ b/pkg/tsdb/cloudwatch/credentials.go
@@ -106,8 +106,8 @@ func GetCredentials(dsInfo *DatasourceInfo) (*credentials.Credentials, error) {
 				SecretAccessKey: dsInfo.SecretKey,
 			}},
 			&credentials.SharedCredentialsProvider{Filename: "", Profile: dsInfo.Profile},
-			remoteCredProvider(sess),
 			webIdentityProvider(sess),
+			remoteCredProvider(sess),
 		})

 	credentialCacheLock.Lock()