Merge branch 'release/2.5.0'

ordinaryexperts · Aug 4, 2022 · 979e7c8 · 979e7c8
2 parents 1b830e1 + 7b8bd57
commit 979e7c8
Show file tree

Hide file tree

Showing 11 changed files with 330 additions and 476 deletions.
diff --git a/.checkov.baseline b/.checkov.baseline
@@ -0,0 +1,49 @@
+{
+    "failed_checks": [
+        {
+            "file": "/main.tf",
+            "findings": [
+                {
+                    "resource": "aws_s3_bucket.this",
+                    "check_ids": [
+                        "CKV2_AWS_40",
+                        "CKV2_AWS_41",
+                        "CKV2_AWS_6",
+                        "CKV_AWS_144",
+                        "CKV_AWS_145",
+                        "CKV_AWS_18",
+                        "CKV_AWS_19"
+                    ]
+                },
+                {
+                    "resource": "aws_security_group.this",
+                    "check_ids": [
+                        "CKV_AWS_23"
+                    ]
+                },
+                {
+                    "resource": "aws_security_group.bastion_to_instance_sg",
+                    "check_ids": [
+                        "CKV2_AWS_5",
+                        "CKV_AWS_23"
+                    ]
+                },
+                {
+                    "resource": "aws_lb.this",
+                    "check_ids": [
+                        "CKV_AWS_150",
+                        "CKV_AWS_152",
+                        "CKV_AWS_91"
+                    ]
+                },
+                {
+                    "resource": "aws_launch_configuration.this",
+                    "check_ids": [
+                        "CKV_AWS_79",
+                        "CKV_AWS_8"
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/.github/workflows/terraform_static_analysis.yml b/.github/workflows/terraform_static_analysis.yml
@@ -16,10 +16,11 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Checkov baseline static analysis
         id: checkov
         uses: bridgecrewio/checkov-action@master
         with:
+          baseline: .checkov.baseline
           quiet: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 Unreleased
 ==========
 
-2.4.0
+2.5.0
 =====
 
-* Remediate Checkov warnings
+* Rolled back to release 2.3.0 - release 2.4.0 was premature.  This release is
+  identical to release 2.3.0.
 
 2.3.0
 =====

diff --git a/asg.tf b/asg.tf
diff --git a/iam.tf b/iam.tf
diff --git a/kms.tf b/kms.tf
diff --git a/lb.tf b/lb.tf