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

[Backport 6.2] fix(region_name): handle case of region_name doesn't exist #9700

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 8, 2025

in #9492 some code changed to assume region_name always exists and when not using AWS, it doesn't exist (or it's empty)

switch to retrieving it in a safer way

Ref: #9492

Testing

  • provision test

PR pre-checks (self review)

  • I added the relevant backport labels
  • I didn't leave commented-out/debugging code

Reminders

  • Add New configuration option and document them (in sdcm/sct_config.py)
  • Add unit tests to cover my changes (under unit-test/ folder)
  • Update the Readme/doc folder relevant to this change (if needed)

(cherry picked from commit 7d51938)

Parent PR: #9698

@mergify mergify bot added the conflicts label Jan 8, 2025
@mergify mergify bot assigned fruch Jan 8, 2025
Copy link
Author

mergify bot commented Jan 8, 2025

Cherry-pick of 7d51938 has failed:

On branch mergify/bp/branch-6.2/pr-9698
Your branch is up to date with 'origin/branch-6.2'.

You are currently cherry-picking commit 7d51938c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mgmt_cli_test.py
	both modified:   mgmt_upgrade_test.py
	both modified:   sdcm/cluster.py
	both modified:   sdcm/cluster_k8s/eks.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot marked this pull request as draft January 8, 2025 12:24
in #9492 some code changed to assume `region_name` always exists
and when not using AWS, it doesn't exist (or it's empty)

switch to retriving it in a safer way

Ref: #9492
(cherry picked from commit 7d51938)
@fruch fruch force-pushed the mergify/bp/branch-6.2/pr-9698 branch from 7e3c924 to 8b231d9 Compare January 8, 2025 12:56
@fruch fruch removed the conflicts label Jan 8, 2025
@fruch fruch marked this pull request as ready for review January 8, 2025 18:28
@fruch fruch merged commit 64b7a97 into branch-6.2 Jan 8, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant