diff --git a/.github/workflows/tfsec.yml b/.github/workflows/tfsec.yml index 3e7fe6dd4..13470f4d6 100644 --- 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/rm@v1.0.2 - with: - path: modules/gcp_postgres - - name: tfsec - uses: tfsec/tfsec-sarif-action@v0.1.0 - 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/rm@v1.0.2 +# with: +# path: modules/gcp_postgres +# - name: tfsec +# uses: tfsec/tfsec-sarif-action@v0.1.0 +# 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 index 45311616c..f62fcd86f 100644 --- 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 index 02e80d71e..37a58b007 100644 --- 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 index 0f2c2e702..527c868d3 100644 --- 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 index 441d7854b..aa1eac271 100644 --- 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 index 2cc1b30d4..bec1d00fa 100644 --- 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 index d2d52be3e..665795b06 100644 --- 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 index 072fea49c..687c301b0 100644 --- 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": {