From 7329671793e60cf492ea3aac097af3d0b57dcd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1rio=20Nascimento?= Date: Thu, 9 Apr 2020 16:58:32 +1000 Subject: [PATCH] Cloudwatch: prefer webIdentity over EC2 role (#23452) --- pkg/components/imguploader/s3uploader.go | 2 +- pkg/tsdb/cloudwatch/credentials.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/components/imguploader/s3uploader.go b/pkg/components/imguploader/s3uploader.go index 5a1e74b3890..15863378bc5 100644 --- 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), diff --git a/pkg/tsdb/cloudwatch/credentials.go b/pkg/tsdb/cloudwatch/credentials.go index d2f3b81daa4..427c23fa4bc 100644 --- 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()