Merge pull request #220 from stackql/dev

Updated `aws` and `awscc`
stackql · Mar 25, 2024 · 0ed3df0 · 0ed3df0
2 parents 58fdbfe + 86421e7
commit 0ed3df0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/providers/src/awscc/v00.00.00000/services/.gitignore b/providers/src/awscc/v00.00.00000/services/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git 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(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 = '<BucketName>'
@@ -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(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 = '<BucketName>'

diff --git a/scripts/setup/get-updated-providers.py b/scripts/setup/get-updated-providers.py
@@ -33,6 +33,15 @@
             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'
 
     # convert to set to remove duplicates
     providers = []