From 10fcda9a230454f478f2ebe41aeda4b68dd0b573 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Thu, 25 May 2023 08:05:42 -0700 Subject: [PATCH] Bumps version to 4.0.0 --- .bumpversion.cfg | 2 +- .github/dependabot.yml | 9 +--- CHANGELOG.md | 10 ++++ modules/accepter/README.md | 4 +- modules/accepter/versions.tf | 2 +- modules/account/README.md | 4 +- modules/account/versions.tf | 2 +- modules/action_target/README.md | 4 +- modules/action_target/versions.tf | 2 +- modules/cross-account-member/README.md | 2 +- modules/cross-account-member/versions.tf | 2 +- modules/member/README.md | 4 +- modules/member/versions.tf | 2 +- modules/subscriptions/README.md | 4 +- modules/subscriptions/versions.tf | 2 +- tests/module_test.go | 63 ------------------------ 16 files changed, 30 insertions(+), 88 deletions(-) delete mode 100644 tests/module_test.go diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cbe3057..0e34519 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.0.2 +current_version = 4.0.0 commit = True message = Bumps version to {new_version} tag = False diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fd0d595..8f483b4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,15 +8,10 @@ updates: - package-ecosystem: docker directory: "/" schedule: - interval: daily + interval: weekly open-pull-requests-limit: 10 - package-ecosystem: terraform directory: "/" schedule: - interval: daily - open-pull-requests-limit: 10 - - package-ecosystem: gomod - directory: "/tests" - schedule: - interval: daily + interval: weekly open-pull-requests-limit: 10 diff --git a/CHANGELOG.md b/CHANGELOG.md index 00378f9..02e2901 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +### [4.0.0](https://github.com/plus3it/terraform-aws-tardigrade-security-hub/releases/tag/4.0.0) + +**Released**: 2023.05.25 + +**Summary**: + +* Adds support for security hub `control_finding_generator` feature +* Sets default value for `control_finding_generator` to `SECURITY_CONTROL` +* Updates minimum terraform aws provider version to 4.64.0 + ### 3.0.2 **Released**: 2023.02.01 diff --git a/modules/accepter/README.md b/modules/accepter/README.md index d8aef16..91ab813 100644 --- a/modules/accepter/README.md +++ b/modules/accepter/README.md @@ -6,13 +6,13 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 3.29.0 | +| [aws](#requirement\_aws) | >= 4.64.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.29.0 | +| [aws](#provider\_aws) | >= 4.64.0 | ## Resources diff --git a/modules/accepter/versions.tf b/modules/accepter/versions.tf index 966e9bd..076bf5b 100644 --- a/modules/accepter/versions.tf +++ b/modules/accepter/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.29.0" + version = ">= 4.64.0" } } } diff --git a/modules/account/README.md b/modules/account/README.md index 21fb553..d5e4a7b 100644 --- a/modules/account/README.md +++ b/modules/account/README.md @@ -6,13 +6,13 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 3.29.0 | +| [aws](#requirement\_aws) | >= 4.64.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.29.0 | +| [aws](#provider\_aws) | >= 4.64.0 | ## Resources diff --git a/modules/account/versions.tf b/modules/account/versions.tf index 966e9bd..076bf5b 100644 --- a/modules/account/versions.tf +++ b/modules/account/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.29.0" + version = ">= 4.64.0" } } } diff --git a/modules/action_target/README.md b/modules/action_target/README.md index 190305b..d29069f 100644 --- a/modules/action_target/README.md +++ b/modules/action_target/README.md @@ -6,13 +6,13 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 3.29.0 | +| [aws](#requirement\_aws) | >= 4.64.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.29.0 | +| [aws](#provider\_aws) | >= 4.64.0 | ## Resources diff --git a/modules/action_target/versions.tf b/modules/action_target/versions.tf index 966e9bd..076bf5b 100644 --- a/modules/action_target/versions.tf +++ b/modules/action_target/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.29.0" + version = ">= 4.64.0" } } } diff --git a/modules/cross-account-member/README.md b/modules/cross-account-member/README.md index 1b73273..d7356aa 100644 --- a/modules/cross-account-member/README.md +++ b/modules/cross-account-member/README.md @@ -6,7 +6,7 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 3.29.0 | +| [aws](#requirement\_aws) | >= 4.64.0 | ## Providers diff --git a/modules/cross-account-member/versions.tf b/modules/cross-account-member/versions.tf index 41d8925..74e5487 100644 --- a/modules/cross-account-member/versions.tf +++ b/modules/cross-account-member/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.29.0" + version = ">= 4.64.0" configuration_aliases = [aws.administrator] } } diff --git a/modules/member/README.md b/modules/member/README.md index c7b99aa..975b6fd 100644 --- a/modules/member/README.md +++ b/modules/member/README.md @@ -6,13 +6,13 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 3.29.0 | +| [aws](#requirement\_aws) | >= 4.64.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.29.0 | +| [aws](#provider\_aws) | >= 4.64.0 | ## Resources diff --git a/modules/member/versions.tf b/modules/member/versions.tf index 966e9bd..076bf5b 100644 --- a/modules/member/versions.tf +++ b/modules/member/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.29.0" + version = ">= 4.64.0" } } } diff --git a/modules/subscriptions/README.md b/modules/subscriptions/README.md index 035c8ec..6b11621 100644 --- a/modules/subscriptions/README.md +++ b/modules/subscriptions/README.md @@ -6,13 +6,13 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 3.29.0 | +| [aws](#requirement\_aws) | >= 4.64.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.29.0 | +| [aws](#provider\_aws) | >= 4.64.0 | ## Resources diff --git a/modules/subscriptions/versions.tf b/modules/subscriptions/versions.tf index 966e9bd..076bf5b 100644 --- a/modules/subscriptions/versions.tf +++ b/modules/subscriptions/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.29.0" + version = ">= 4.64.0" } } } diff --git a/tests/module_test.go b/tests/module_test.go deleted file mode 100644 index d2b547b..0000000 --- a/tests/module_test.go +++ /dev/null @@ -1,63 +0,0 @@ -package testing - -import "github.com/gruntwork-io/terratest/modules/terraform" -import "io/ioutil" -import "log" -import "os" -import "strings" -import "testing" - -func TestModule(t *testing.T) { - files, err := ioutil.ReadDir("./") - - if err != nil { - log.Fatal(err) - } - - for _, f := range files { - // look for directories with test cases in it - if f.IsDir() && f.Name() != "vendor" { - tfFiles, tfErr := ioutil.ReadDir(f.Name()) - - if tfErr != nil { - log.Fatal(tfErr) - } - - // check if directory contains terraform files - terraformDir := false - for _, tf := range tfFiles { - if strings.HasSuffix(tf.Name(), ".tf") { - terraformDir = true - break - } - } - - // create a test for each directory with terraform files in it - if terraformDir { - t.Run(f.Name(), func(t *testing.T) { - // check if a prereq directory exists - prereqDir := f.Name() + "/prereq/" - if _, err := os.Stat(prereqDir); err == nil { - prereqOptions := createTerraformOptions(prereqDir) - defer terraform.Destroy(t, prereqOptions) - terraform.InitAndApply(t, prereqOptions) - } - - // run terraform code for test case - terraformOptions := createTerraformOptions(f.Name()) - defer terraform.Destroy(t, terraformOptions) - terraform.InitAndApply(t, terraformOptions) - }) - } - } - } -} - -func createTerraformOptions(directory string) *terraform.Options { - terraformOptions := &terraform.Options{ - TerraformDir: directory, - NoColor: true, - } - - return terraformOptions -}