From a35c09b27e28a6d64c61e01af457dee954e48164 Mon Sep 17 00:00:00 2001 From: Jan Jansen Date: Thu, 16 Nov 2023 21:38:18 +0100 Subject: [PATCH] readd session token to s3 credentials (#3144) Signed-off-by: Jan Jansen (cherry picked from commit 3008ee5c610129fb16bce408fa17b39c26cf5b5f) --- CHANGELOG.md | 1 + tempodb/backend/s3/s3.go | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae64fedd9a2..161683617aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * [BUGFIX] Include statusMessage intrinsic attribute in tag search. [#3084](https://github.com/grafana/tempo/pull/3084) (@rcrowe) * [BUGFIX] Fix compactor ignore configured S3 headers [#3149](https://github.com/grafana/tempo/pull/3154) (@Batkilin) +* [BUGFIX] Readd session token to s3 credentials. [#3144](https://github.com/grafana/tempo/pull/3144) (@farodin91) ## v2.3.0-rc.0 / 2023-10-20 diff --git a/tempodb/backend/s3/s3.go b/tempodb/backend/s3/s3.go index c8deb2ba851..1ad0cfe0947 100644 --- a/tempodb/backend/s3/s3.go +++ b/tempodb/backend/s3/s3.go @@ -435,6 +435,7 @@ func fetchCreds(cfg *Config) (*credentials.Credentials, error) { Value: credentials.Value{ AccessKeyID: cfg.AccessKey, SecretAccessKey: cfg.SecretKey.String(), + SessionToken: cfg.SessionToken.String(), }, }), wrapCredentialsProvider(&credentials.EnvAWS{}),