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

Various lint fixups #1350

Merged

Conversation

tremble
Copy link
Contributor

@tremble tremble commented Feb 4, 2023

SUMMARY

Minor linting fixups

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

ec2_instance
ec2_vpc_nat_gateway
lambda_layer
s3_bucket
plugins/module_utils/s3.py

ADDITIONAL INFORMATION

S3 unused imports aren't in changelog because they're related to unreleased refactoring.

See Also: ansible-collections/news-for-maintainers#34

@ansibullbot ansibullbot added community_review feature This issue/PR relates to a feature request module module module_utils module_utils needs_maintainer needs_triage plugins plugin (any type) tests tests labels Feb 4, 2023
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

✔️ ansible-galaxy-importer SUCCESS in 3m 42s
✔️ build-ansible-collection SUCCESS in 5m 13s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 9m 11s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 10m 22s
✔️ ansible-test-sanity-aws-ansible-2.13-python38 SUCCESS in 9m 41s
✔️ ansible-test-sanity-aws-ansible-2.14 SUCCESS in 9m 09s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 10m 06s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 10m 36s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 10m 56s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 9m 59s
✔️ cloud-tox-py3 SUCCESS in 6m 12s
✔️ ansible-test-changelog SUCCESS in 2m 15s
✔️ ansible-test-splitter SUCCESS in 2m 35s
✔️ integration-amazon.aws-1 SUCCESS in 20m 45s
✔️ integration-amazon.aws-2 SUCCESS in 11m 56s
✔️ integration-amazon.aws-3 SUCCESS in 7m 58s
✔️ integration-amazon.aws-4 SUCCESS in 8m 14s
✔️ integration-amazon.aws-5 SUCCESS in 7m 58s
✔️ integration-amazon.aws-6 SUCCESS in 16m 20s
✔️ integration-amazon.aws-7 SUCCESS in 10m 18s
✔️ integration-amazon.aws-8 SUCCESS in 11m 18s
✔️ integration-amazon.aws-9 SUCCESS in 7m 50s
✔️ integration-amazon.aws-10 SUCCESS in 7m 07s
✔️ integration-amazon.aws-11 SUCCESS in 11m 08s
✔️ integration-amazon.aws-12 SUCCESS in 10m 28s
✔️ integration-amazon.aws-13 SUCCESS in 8m 50s
✔️ integration-amazon.aws-14 SUCCESS in 6m 55s
✔️ integration-amazon.aws-15 SUCCESS in 14m 33s
✔️ integration-amazon.aws-16 SUCCESS in 6m 52s
✔️ integration-amazon.aws-17 SUCCESS in 7m 57s
✔️ integration-amazon.aws-18 SUCCESS in 7m 34s
✔️ integration-amazon.aws-19 SUCCESS in 6m 18s
✔️ integration-amazon.aws-20 SUCCESS in 13m 27s
⚠️ integration-amazon.aws-21 SKIPPED
⚠️ integration-amazon.aws-22 SKIPPED
⚠️ integration-community.aws-1 SKIPPED
⚠️ integration-community.aws-2 SKIPPED
⚠️ integration-community.aws-3 SKIPPED
⚠️ integration-community.aws-4 SKIPPED
⚠️ integration-community.aws-5 SKIPPED
⚠️ integration-community.aws-6 SKIPPED
⚠️ integration-community.aws-7 SKIPPED
⚠️ integration-community.aws-8 SKIPPED
⚠️ integration-community.aws-9 SKIPPED
⚠️ integration-community.aws-10 SKIPPED
⚠️ integration-community.aws-11 SKIPPED
⚠️ integration-community.aws-12 SKIPPED
⚠️ integration-community.aws-13 SKIPPED
⚠️ integration-community.aws-14 SKIPPED
⚠️ integration-community.aws-15 SKIPPED
⚠️ integration-community.aws-16 SKIPPED
⚠️ integration-community.aws-17 SKIPPED
⚠️ integration-community.aws-18 SKIPPED
⚠️ integration-community.aws-19 SKIPPED
⚠️ integration-community.aws-20 SKIPPED
⚠️ integration-community.aws-21 SKIPPED
⚠️ integration-community.aws-22 SKIPPED

@tremble tremble marked this pull request as ready for review February 4, 2023 11:50
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

✔️ ansible-galaxy-importer SUCCESS in 3m 43s
✔️ build-ansible-collection SUCCESS in 5m 50s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 9m 09s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 9m 41s
✔️ ansible-test-sanity-aws-ansible-2.13-python38 SUCCESS in 9m 59s
✔️ ansible-test-sanity-aws-ansible-2.14 SUCCESS in 9m 58s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 8m 05s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 8m 37s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 9m 06s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 9m 32s
✔️ cloud-tox-py3 SUCCESS in 5m 50s
✔️ ansible-test-changelog SUCCESS in 2m 13s
✔️ ansible-test-splitter SUCCESS in 2m 57s
✔️ integration-amazon.aws-1 SUCCESS in 25m 44s
✔️ integration-amazon.aws-2 SUCCESS in 16m 26s
✔️ integration-amazon.aws-3 SUCCESS in 10m 15s
✔️ integration-amazon.aws-4 SUCCESS in 11m 28s
✔️ integration-amazon.aws-5 SUCCESS in 11m 05s
✔️ integration-amazon.aws-6 SUCCESS in 16m 26s
✔️ integration-amazon.aws-7 SUCCESS in 8m 19s
✔️ integration-amazon.aws-8 SUCCESS in 11m 28s
✔️ integration-amazon.aws-9 SUCCESS in 11m 10s
✔️ integration-amazon.aws-10 SUCCESS in 8m 09s
✔️ integration-amazon.aws-11 SUCCESS in 13m 14s
✔️ integration-amazon.aws-12 SUCCESS in 7m 11s
✔️ integration-amazon.aws-13 SUCCESS in 12m 48s
✔️ integration-amazon.aws-14 SUCCESS in 7m 29s
✔️ integration-amazon.aws-15 SUCCESS in 8m 02s
✔️ integration-amazon.aws-16 SUCCESS in 8m 52s
✔️ integration-amazon.aws-17 SUCCESS in 6m 35s
✔️ integration-amazon.aws-18 SUCCESS in 8m 32s
✔️ integration-amazon.aws-19 SUCCESS in 6m 33s
✔️ integration-amazon.aws-20 SUCCESS in 13m 56s
⚠️ integration-amazon.aws-21 SKIPPED
⚠️ integration-amazon.aws-22 SKIPPED
⚠️ integration-community.aws-1 SKIPPED
⚠️ integration-community.aws-2 SKIPPED
⚠️ integration-community.aws-3 SKIPPED
⚠️ integration-community.aws-4 SKIPPED
⚠️ integration-community.aws-5 SKIPPED
⚠️ integration-community.aws-6 SKIPPED
⚠️ integration-community.aws-7 SKIPPED
⚠️ integration-community.aws-8 SKIPPED
⚠️ integration-community.aws-9 SKIPPED
⚠️ integration-community.aws-10 SKIPPED
⚠️ integration-community.aws-11 SKIPPED
⚠️ integration-community.aws-12 SKIPPED
⚠️ integration-community.aws-13 SKIPPED
⚠️ integration-community.aws-14 SKIPPED
⚠️ integration-community.aws-15 SKIPPED
⚠️ integration-community.aws-16 SKIPPED
⚠️ integration-community.aws-17 SKIPPED
⚠️ integration-community.aws-18 SKIPPED
⚠️ integration-community.aws-19 SKIPPED
⚠️ integration-community.aws-20 SKIPPED
⚠️ integration-community.aws-21 SKIPPED
⚠️ integration-community.aws-22 SKIPPED

@tremble tremble added mergeit Merge the PR (SoftwareFactory) backport-5 PR should be backported to the stable-5 branch labels Feb 4, 2023
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

✔️ ansible-galaxy-importer SUCCESS in 3m 55s
✔️ build-ansible-collection SUCCESS in 5m 08s
✔️ ansible-test-splitter SUCCESS in 2m 32s
✔️ integration-amazon.aws-1 SUCCESS in 16m 20s
✔️ integration-amazon.aws-2 SUCCESS in 15m 59s
✔️ integration-amazon.aws-3 SUCCESS in 11m 24s
✔️ integration-amazon.aws-4 SUCCESS in 10m 41s
✔️ integration-amazon.aws-5 SUCCESS in 7m 06s
✔️ integration-amazon.aws-6 SUCCESS in 19m 29s
✔️ integration-amazon.aws-7 SUCCESS in 7m 35s
✔️ integration-amazon.aws-8 SUCCESS in 12m 32s
✔️ integration-amazon.aws-9 SUCCESS in 12m 46s
✔️ integration-amazon.aws-10 SUCCESS in 8m 16s
✔️ integration-amazon.aws-11 SUCCESS in 11m 20s
✔️ integration-amazon.aws-12 SUCCESS in 10m 48s
✔️ integration-amazon.aws-13 SUCCESS in 11m 49s
✔️ integration-amazon.aws-14 SUCCESS in 9m 08s
✔️ integration-amazon.aws-15 SUCCESS in 10m 05s
✔️ integration-amazon.aws-16 SUCCESS in 11m 18s
✔️ integration-amazon.aws-17 SUCCESS in 8m 07s
✔️ integration-amazon.aws-18 SUCCESS in 8m 34s
✔️ integration-amazon.aws-19 SUCCESS in 6m 38s
✔️ integration-amazon.aws-20 SUCCESS in 12m 23s
⚠️ integration-amazon.aws-21 SKIPPED
⚠️ integration-amazon.aws-22 SKIPPED
⚠️ integration-community.aws-1 SKIPPED
⚠️ integration-community.aws-2 SKIPPED
⚠️ integration-community.aws-3 SKIPPED
⚠️ integration-community.aws-4 SKIPPED
⚠️ integration-community.aws-5 SKIPPED
⚠️ integration-community.aws-6 SKIPPED
⚠️ integration-community.aws-7 SKIPPED
⚠️ integration-community.aws-8 SKIPPED
⚠️ integration-community.aws-9 SKIPPED
⚠️ integration-community.aws-10 SKIPPED
⚠️ integration-community.aws-11 SKIPPED
⚠️ integration-community.aws-12 SKIPPED
⚠️ integration-community.aws-13 SKIPPED
⚠️ integration-community.aws-14 SKIPPED
⚠️ integration-community.aws-15 SKIPPED
⚠️ integration-community.aws-16 SKIPPED
⚠️ integration-community.aws-17 SKIPPED
⚠️ integration-community.aws-18 SKIPPED
⚠️ integration-community.aws-19 SKIPPED
⚠️ integration-community.aws-20 SKIPPED
⚠️ integration-community.aws-21 SKIPPED
⚠️ integration-community.aws-22 SKIPPED

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit f6755e1 into ansible-collections:main Feb 4, 2023
@patchback
Copy link

patchback bot commented Feb 4, 2023

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

❌ Failed to cleanly apply f6755e1 on top of patchback/backports/stable-5/f6755e1caed36e6379ef57be06102a92ee81b743/pr-1350

Backporting merged PR #1350 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/amazon.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/f6755e1caed36e6379ef57be06102a92ee81b743/pr-1350 upstream/stable-5
  4. Now, cherry-pick PR Various lint fixups #1350 contents into that branch:
    $ git cherry-pick -x f6755e1caed36e6379ef57be06102a92ee81b743
    If it'll yell at you with something like fatal: Commit f6755e1caed36e6379ef57be06102a92ee81b743 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x f6755e1caed36e6379ef57be06102a92ee81b743
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Various lint fixups #1350 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-5/f6755e1caed36e6379ef57be06102a92ee81b743/pr-1350
  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 added a commit to tremble/amazon.aws that referenced this pull request Feb 4, 2023
Various lint fixups

SUMMARY
Minor linting fixups
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
ec2_instance
ec2_vpc_nat_gateway
lambda_layer
s3_bucket
plugins/module_utils/s3.py
ADDITIONAL INFORMATION
S3 unused imports aren't in changelog because they're related to unreleased refactoring.
See Also: ansible-collections/news-for-maintainers#34

Reviewed-by: Felix Fontein <felix@fontein.de>
@tremble tremble deleted the sanity/20230204 branch February 15, 2023 09:04
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 community_review feature This issue/PR relates to a feature request mergeit Merge the PR (SoftwareFactory) module_utils module_utils module module needs_maintainer needs_triage plugins plugin (any type) tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants