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

Fix cloudfront_distribution s3_origin_access_identity_enabled bug #881

Merged
merged 2 commits into from
Jan 31, 2022
Merged

Fix cloudfront_distribution s3_origin_access_identity_enabled bug #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
270ee25
Fix cloudfront bug
marknet15 Jan 22, 2022
34a914e
add changelog fragement
marknet15 Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/881-cloudfront-bug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- cloudfront_distribution - Dont pass ``s3_origin_access_identity_enabled`` to API request (https://github.com/ansible-collections/community.aws/pull/881).
14 changes: 9 additions & 5 deletions plugins/modules/cloudfront_distribution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,9 +1686,6 @@ def validate_origins(self, client, config, origins, default_origin_domain_name,
self.module.fail_json_aws(e, msg="Error validating distribution origins")

def validate_s3_origin_configuration(self, client, existing_config, origin):
if not origin['s3_origin_access_identity_enabled']:
return None

if origin.get('s3_origin_config', {}).get('origin_access_identity'):
return origin['s3_origin_config']['origin_access_identity']

Expand Down Expand Up @@ -1719,13 +1716,20 @@ def validate_origin(self, client, existing_config, origin, default_origin_path):
origin['custom_headers'] = ansible_list_to_cloudfront_list()
if self.__s3_bucket_domain_identifier in origin.get('domain_name').lower():
if origin.get("s3_origin_access_identity_enabled") is not None:
s3_origin_config = self.validate_s3_origin_configuration(client, existing_config, origin)
if origin['s3_origin_access_identity_enabled']:
s3_origin_config = self.validate_s3_origin_configuration(client, existing_config, origin)
else:
s3_origin_config = None

del(origin["s3_origin_access_identity_enabled"])

if s3_origin_config:
oai = s3_origin_config
else:
oai = ""

origin["s3_origin_config"] = dict(origin_access_identity=oai)
del(origin["s3_origin_access_identity_enabled"])

if 'custom_origin_config' in origin:
self.module.fail_json(msg="s3_origin_access_identity_enabled and custom_origin_config are mutually exclusive")
else:
Expand Down