readd session token to s3 credentials (#3144) (#3182)

Signed-off-by: Jan Jansen <jan.jansen@gdata.de> (cherry picked from commit 3008ee5) Co-authored-by: Jan Jansen <farodin91@users.noreply.github.com>
grafana · Nov 27, 2023 · 9398fd6 · 9398fd6
1 parent 7fdde5d
commit 9398fd6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -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{}),