Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

readd session token to s3 credentials #3144

Merged

Conversation

farodin91
Copy link
Contributor

@farodin91 farodin91 commented Nov 15, 2023

What this PR does:
Support was removed in #3006

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@joe-elliott
Copy link
Member

Thanks for catching and fixing this. Can you add a changelog entry?

@farodin91 farodin91 force-pushed the readd-session-token-to-s3-credentials branch from b3e63d9 to 47fbdd6 Compare November 15, 2023 14:11
@farodin91
Copy link
Contributor Author

changelog added

Copy link
Member

@joe-elliott joe-elliott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks for the fix. Do you need this backported to use 2.3?

cc @mapno

@joe-elliott joe-elliott merged commit 3008ee5 into grafana:main Nov 16, 2023
14 checks passed
@farodin91
Copy link
Contributor Author

@joe-elliott Would be nice.

@joe-elliott joe-elliott added type/bug Something isn't working backport release-v2.3 labels Nov 22, 2023
Copy link
Contributor

The backport to release-v2.3 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-3144-to-release-v2.3 origin/release-v2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 3008ee5c610129fb16bce408fa17b39c26cf5b5f

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3144-to-release-v2.3
# Create the PR body template
PR_BODY=$(gh pr view 3144 --json body --template 'Backport 3008ee5c610129fb16bce408fa17b39c26cf5b5f from #3144{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-v2.3] readd session token to s3 credentials" --body-file - --label "type/bug" --label "backport" --base release-v2.3 --milestone release-v2.3 --web

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

# Push the branch to GitHub:
git push --set-upstream origin backport-3144-to-release-v2.3

# Create a pull request where the `base` branch is `release-v2.3` and the `compare`/`head` branch is `backport-3144-to-release-v2.3`.

# Remove the local backport branch
git switch main
git branch -D backport-3144-to-release-v2.3

joe-elliott pushed a commit that referenced this pull request Nov 27, 2023
Signed-off-by: Jan Jansen <[email protected]>
(cherry picked from commit 3008ee5)
joe-elliott added a commit that referenced this pull request Nov 27, 2023
Signed-off-by: Jan Jansen <[email protected]>
(cherry picked from commit 3008ee5)

Co-authored-by: Jan Jansen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants