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

s3_lifecycle - fix invalid value type for transitions list #1788

Merged

Conversation

rmahroua
Copy link
Contributor

@rmahroua rmahroua commented Apr 24, 2023

Depends-On: #1792

SUMMARY

Fixes #1774

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

s3_lifecycle

ADDITIONAL INFORMATION

Forces casting to integer for the transition_days parameter of a transitions list.

@softwarefactory-project-zuul
Copy link
Contributor

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

ansible-galaxy-importer FAILURE in 3m 44s
✔️ build-ansible-collection SUCCESS in 12m 44s
✔️ ansible-test-sanity-docker-devel SUCCESS in 11m 41s (non-voting)
✔️ ansible-test-sanity-docker-milestone SUCCESS in 10m 52s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 10m 51s
✔️ ansible-test-sanity-docker-stable-2.13 SUCCESS in 11m 56s
✔️ ansible-test-sanity-docker-stable-2.14 SUCCESS in 10m 28s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 6m 32s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 6m 14s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 5m 55s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 9m 42s
✔️ ansible-test-changelog SUCCESS in 4m 36s
✔️ ansible-test-splitter SUCCESS in 4m 50s
integration-community.aws-1 FAILURE in 8m 09s
Skipped 21 jobs

@tremble tremble added this to the 5.5.0 milestone Apr 27, 2023
@alinabuzachis
Copy link
Contributor

@rmahroua Can you please rebase this PR?

tremble and others added 5 commits May 4, 2023 11:46
…ble-collections#1792)

Fix integration tests trying to install *old* botocore versions

SUMMARY
Some integration tests are trying to install an old copy of botocore, which conflicts with our minimum boto3 requirement.  Drop the installation, we now require botocore >= 1.25.0
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
dynamodb_table
networkfirewall_policy
s3_lifecycl
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis
…ting versions (ansible-collections#1794)

Update README.md and meta/runtime.yml to reflect our ansible core testing versions

SUMMARY

Update README.md and meta/runtime.yml to reflect our ansible core testing versions

ISSUE TYPE


Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
* Black prep

* Black

* changelog

* Fix pylint unused-import in tests

* Split SSM connection plugin changes

* disable glue tests - bucket's missing

* Disable s3_logging and s3_sync tests
black - aws_ssm

SUMMARY
The aws_ssm integration tests are currently broken (ansible-collections#1793), apply the black changes
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
aws_ssm
ADDITIONAL INFORMATION
changes were approved as a part of ansible-collections#1784 but split because the tests were broken

Reviewed-by: Alina Buzachis
@softwarefactory-project-zuul
Copy link
Contributor

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/ansible-collections/community.aws for 1788,35612c90b05f5ea2fb6886176ae88fdf2c19633f

@rmahroua
Copy link
Contributor Author

rmahroua commented May 4, 2023

@alinabuzachis done! Let me know how that goes :)

@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 3m 53s
✔️ build-ansible-collection SUCCESS in 12m 59s
✔️ ansible-test-sanity-docker-devel SUCCESS in 9m 08s (non-voting)
✔️ ansible-test-sanity-docker-milestone SUCCESS in 9m 51s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 9m 16s
✔️ ansible-test-sanity-docker-stable-2.13 SUCCESS in 9m 10s
✔️ ansible-test-sanity-docker-stable-2.14 SUCCESS in 11m 29s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 5m 44s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 7m 20s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 6m 35s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 8m 40s
✔️ ansible-test-changelog SUCCESS in 4m 31s
✔️ ansible-test-splitter SUCCESS in 5m 03s
✔️ integration-community.aws-1 SUCCESS in 24m 18s
Skipped 21 jobs

@tremble tremble changed the title Fix #1774 s3_lifecycle - fix invalid value type for transitions list May 5, 2023
@tremble tremble added the backport-5 PR should be backported to the stable-5 branch label May 5, 2023
@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label May 5, 2023
@github-actions
Copy link

github-actions bot commented May 5, 2023

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
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 4m 29s
✔️ build-ansible-collection SUCCESS in 12m 51s
✔️ ansible-test-sanity-docker-devel SUCCESS in 13m 15s (non-voting)
✔️ ansible-test-sanity-docker-milestone SUCCESS in 13m 09s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 12m 52s
✔️ ansible-test-sanity-docker-stable-2.13 SUCCESS in 12m 45s
✔️ ansible-test-sanity-docker-stable-2.14 SUCCESS in 12m 38s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 8m 23s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 8m 20s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 7m 43s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 8m 59s
✔️ ansible-test-changelog SUCCESS in 4m 34s
✔️ ansible-test-splitter SUCCESS in 4m 53s
✔️ integration-community.aws-1 SUCCESS in 25m 43s
Skipped 21 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit acb9daf into ansible-collections:main May 5, 2023
@patchback
Copy link

patchback bot commented May 5, 2023

Backport to stable-5: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply acb9daf on top of patchback/backports/stable-5/acb9daf1257fa2b2e6a6f782249d682d60280c23/pr-1788

Backporting merged PR #1788 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.aws.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-5/acb9daf1257fa2b2e6a6f782249d682d60280c23/pr-1788 upstream/stable-5
  4. Now, cherry-pick PR s3_lifecycle - fix invalid value type for transitions list #1788 contents into that branch:
    $ git cherry-pick -x acb9daf1257fa2b2e6a6f782249d682d60280c23
    If it'll yell at you with something like fatal: Commit acb9daf1257fa2b2e6a6f782249d682d60280c23 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x acb9daf1257fa2b2e6a6f782249d682d60280c23
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR s3_lifecycle - fix invalid value type for transitions list #1788 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-5/acb9daf1257fa2b2e6a6f782249d682d60280c23/pr-1788
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

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

tremble pushed a commit to tremble/community.aws that referenced this pull request May 5, 2023
…ollections#1788)

s3_lifecycle - fix invalid value type for transitions list

Depends-On: ansible-collections#1792
SUMMARY
Fixes ansible-collections#1774
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
s3_lifecycle
ADDITIONAL INFORMATION
Forces casting to integer for the transition_days parameter of a transitions list.

Reviewed-by: Mark Chappell
tremble pushed a commit to tremble/community.aws that referenced this pull request May 5, 2023
…ollections#1788)

s3_lifecycle - fix invalid value type for transitions list

Depends-On: ansible-collections#1792
SUMMARY
Fixes ansible-collections#1774
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
s3_lifecycle
ADDITIONAL INFORMATION
Forces casting to integer for the transition_days parameter of a transitions list.

Reviewed-by: Mark Chappell
softwarefactory-project-zuul bot pushed a commit that referenced this pull request May 5, 2023
…1807)

[backport] [stable-5] s3_lifecycle - fix invalid value type for transitions list (#1788)

Manual backport of #1788
SUMMARY
Fixes #1774
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
s3_lifecycle
ADDITIONAL INFORMATION
Forces casting to integer for the transition_days parameter of a transitions list.

Reviewed-by: Alina Buzachis
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-5 PR should be backported to the stable-5 branch mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

S3 Lifecycle module is missing a cast to integer for transitions list
3 participants