Skip to content

Configure S3's credential chain based on config - #2889

Merged
mapno merged 3 commits into
grafana:mainfrom
mapno:fix-s3-credentials-chain
Sep 13, 2023
Merged

Configure S3's credential chain based on config#2889
mapno merged 3 commits into
grafana:mainfrom
mapno:fix-s3-credentials-chain

Conversation

@mapno

@mapno mapno commented Sep 5, 2023

Copy link
Copy Markdown
Contributor

What this PR does:

Configures the S3 credentials chain based on what S3 auth method is configured.

Added a config param to S3 config native_aws_auth_enabled. When enabled, Tempo will use the default authentication methods of the AWS SDK for go based on known environment variables and known AWS config files.

Which issue(s) this PR fixes:
Fixes #2888

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]
Comment thread tempodb/backend/s3/config.go
@datsabk

datsabk commented Sep 5, 2023

Copy link
Copy Markdown

@joe-elliott could we include some sort of documentation update alongside that tell what to configure for using this.

@mapno

mapno commented Sep 5, 2023

Copy link
Copy Markdown
Contributor Author

@joe-elliott could we include some sort of documentation update alongside that tell what to configure for using this.

I've updated the docs to include the new config param. Does that cover your request?

@mapno mapno self-assigned this Sep 6, 2023
@mapno mapno added the type/bug Something isn't working label Sep 6, 2023
@mapno
mapno enabled auto-merge (squash) September 13, 2023 10:28
@mapno
mapno merged commit 957f160 into grafana:main Sep 13, 2023
@mapno
mapno deleted the fix-s3-credentials-chain branch September 13, 2023 11:49
@github-actions

Copy link
Copy Markdown
Contributor

The backport to release-v2.2 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-2889-to-release-v2.2 origin/release-v2.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 957f1606c2af309d88c456fc7a5fb5737dcbc3a9
# When the conflicts are resolved, stage and commit the changes
git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Create the PR body template
PR_BODY=$(gh pr view 2889 --json body --template 'Backport 957f1606c2af309d88c456fc7a5fb5737dcbc3a9 from #2889{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Push the branch to GitHub and a PR
echo "${PR_BODY}" | gh pr create --title "[release-v2.2] Configure S3's credential chain based on config" --body-file - --label "type/bug" --label "backport" --base release-v2.2 --milestone release-v2.2 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# If you don't have the GitHub CLI installed: Push the branch to GitHub and manually create a PR:
git push --set-upstream origin backport-2889-to-release-v2.2
# Remove the local backport branch
git switch main
git branch -D backport-2889-to-release-v2.2

Unless you've used the GitHub CLI above, now create a pull request where the base branch is release-v2.2 and the compare/head branch is backport-2889-to-release-v2.2.

joe-elliott pushed a commit that referenced this pull request Sep 13, 2023
* Configure S3's credential chain based on config

* Changelog

* Update docs

(cherry picked from commit 957f160)
joe-elliott added a commit that referenced this pull request Sep 13, 2023
* Configure S3's credential chain based on config

* Changelog

* Update docs

(cherry picked from commit 957f160)

Co-authored-by: Mario <mariorvinas@gmail.com>
@ekristen ekristen mentioned this pull request Sep 22, 2023
5 tasks
mattdurham pushed a commit to mattdurham/tempo that referenced this pull request Jun 18, 2026
* Configure S3's credential chain based on config

* Changelog

* Update docs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

3 participants