Fixed cloudformation lint tests

exasol · Aug 21, 2024 · f134619 · f134619
1 parent 4d54f26
commit f134619
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 194 deletions.
diff --git a/exasol/ds/sandbox/templates/cloudformation/example-data/s3-bucket.jinja.yaml b/exasol/ds/sandbox/templates/cloudformation/example-data/s3-bucket.jinja.yaml
@@ -1,8 +1,6 @@
 Resources:
   AiLabExampleDataBucket:
     Type: 'AWS::S3::Bucket'
-    Properties:
-      AccessControl: 'Private'
     Metadata:
       Comment: 'Bucket to store example data for the AI-Lab'
     DeletionPolicy: Retain

diff --git a/exasol/ds/sandbox/templates/cloudformation/vm-images/s3-bucket.jinja.yaml b/exasol/ds/sandbox/templates/cloudformation/vm-images/s3-bucket.jinja.yaml
@@ -1,8 +1,6 @@
 Resources:
   VMBucket:
     Type: 'AWS::S3::Bucket'
-    Properties:
-      AccessControl: 'Private'
     Metadata:
       Comment: 'Bucket to store AI-Lab VM images'
     DeletionPolicy: Retain

diff --git a/test/aws/templates.py b/test/aws/templates.py
@@ -10,7 +10,7 @@
 DEFAULT_ASSET_ID = AssetId("test", stack_prefix="test-stack", ami_prefix="test-ami")
 TEST_IP = "1.1.1.1"
 TEST_ACL_ARN = "TEST-DOWNLOAD-ACL"
-TEST_DUMMY_AMI_ID = "ami-123"
+TEST_DUMMY_AMI_ID = "ami-00000000000000000"
 
 
 def ci_codebuild_template():
@@ -20,12 +20,14 @@ def ci_codebuild_template():
     )
 
 
+# pattern for valid ARNs:
+# (^arn:(aws|aws-cn|aws-us-gov):[^:]+:[^:]*(:(?:\\d{12}|\\*|aws)?:.+|)|\\*)$
 def release_codebuild_template():
     return render_template(
         "release_code_build.jinja.yaml",
         vm_bucket="test-bucket-123",
         path_in_bucket=AssetId.BUCKET_PREFIX,
-        dockerhub_secret_arn="secret_arn",
+        dockerhub_secret_arn="arn:aws:_:_",
     )
 
 

diff --git a/test/unit/aws/rendered-cf-templates/vm-bucket-old.yml b/test/unit/aws/rendered-cf-templates/vm-bucket-old.yml
diff --git a/test/unit/aws/rendered-cf-templates/vm-bucket-waf-old.yml b/test/unit/aws/rendered-cf-templates/vm-bucket-waf-old.yml
diff --git a/test/unit/aws/rendered-cf-templates/vm-bucket.yml b/test/unit/aws/rendered-cf-templates/vm-bucket.yml
@@ -1,8 +1,6 @@
 Resources:
   VMBucket:
     Type: 'AWS::S3::Bucket'
-    Properties:
-      AccessControl: 'Private'
     Metadata:
       Comment: 'Bucket to store AI-Lab VM images'
     DeletionPolicy: Retain

diff --git a/test/unit/aws/test_lint_cloudformation_templates.py b/test/unit/aws/test_lint_cloudformation_templates.py
@@ -48,7 +48,6 @@ def validate_using_cfn_lint(tmp_path, cloudformation_yml):
 def test_lint_cloudformation_templates(tmp_path, template_key):
     validate_using_cfn_lint(tmp_path, TEMPLATES[template_key])
 
-
 @pytest.mark.parametrize("key", ("vm-bucket", "vm-bucket-waf"))
 def test_template_rendering(key):
     expected = (