From 270ee25018763ea72f4b6ca1674dd9f4dd3ca3c1 Mon Sep 17 00:00:00 2001 From: Mark Woolley Date: Sat, 22 Jan 2022 14:49:47 +0000 Subject: [PATCH 1/2] Fix cloudfront bug --- plugins/modules/cloudfront_distribution.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/plugins/modules/cloudfront_distribution.py b/plugins/modules/cloudfront_distribution.py index 80ac6dcec4b..946b93e2041 100644 --- a/plugins/modules/cloudfront_distribution.py +++ b/plugins/modules/cloudfront_distribution.py @@ -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'] @@ -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: From 34a914e19435faa7e6fab443d5989bac67e0b438 Mon Sep 17 00:00:00 2001 From: Mark Woolley Date: Sat, 22 Jan 2022 14:56:51 +0000 Subject: [PATCH 2/2] add changelog fragement --- changelogs/fragments/881-cloudfront-bug.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/881-cloudfront-bug.yml diff --git a/changelogs/fragments/881-cloudfront-bug.yml b/changelogs/fragments/881-cloudfront-bug.yml new file mode 100644 index 00000000000..106c9443723 --- /dev/null +++ b/changelogs/fragments/881-cloudfront-bug.yml @@ -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). \ No newline at end of file