From 29ad8ede7d5b61cd07daf61dfc1c48cef7ae164d Mon Sep 17 00:00:00 2001 From: Jeffrey Aven Date: Mon, 25 Mar 2024 07:50:38 +1100 Subject: [PATCH 1/4] update to awscc --- providers/src/awscc/v00.00.00000/services/.gitignore | 4 ++++ providers/src/awscc/v00.00.00000/services/s3.yaml | 2 ++ scripts/setup/get-updated-providers.py | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 providers/src/awscc/v00.00.00000/services/.gitignore diff --git a/providers/src/awscc/v00.00.00000/services/.gitignore b/providers/src/awscc/v00.00.00000/services/.gitignore new file mode 100644 index 00000000..86d0cb27 --- /dev/null +++ b/providers/src/awscc/v00.00.00000/services/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file diff --git a/providers/src/awscc/v00.00.00000/services/s3.yaml b/providers/src/awscc/v00.00.00000/services/s3.yaml index 3c631e40..6d4ac81a 100644 --- a/providers/src/awscc/v00.00.00000/services/s3.yaml +++ b/providers/src/awscc/v00.00.00000/services/s3.yaml @@ -2678,6 +2678,7 @@ components: JSON_EXTRACT(Properties, '$.DomainName') as domain_name, JSON_EXTRACT(Properties, '$.DualStackDomainName') as dual_stack_domain_name, JSON_EXTRACT(Properties, '$.RegionalDomainName') as regional_domain_name, + SPLIT_PART(JSON_EXTRACT(Properties, '$.RegionalDomainName'), '.', 3) as bucket_location, JSON_EXTRACT(Properties, '$.WebsiteURL') as website_url FROM awscc.cloud_control.resource WHERE data__TypeName = 'AWS::S3::Bucket' AND data__Identifier = '' @@ -2712,6 +2713,7 @@ components: json_extract_path_text(Properties, 'DomainName') as domain_name, json_extract_path_text(Properties, 'DualStackDomainName') as dual_stack_domain_name, json_extract_path_text(Properties, 'RegionalDomainName') as regional_domain_name, + SPLIT_PART(json_extract_path_text(Properties, 'RegionalDomainName'), '.', 3) as bucket_location, json_extract_path_text(Properties, 'WebsiteURL') as website_url FROM awscc.cloud_control.resource WHERE data__TypeName = 'AWS::S3::Bucket' AND data__Identifier = '' diff --git a/scripts/setup/get-updated-providers.py b/scripts/setup/get-updated-providers.py index 7f72c59e..518a192b 100644 --- a/scripts/setup/get-updated-providers.py +++ b/scripts/setup/get-updated-providers.py @@ -34,6 +34,9 @@ provider['path'] = path.rstrip('\n') updates.append(provider) + print("all_provider_versions: %s" % (all_provider_versions)) + print("updates: %s" % (updates)) + # convert to set to remove duplicates providers = [] for provider in list(set(all_provider_versions)): From c5390049765592f1b3f1a8973f61874e97ae1497 Mon Sep 17 00:00:00 2001 From: Jeffrey Aven Date: Mon, 25 Mar 2024 08:00:26 +1100 Subject: [PATCH 2/4] update to awscc --- providers/src/awscc/v00.00.00000/services/.gitignore | 4 ---- scripts/setup/get-updated-providers.py | 12 +++++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 providers/src/awscc/v00.00.00000/services/.gitignore diff --git a/providers/src/awscc/v00.00.00000/services/.gitignore b/providers/src/awscc/v00.00.00000/services/.gitignore deleted file mode 100644 index 86d0cb27..00000000 --- a/providers/src/awscc/v00.00.00000/services/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore \ No newline at end of file diff --git a/scripts/setup/get-updated-providers.py b/scripts/setup/get-updated-providers.py index 518a192b..206bf9d6 100644 --- a/scripts/setup/get-updated-providers.py +++ b/scripts/setup/get-updated-providers.py @@ -33,10 +33,16 @@ provider['action'] = action provider['path'] = path.rstrip('\n') updates.append(provider) + if provider_name == 'awscc': + # add faux provider update for aws, as aws is a dependency of awscc + all_provider_versions.append(json.dumps({ 'provider' : 'aws', 'provider_dir': 'aws', 'source_version': 'v00.00.00000', 'target_version': target_version})) + provider['provider'] = 'aws' + provider['provider_dir'] = 'aws' + provider['source_version'] = 'v00.00.00000' + provider['target_version'] = target_version + provider['action'] = 'M' + provider['path'] = 'providers/src/awscc/v00.00.00000/provider.yaml' - print("all_provider_versions: %s" % (all_provider_versions)) - print("updates: %s" % (updates)) - # convert to set to remove duplicates providers = [] for provider in list(set(all_provider_versions)): From 71667d9fa2042578c592895bbb65af6da0ccbc95 Mon Sep 17 00:00:00 2001 From: Jeffrey Aven Date: Mon, 25 Mar 2024 11:40:40 +1100 Subject: [PATCH 3/4] updated awscc --- providers/src/awscc/v00.00.00000/services/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 providers/src/awscc/v00.00.00000/services/.gitignore diff --git a/providers/src/awscc/v00.00.00000/services/.gitignore b/providers/src/awscc/v00.00.00000/services/.gitignore new file mode 100644 index 00000000..86d0cb27 --- /dev/null +++ b/providers/src/awscc/v00.00.00000/services/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file From 6df699491184823a9ecb4f2f094c11e9425b8941 Mon Sep 17 00:00:00 2001 From: Jeffrey Aven Date: Mon, 25 Mar 2024 12:20:25 +1100 Subject: [PATCH 4/4] updated awscc --- providers/src/awscc/v00.00.00000/services/s3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/src/awscc/v00.00.00000/services/s3.yaml b/providers/src/awscc/v00.00.00000/services/s3.yaml index 6d4ac81a..1f6e022f 100644 --- a/providers/src/awscc/v00.00.00000/services/s3.yaml +++ b/providers/src/awscc/v00.00.00000/services/s3.yaml @@ -2678,7 +2678,7 @@ components: JSON_EXTRACT(Properties, '$.DomainName') as domain_name, JSON_EXTRACT(Properties, '$.DualStackDomainName') as dual_stack_domain_name, JSON_EXTRACT(Properties, '$.RegionalDomainName') as regional_domain_name, - SPLIT_PART(JSON_EXTRACT(Properties, '$.RegionalDomainName'), '.', 3) as bucket_location, + SPLIT_PART(SPLIT_PART(JSON_EXTRACT(Properties, '$.RegionalDomainName'), '.s3.', 2), '.', 1) as bucket_location, JSON_EXTRACT(Properties, '$.WebsiteURL') as website_url FROM awscc.cloud_control.resource WHERE data__TypeName = 'AWS::S3::Bucket' AND data__Identifier = '' @@ -2713,7 +2713,7 @@ components: json_extract_path_text(Properties, 'DomainName') as domain_name, json_extract_path_text(Properties, 'DualStackDomainName') as dual_stack_domain_name, json_extract_path_text(Properties, 'RegionalDomainName') as regional_domain_name, - SPLIT_PART(json_extract_path_text(Properties, 'RegionalDomainName'), '.', 3) as bucket_location, + SPLIT_PART(SPLIT_PART(json_extract_path_text(Properties, 'RegionalDomainName'), '.s3.', 2), '.', 1) as bucket_location, json_extract_path_text(Properties, 'WebsiteURL') as website_url FROM awscc.cloud_control.resource WHERE data__TypeName = 'AWS::S3::Bucket' AND data__Identifier = ''