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

cloudfront_distribution: now honours the enabled setting #1824

Conversation

gsimon75
Copy link
Contributor

SUMMARY

Fixes: #1823

The enabled: false setting was ignored, because here we were falling back to the default True not only when the setting was None, but also when it was False.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

cloudfront_distribution

@softwarefactory-project-zuul
Copy link
Contributor

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

ansible-galaxy-importer FAILURE in 4m 01s
✔️ build-ansible-collection SUCCESS in 12m 55s
✔️ ansible-test-sanity-docker-devel SUCCESS in 11m 00s (non-voting)
✔️ ansible-test-sanity-docker-milestone SUCCESS in 10m 56s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 10m 53s
✔️ ansible-test-sanity-docker-stable-2.13 SUCCESS in 11m 07s
✔️ ansible-test-sanity-docker-stable-2.14 SUCCESS in 10m 31s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 5m 48s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 6m 42s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 6m 08s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 6m 17s
✔️ ansible-test-changelog SUCCESS in 4m 24s
✔️ ansible-test-splitter SUCCESS in 5m 04s
✔️ integration-community.aws-1 SUCCESS in 25m 53s
Skipped 21 jobs

@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 4m 28s
✔️ build-ansible-collection SUCCESS in 12m 21s
✔️ ansible-test-sanity-docker-devel SUCCESS in 12m 55s (non-voting)
✔️ ansible-test-sanity-docker-milestone SUCCESS in 12m 15s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 12m 35s
✔️ ansible-test-sanity-docker-stable-2.13 SUCCESS in 12m 17s
✔️ ansible-test-sanity-docker-stable-2.14 SUCCESS in 12m 45s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 8m 11s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 8m 00s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 7m 40s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 9m 03s
✔️ ansible-test-changelog SUCCESS in 4m 19s
✔️ ansible-test-splitter SUCCESS in 4m 55s
✔️ integration-community.aws-1 SUCCESS in 25m 34s
Skipped 21 jobs

@alinabuzachis alinabuzachis added this to the 6.1.0 milestone May 25, 2023
@markuman
Copy link
Member

Is it possible that you add an integration test that covers this case @gsimon75?
Otherwise looks good to me.

@markuman markuman added backport-5 PR should be backported to the stable-5 branch backport-6 PR should be backported to the stable-6 branch labels May 26, 2023
@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 4m 37s
✔️ build-ansible-collection SUCCESS in 13m 19s
✔️ ansible-test-sanity-docker-devel SUCCESS in 13m 31s (non-voting)
✔️ ansible-test-sanity-docker-milestone SUCCESS in 14m 08s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 14m 17s
✔️ ansible-test-sanity-docker-stable-2.13 SUCCESS in 13m 36s
✔️ ansible-test-sanity-docker-stable-2.14 SUCCESS in 10m 34s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 8m 35s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 6m 54s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 8m 12s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 5m 54s
✔️ ansible-test-changelog SUCCESS in 4m 33s
✔️ ansible-test-splitter SUCCESS in 5m 08s
✔️ integration-community.aws-1 SUCCESS in 23m 46s
Skipped 21 jobs

@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.

@gsimon75 gsimon75 force-pushed the issue_1823_cloudfront_distribution_always_created_enabled branch from 9784bc6 to d3e8a8c Compare May 26, 2023 17:14
@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 4m 51s
✔️ build-ansible-collection SUCCESS in 13m 36s
✔️ ansible-test-sanity-docker-devel SUCCESS in 12m 57s (non-voting)
✔️ ansible-test-sanity-docker-milestone SUCCESS in 12m 18s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 11m 51s
✔️ ansible-test-sanity-docker-stable-2.13 SUCCESS in 13m 21s
✔️ ansible-test-sanity-docker-stable-2.14 SUCCESS in 13m 08s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 8m 04s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 8m 20s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 7m 46s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 8m 48s
✔️ ansible-test-changelog SUCCESS in 4m 39s
✔️ ansible-test-splitter SUCCESS in 4m 53s
✔️ integration-community.aws-1 SUCCESS in 20m 07s
Skipped 21 jobs

@alinabuzachis alinabuzachis added the mergeit Merge the PR (SoftwareFactory) label Jun 1, 2023
@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 3m 56s
✔️ build-ansible-collection SUCCESS in 12m 36s
✔️ ansible-test-sanity-docker-devel SUCCESS in 9m 37s (non-voting)
✔️ ansible-test-sanity-docker-milestone SUCCESS in 8m 56s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 14m 16s
✔️ ansible-test-sanity-docker-stable-2.13 SUCCESS in 12m 36s
✔️ ansible-test-sanity-docker-stable-2.14 SUCCESS in 8m 57s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 10m 27s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 6m 13s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 8m 28s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 6m 56s
✔️ ansible-test-changelog SUCCESS in 4m 29s
✔️ ansible-test-splitter SUCCESS in 5m 06s
✔️ integration-community.aws-1 SUCCESS in 17m 43s
Skipped 21 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 5594769 into ansible-collections:main Jun 1, 2023
@patchback
Copy link

patchback bot commented Jun 1, 2023

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

❌ Failed to cleanly apply 5594769 on top of patchback/backports/stable-5/5594769527aee560fb454170f9dde31af3ff8c48/pr-1824

Backporting merged PR #1824 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/5594769527aee560fb454170f9dde31af3ff8c48/pr-1824 upstream/stable-5
  4. Now, cherry-pick PR cloudfront_distribution: now honours the enabled setting #1824 contents into that branch:
    $ git cherry-pick -x 5594769527aee560fb454170f9dde31af3ff8c48
    If it'll yell at you with something like fatal: Commit 5594769527aee560fb454170f9dde31af3ff8c48 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 5594769527aee560fb454170f9dde31af3ff8c48
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR cloudfront_distribution: now honours the enabled setting #1824 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-5/5594769527aee560fb454170f9dde31af3ff8c48/pr-1824
  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.

@patchback
Copy link

patchback bot commented Jun 1, 2023

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/5594769527aee560fb454170f9dde31af3ff8c48/pr-1824

Backported as #1834

🤖 @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 Jun 1, 2023
cloudfront_distribution: now honours the enabled setting

SUMMARY
Fixes: #1823
The enabled: false setting was ignored, because here we were falling back to the default True not only when the setting was None, but also when it was False.
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
cloudfront_distribution

Reviewed-by: Markus Bergholz <[email protected]>
Reviewed-by: Alina Buzachis
(cherry picked from commit 5594769)
alinabuzachis pushed a commit to alinabuzachis/community.aws that referenced this pull request Jun 1, 2023
…lections#1824)

cloudfront_distribution: now honours the enabled setting

SUMMARY
Fixes: ansible-collections#1823
The enabled: false setting was ignored, because here we were falling back to the default True not only when the setting was None, but also when it was False.
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
cloudfront_distribution

Reviewed-by: Markus Bergholz <[email protected]>
Reviewed-by: Alina Buzachis
(cherry picked from commit 5594769)
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Jun 1, 2023
[manual backport stable-5] cloudfront_distribution: now honours the enabled setting (#1824)

cloudfront_distribution: now honours the enabled setting
SUMMARY
Fixes: #1823
The enabled: false setting was ignored, because here we were falling back to the default True not only when the setting was None, but also when it was False. ISSUE TYPE
Bugfix Pull Request
COMPONENT NAME
cloudfront_distribution
Reviewed-by: Markus Bergholz [email protected]
Reviewed-by: Alina Buzachis
(cherry picked from commit 5594769)
SUMMARY


ISSUE TYPE


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

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Markus Bergholz <[email protected]>
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Jun 1, 2023
[PR #1824/55947695 backport][stable-6] cloudfront_distribution: now honours the enabled setting

This is a backport of PR #1824 as merged into main (5594769).
SUMMARY
Fixes: #1823
The enabled: false setting was ignored, because here we were falling back to the default True not only when the setting was None, but also when it was False.
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
cloudfront_distribution

Reviewed-by: Markus Bergholz <[email protected]>
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 backport-6 PR should be backported to the stable-6 branch mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cloudfront_distribution doesn't honour enabled
3 participants