From 3008ee5c610129fb16bce408fa17b39c26cf5b5f 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 --- CHANGELOG.md | 1 + tempodb/backend/s3/s3.go | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e90bc11492..ff90c5de244 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * [BUGFIX] Include statusMessage intrinsic attribute in tag search. [#3084](https://github.com/grafana/tempo/pull/3084) (@rcrowe) * [ENHANCEMENT] Update poller to make use of previous results and reduce backend load. [#2652](https://github.com/grafana/tempo/pull/2652) (@zalegrala) * [ENHANCEMENT] Improve TraceQL regex performance in certain queries. [#3139](https://github.com/grafana/tempo/pull/3139) (@joe-elliott) +* [BUGFIX] Readd session token to s3 credentials. [#3144](https://github.com/grafana/tempo/pull/3144) (@farodin91) ## v2.3.0 / 2023-10-30 diff --git a/tempodb/backend/s3/s3.go b/tempodb/backend/s3/s3.go index cd8914d8bac..7435fb23931 100644 --- a/tempodb/backend/s3/s3.go +++ b/tempodb/backend/s3/s3.go @@ -549,6 +549,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{}),