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.

Sign up for GitHub

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

Jump to bottom

backup_plan - fix idempotency issue with botocore >= 1.31.36 #1961

Merged
merged 4 commits into from
Feb 5, 2024
Merged

backup_plan - fix idempotency issue with botocore >= 1.31.36 #1961

merged 4 commits into from
Feb 5, 2024

Conversation

alinabuzachis
Copy link
Collaborator

@alinabuzachis alinabuzachis commented Feb 2, 2024 •
edited
Loading

SUMMARY

Fixes #1952
backup_plan - fix idempotency issue with botocore >= 1.31.36

ISSUE TYPE
  • Bugfix Pull Request
  • Feature Pull Request

@tremble tremble added the backport-7 PR should be backported to the stable-7 branch label Feb 2, 2024
tremble
tremble requested changes Feb 2, 2024
View reviewed changes
plugins/modules/backup_plan.py Outdated
Comment on lines 627 to 630
if module.botocore_at_least("1.31.36"):
for each in plan["rules"]:
if not each.get("schedule_expression_timezone"):
each["schedule_expression_timezone"] = "Etc/UTC"
Copy link
Contributor

Choose a reason for hiding this comment

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

The botocore error won't be particularly friendly for botocore < 1.31.36 if someone passes schedule_expression_timezone

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/dfaf396639994572ad5dc0ead69ab11c

❌ ansible-galaxy-importer FAILURE in 4m 27s
✔️ build-ansible-collection SUCCESS in 15m 02s
✔️ ansible-test-splitter SUCCESS in 5m 51s
✔️ integration-amazon.aws-1 SUCCESS in 10m 16s
Skipped 43 jobs

@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 2, 2024 •
edited
Loading

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/96c8dd11fb0140f99752981f17bd9c50

❌ ansible-galaxy-importer FAILURE in 4m 23s
✔️ build-ansible-collection SUCCESS in 15m 35s
✔️ ansible-test-splitter SUCCESS in 5m 11s
✔️ integration-amazon.aws-1 SUCCESS in 7m 35s
Skipped 43 jobs

@alinabuzachis
Fix sanity
8fb70b1 
Signed-off-by: Alina Buzachis <[email protected]>
@alinabuzachis
Fix doc typo
b64b658 
Signed-off-by: Alina Buzachis <[email protected]>
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/96a063a4dde44729a7744021ffbaed52

✔️ ansible-galaxy-importer SUCCESS in 3m 42s
✔️ build-ansible-collection SUCCESS in 15m 04s
✔️ ansible-test-splitter SUCCESS in 5m 22s
✔️ integration-amazon.aws-1 SUCCESS in 9m 32s
Skipped 43 jobs

@alinabuzachis alinabuzachis added the mergeit Merge the PR (SoftwareFactory) label Feb 5, 2024
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/df6f299a27dd4bbaac0b2f80717f3fa5

✔️ ansible-galaxy-importer SUCCESS in 4m 42s
✔️ build-ansible-collection SUCCESS in 14m 38s
✔️ ansible-test-splitter SUCCESS in 5m 57s
✔️ integration-amazon.aws-1 SUCCESS in 9m 43s
Skipped 43 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit c8064d5 into ansible-collections:main Feb 5, 2024
37 of 40 checks passed
@patchback Patchback
Copy link

patchback bot commented Feb 5, 2024 •
edited
Loading

Backport to stable-7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-7/c8064d5c7e838e1305acbbb3b0dbbfc860236cc8/pr-1961

Backported as #1962

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Feb 5, 2024
@alinabuzachis @patchback
backup_plan - fix idempotency issue with botocore >= 1.31.36 (#1961)
c22334d 
backup_plan - fix idempotency issue with botocore >= 1.31.36

SUMMARY

Fixes #1952
backup_plan - fix idempotency issue with botocore >= 1.31.36

ISSUE TYPE

Bugfix Pull Request
Feature Pull Request

Reviewed-by: Mark Chappell
(cherry picked from commit c8064d5)
@patchback patchback bot mentioned this pull request Feb 5, 2024
Merged
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Feb 5, 2024
@patchback
backup_plan - fix idempotency issue with botocore >= 1.31.36 (#1961) (#…
ddb39e0 
…1962)

[PR #1961/c8064d5c backport][stable-7] backup_plan - fix idempotency issue with botocore >= 1.31.36

This is a backport of PR #1961 as merged into main (c8064d5).
SUMMARY

Fixes #1952
backup_plan - fix idempotency issue with botocore >= 1.31.36

ISSUE TYPE


Bugfix Pull Request
Feature Pull Request

Reviewed-by: Alina Buzachis
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tremble tremble tremble approved these changes

Assignees
No one assigned
Labels
backport-7 PR should be backported to the stable-7 branch mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Idempotence fails with backup_plan on botocore >= 1.31.36
2 participants
@alinabuzachis @tremble