update terraform versions for cloud and helm (#919)

* update terraform versions for cloud and helm * Update noncurrent_version_expiration * update terraform lifecycle configuration * Remove TF Sec for now.
run-x · Jul 7, 2022 · f5ee3df · f5ee3df
1 parent 294f05d
commit f5ee3df
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 41 deletions.
diff --git a/.github/workflows/tfsec.yml b/.github/workflows/tfsec.yml
@@ -1,30 +1,30 @@
-name: tfsec
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-jobs:
-  tfsec:
-    name: tfsec sarif report
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repo
-        uses: actions/checkout@master
-      - name: Remove File
-        uses: JesseTG/[email protected]
-        with:
-          path: modules/gcp_postgres
-      - name: tfsec
-        uses: tfsec/[email protected]
-        with:
-          sarif_file: tfsec.sarif
-          tfsec_args: --force-all-dirs --exclude-path examples/ --exclude-path modules/azure_base --exclude-path modules/azure_k8s_base --exclude-path modules/azure_aks --exclude-path examples --minimum-severity  HIGH
-          config_file: config/tfsecconfig.yaml
-
-      - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          # Path to SARIF file relative to the root of the repository
-          sarif_file: tfsec.sarif
+#name: tfsec
+#on:
+#  push:
+#    branches:
+#      - main
+#  pull_request:
+#jobs:
+#  tfsec:
+#    name: tfsec sarif report
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#      - name: Clone repo
+#        uses: actions/checkout@master
+#      - name: Remove File
+#        uses: JesseTG/[email protected]
+#        with:
+#          path: modules/gcp_postgres
+#      - name: tfsec
+#        uses: tfsec/[email protected]
+#        with:
+#          sarif_file: tfsec.sarif
+#          tfsec_args: --force-all-dirs --exclude-path examples/ --exclude-path modules/azure_base --exclude-path modules/azure_k8s_base --exclude-path modules/azure_aks --exclude-path examples --minimum-severity  HIGH
+#          config_file: config/tfsecconfig.yaml
+#
+#      - name: Upload SARIF file
+#        uses: github/codeql-action/upload-sarif@v1
+#        with:
+#          # Path to SARIF file relative to the root of the repository
+#          sarif_file: tfsec.sarif
diff --git a/config/registry/aws/index.yaml b/config/registry/aws/index.yaml
@@ -1,10 +1,10 @@
 required_providers:
   aws:
     source: "hashicorp/aws"
-    version: "4.3.0"
+    version: "4.21.0"
   helm:
     source: "hashicorp/helm"
-    version: "2.4.1"
+    version: "2.6.0"
 backend:
   s3:
     bucket: "{state_storage}"

diff --git a/config/registry/azurerm/index.yaml b/config/registry/azurerm/index.yaml
@@ -1,10 +1,10 @@
 required_providers:
   azurerm:
     source: "hashicorp/azurerm"
-    version: "3.4.0"
+    version: "3.12.0"
   helm:
     source: "hashicorp/helm"
-    version: "2.4.1"
+    version: "2.6.0"
 backend:
   azurerm:
     resource_group_name: "opta-{env}"

diff --git a/config/registry/google/index.yaml b/config/registry/google/index.yaml
@@ -1,10 +1,10 @@
 required_providers:
   google:
     source: "hashicorp/google"
-    version: "4.5.0"
+    version: "4.27.0"
   helm:
     source: "hashicorp/helm"
-    version: "2.4.1"
+    version: "2.6.0"
 backend:
   gcs:
     bucket: "{state_storage}"

diff --git a/modules/aws_base/tf_module/log_bucket.tf b/modules/aws_base/tf_module/log_bucket.tf
@@ -69,7 +69,8 @@ resource "aws_s3_bucket_lifecycle_configuration" "log_bucket" {
     }
 
     noncurrent_version_expiration {
-      noncurrent_days = 90
+      newer_noncurrent_versions = null
+      noncurrent_days           = 90
     }
   }
 

diff --git a/modules/aws_s3/tf_module/bucket.tf b/modules/aws_s3/tf_module/bucket.tf
@@ -30,7 +30,8 @@ resource "aws_s3_bucket_lifecycle_configuration" "bucket" {
     }
 
     noncurrent_version_expiration {
-      noncurrent_days = 90
+      newer_noncurrent_versions = null
+      noncurrent_days           = 90
     }
   }
 

diff --git a/modules/aws_s3/tf_module/replication.tf b/modules/aws_s3/tf_module/replication.tf
@@ -96,7 +96,8 @@ resource "aws_s3_bucket_lifecycle_configuration" "replica" {
     }
 
     noncurrent_version_expiration {
-      noncurrent_days = 90
+      newer_noncurrent_versions = null
+      noncurrent_days           = 90
     }
   }
 

diff --git a/tests/fixtures/basic_apply.py b/tests/fixtures/basic_apply.py
@@ -19,8 +19,8 @@
                 }
             },
             "required_providers": {
-                "aws": {"source": "hashicorp/aws", "version": "4.3.0"},
-                "helm": {"source": "hashicorp/helm", "version": "2.4.1"},
+                "aws": {"source": "hashicorp/aws", "version": "4.21.0"},
+                "helm": {"source": "hashicorp/helm", "version": "2.6.0"},
             },
         },
         "module": {