Add origin shield in cloudfront_distribution module #1557

boutetnico · 2022-10-11T09:12:11Z

SUMMARY

Add Origin Shield option to cloudfront_distribution module.

ISSUE TYPE

Feature Pull Request

COMPONENT NAME

cloudfront_distribution.py

ADDITIONAL INFORMATION

github-actions · 2022-10-11T09:16:07Z

Docs Build 📝

Thank you for contribution!✨

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

ansibullbot · 2022-10-11T09:18:59Z

cc @jillr @markuman @s-hertel @tremble @wilvk
click here for bot help

softwarefactory-project-zuul · 2022-10-11T09:32:12Z

Build failed.

softwarefactory-project-zuul · 2022-10-11T10:11:02Z

Build failed.

softwarefactory-project-zuul · 2022-10-11T12:24:34Z

Build succeeded.

softwarefactory-project-zuul · 2022-10-12T08:16:19Z

Build succeeded.

alinabuzachis

@boutetnico Thank you for working on this feature. Left two minor comments. Otherwise, LGTM!

plugins/modules/cloudfront_distribution.py

softwarefactory-project-zuul · 2022-10-18T15:18:52Z

Build succeeded.

plugins/modules/cloudfront_distribution.py

tests/integration/targets/cloudfront_distribution/tasks/main.yml

softwarefactory-project-zuul · 2022-10-19T05:14:59Z

Build succeeded.

plugins/modules/cloudfront_distribution.py

goneri

Looks good to me minor so tiny code adjustments.

plugins/modules/cloudfront_distribution.py

softwarefactory-project-zuul · 2022-10-27T12:55:12Z

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 1557,393414ceb6d32834b02a0fad7b21e60e6db42714

softwarefactory-project-zuul · 2022-10-27T13:14:44Z

Build succeeded.

alinabuzachis

@boutetnico Thank you. LGTM!

everthing is resolved

softwarefactory-project-zuul · 2022-12-07T11:18:21Z

Build succeeded.

softwarefactory-project-zuul · 2022-12-07T12:02:00Z

Build succeeded (gate pipeline).

patchback · 2022-12-07T12:02:04Z

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

❌ Failed to cleanly apply bdb7c9f on top of patchback/backports/stable-5/bdb7c9f26f6ff39654cd90e2dd18605a6e3b026c/pr-1557

Backporting merged PR #1557 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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/bdb7c9f26f6ff39654cd90e2dd18605a6e3b026c/pr-1557 upstream/stable-5

Now, cherry-pick PR Add origin shield in cloudfront_distribution module #1557 contents into that branch:
```
$ git cherry-pick -x bdb7c9f26f6ff39654cd90e2dd18605a6e3b026c
```
If it'll yell at you with something like fatal: Commit bdb7c9f26f6ff39654cd90e2dd18605a6e3b026c is a merge but no -m option was given., add -m 1 as follows intead:
```
$ git cherry-pick -m1 -x bdb7c9f26f6ff39654cd90e2dd18605a6e3b026c
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Add origin shield in cloudfront_distribution module #1557 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-5/bdb7c9f26f6ff39654cd90e2dd18605a6e3b026c/pr-1557

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.

boutetnico marked this pull request as draft October 11, 2022 09:12

ansibullbot added community_review feature This issue/PR relates to a feature request integration tests/integration module module needs_triage plugins plugin (any type) tests tests labels Oct 11, 2022

boutetnico marked this pull request as ready for review October 12, 2022 08:36

alinabuzachis reviewed Oct 18, 2022

View reviewed changes

plugins/modules/cloudfront_distribution.py Show resolved Hide resolved

plugins/modules/cloudfront_distribution.py Show resolved Hide resolved

markuman added the backport-5 PR should be backported to the stable-5 branch label Oct 18, 2022

ansibullbot removed the needs_triage label Oct 18, 2022

markuman reviewed Oct 18, 2022

View reviewed changes

plugins/modules/cloudfront_distribution.py Outdated Show resolved Hide resolved

markuman reviewed Oct 18, 2022

View reviewed changes

tests/integration/targets/cloudfront_distribution/tasks/main.yml Show resolved Hide resolved

goneri reviewed Oct 25, 2022

View reviewed changes

plugins/modules/cloudfront_distribution.py Outdated Show resolved Hide resolved

goneri previously requested changes Oct 25, 2022

View reviewed changes

plugins/modules/cloudfront_distribution.py Outdated Show resolved Hide resolved

boutetnico added 5 commits October 27, 2022 15:56

Add origin shield in cloudfront_distribution module

2ccd80c

Fix style

6a2e8cc

Fix style

33496f0

Add changelog

f4a642a

Improve tests

c3384f2

boutetnico added 3 commits October 27, 2022 15:56

Add version added

b70f4ff

Add tests

4e7bdb6

code adjustments

c314b4d

boutetnico force-pushed the cloudfront-origin-shield branch from 393414c to c314b4d Compare October 27, 2022 12:56

markuman requested a review from goneri November 15, 2022 08:28

markuman approved these changes Nov 15, 2022

View reviewed changes

markuman requested a review from alinabuzachis November 15, 2022 08:29

alinabuzachis approved these changes Nov 17, 2022

View reviewed changes

markuman added the mergeit Merge the PR (SoftwareFactory) label Nov 17, 2022

markuman closed this Dec 7, 2022

markuman removed the mergeit Merge the PR (SoftwareFactory) label Dec 7, 2022

markuman reopened this Dec 7, 2022

markuman added the mergeit Merge the PR (SoftwareFactory) label Dec 7, 2022

softwarefactory-project-zuul bot merged commit bdb7c9f into ansible-collections:main Dec 7, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add origin shield in cloudfront_distribution module #1557

Add origin shield in cloudfront_distribution module #1557

boutetnico commented Oct 11, 2022

github-actions bot commented Oct 11, 2022 •

edited

Loading

ansibullbot commented Oct 11, 2022

softwarefactory-project-zuul bot commented Oct 11, 2022

softwarefactory-project-zuul bot commented Oct 11, 2022

softwarefactory-project-zuul bot commented Oct 11, 2022

softwarefactory-project-zuul bot commented Oct 12, 2022

alinabuzachis left a comment

softwarefactory-project-zuul bot commented Oct 18, 2022

softwarefactory-project-zuul bot commented Oct 19, 2022

goneri left a comment

softwarefactory-project-zuul bot commented Oct 27, 2022

softwarefactory-project-zuul bot commented Oct 27, 2022

alinabuzachis left a comment

softwarefactory-project-zuul bot commented Dec 7, 2022

softwarefactory-project-zuul bot commented Dec 7, 2022

patchback bot commented Dec 7, 2022 •

edited

Loading

Add origin shield in cloudfront_distribution module #1557

Add origin shield in cloudfront_distribution module #1557

Conversation

boutetnico commented Oct 11, 2022

SUMMARY

ISSUE TYPE

COMPONENT NAME

ADDITIONAL INFORMATION

github-actions bot commented Oct 11, 2022 • edited Loading

Docs Build 📝

ansibullbot commented Oct 11, 2022

softwarefactory-project-zuul bot commented Oct 11, 2022

softwarefactory-project-zuul bot commented Oct 11, 2022

softwarefactory-project-zuul bot commented Oct 11, 2022

softwarefactory-project-zuul bot commented Oct 12, 2022

alinabuzachis left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Oct 18, 2022

softwarefactory-project-zuul bot commented Oct 19, 2022

goneri left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Oct 27, 2022

softwarefactory-project-zuul bot commented Oct 27, 2022

alinabuzachis left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Dec 7, 2022

softwarefactory-project-zuul bot commented Dec 7, 2022

patchback bot commented Dec 7, 2022 • edited Loading

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

Backporting merged PR #1557 into main

github-actions bot commented Oct 11, 2022 •

edited

Loading

patchback bot commented Dec 7, 2022 •

edited

Loading