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

Cloudwatch: Update grafana-aws-sdk to fix sts endpoints #87326

Merged
merged 1 commit into from
May 3, 2024
Merged

Conversation

iwysiu
Copy link
Contributor

@iwysiu iwysiu commented May 3, 2024

Updates the grafana-aws-sdk to get the fix for custom sts endpoints and fips endpoints.

Which issue(s) does this PR fix?:

Fixes #86496

Special notes for your reviewer:

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

@iwysiu iwysiu added add to changelog backport v10.4.x backport v11.0.x Mark PR for automatic backport to v11.0.x labels May 3, 2024
@iwysiu iwysiu requested review from a team, sarahzinger and kevinwcyu and removed request for a team May 3, 2024 14:48
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.1.x milestone May 3, 2024
Copy link
Contributor

Hello @iwysiu!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

1 similar comment
Copy link
Contributor

Hello @iwysiu!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

Copy link
Contributor

This PR must be merged before a backport PR will be created.

@iwysiu iwysiu marked this pull request as ready for review May 3, 2024 15:12
@iwysiu iwysiu requested review from a team as code owners May 3, 2024 15:12
@iwysiu iwysiu changed the title Cloudwatch: update grafana-aws-sdk to fix sts endpoints Cloudwatch: Update grafana-aws-sdk to fix sts endpoints May 3, 2024
@iwysiu iwysiu merged commit 5aeaeb6 into main May 3, 2024
40 checks passed
@iwysiu iwysiu deleted the iwysiu/86496 branch May 3, 2024 15:43
Copy link
Contributor

The backport to v10.4.x 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-87326-to-v10.4.x origin/v10.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5aeaeb6e9003e530d5ffea648a851f951d24557c

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-87326-to-v10.4.x
# Create the PR body template
PR_BODY=$(gh pr view 87326 --json body --template 'Backport 5aeaeb6e9003e530d5ffea648a851f951d24557c from #87326{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.4.x] Cloudwatch: Update grafana-aws-sdk to fix sts endpoints" --body-file - --label "type/bug" --label "area/backend" --label "add to changelog" --label "backport" --base v10.4.x --milestone 10.4.x --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-87326-to-v10.4.x

# Create a pull request where the `base` branch is `v10.4.x` and the `compare`/`head` branch is `backport-87326-to-v10.4.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87326-to-v10.4.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label May 3, 2024
Copy link
Contributor

The backport to v11.0.x 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-87326-to-v11.0.x origin/v11.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5aeaeb6e9003e530d5ffea648a851f951d24557c

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-87326-to-v11.0.x
# Create the PR body template
PR_BODY=$(gh pr view 87326 --json body --template 'Backport 5aeaeb6e9003e530d5ffea648a851f951d24557c from #87326{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v11.0.x] Cloudwatch: Update grafana-aws-sdk to fix sts endpoints" --body-file - --label "type/bug" --label "area/backend" --label "add to changelog" --label "backport" --base v11.0.x --milestone 11.0.x --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-87326-to-v11.0.x

# Create a pull request where the `base` branch is `v11.0.x` and the `compare`/`head` branch is `backport-87326-to-v11.0.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87326-to-v11.0.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/backend backport v10.4.x backport v11.0.x Mark PR for automatic backport to v11.0.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Datasource: CloudWatch STS AssumeRole broken since 10.4.x when using custom Endpoint
2 participants