From 54feea31402be176cc6a6f3f525cbfc817e6fbe1 Mon Sep 17 00:00:00 2001 From: confusdcodr Date: Thu, 19 Sep 2019 18:29:41 -0400 Subject: [PATCH 1/2] Update dependabot configuration and add test case --- .dependabot/_config.yml | 7 ------ .dependabot/config.yml | 23 +++++++++++++++++++ CHANGELOG.md | 12 ++++++++++ tests/baseline/main.tf | 2 +- tests/go.mod | 8 +++---- tests/go.sum | 12 +++++----- tests/no_create/main.tf | 15 ++++++++++++ .../prereq => no_create}/versions.tf | 0 .../main.tf | 2 +- .../prereq/main.tf | 0 .../prereq}/versions.tf | 0 tests/premade_policy/versions.tf | 3 +++ 12 files changed, 65 insertions(+), 19 deletions(-) delete mode 100644 .dependabot/_config.yml create mode 100644 .dependabot/config.yml create mode 100644 tests/no_create/main.tf rename tests/{premade-policy/prereq => no_create}/versions.tf (100%) rename tests/{premade-policy => premade_policy}/main.tf (94%) rename tests/{premade-policy => premade_policy}/prereq/main.tf (100%) rename tests/{premade-policy => premade_policy/prereq}/versions.tf (100%) create mode 100644 tests/premade_policy/versions.tf diff --git a/.dependabot/_config.yml b/.dependabot/_config.yml deleted file mode 100644 index ab6dbbc..0000000 --- a/.dependabot/_config.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: 1 - -update_configs: - - - package_manager: "terraform" - directory: "/" - update_schedule: "daily" diff --git a/.dependabot/config.yml b/.dependabot/config.yml new file mode 100644 index 0000000..a23db73 --- /dev/null +++ b/.dependabot/config.yml @@ -0,0 +1,23 @@ +version: 1 + +update_configs: + + - package_manager: "terraform" + directory: "/" + update_schedule: "daily" + + - package_manager: "terraform" + directory: "/tests/baseline" + update_schedule: "daily" + + - package_manager: "terraform" + directory: "/tests/premade-policy" + update_schedule: "daily" + + - package_manager: "terraform" + directory: "/tests/no_create" + update_schedule: "daily" + + - package_manager: "go:modules" + directory: "/tests" + update_schedule: "daily" diff --git a/CHANGELOG.md b/CHANGELOG.md index c36b1c4..e35b081 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,18 @@ 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/). +### 1.0.2 + +**Commit Delta**: https://github.com/plus3it/terraform-aws-tardigrade-inspector/compare/1.0.1...1.0.2 + +**Released**: 2019.09.19 + +**Summary**: + +* Re-enable dependabot and add additional configurations +* Add an additional test +* Update go module versions + ### 1.0.1 **Commit Delta**: https://github.com/plus3it/terraform-aws-tardigrade-inspector/compare/1.0.0...1.0.1 diff --git a/tests/baseline/main.tf b/tests/baseline/main.tf index e749eed..ee3fbbe 100644 --- a/tests/baseline/main.tf +++ b/tests/baseline/main.tf @@ -7,7 +7,7 @@ resource "random_id" "name" { prefix = "terraform-aws-inspector-" } -module "inspector" { +module "baseline" { source = "../../" providers = { diff --git a/tests/go.mod b/tests/go.mod index 5f366a8..fd3ff91 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,11 +1,11 @@ module terraform-aws-tardigrade-inspector/tests -go 1.12 +go 1.13 require ( - github.com/gruntwork-io/terratest v0.18.6 + github.com/gruntwork-io/terratest v0.19.0 github.com/magiconair/properties v1.8.1 // indirect github.com/stretchr/testify v1.4.0 // indirect - golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect - golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect + golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 // indirect + golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab // indirect ) diff --git a/tests/go.sum b/tests/go.sum index 9ce561c..5909f1d 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -1,7 +1,7 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gruntwork-io/terratest v0.18.6 h1:6LQeJC7O3NErZLv7MNRUuUuFtlekg3z8rYSwOqtJ6ws= -github.com/gruntwork-io/terratest v0.18.6/go.mod h1:NjUn6YXA5Skxt8Rs20t3isYx5Rl+EgvGB8/+RRXddqk= +github.com/gruntwork-io/terratest v0.19.0 h1:LZjT4bDUzJW1M0KUw3mQIviWmg4INkNDpuKGask9UUM= +github.com/gruntwork-io/terratest v0.19.0/go.mod h1:NjUn6YXA5Skxt8Rs20t3isYx5Rl+EgvGB8/+RRXddqk= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -10,11 +10,11 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 h1:Gv7RPwsi3eZ2Fgewe3CBsuOebPwO27PoXzRpJPsvSSM= -golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab h1:h5tBRKZ1aY/bo6GNqe/4zWC8GkaLOFQ5wPKIOQ0i2sA= +golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/tests/no_create/main.tf b/tests/no_create/main.tf new file mode 100644 index 0000000..bc5edc8 --- /dev/null +++ b/tests/no_create/main.tf @@ -0,0 +1,15 @@ +provider "aws" { + region = "us-east-1" +} + +module "no_create" { + source = "../../" + + providers = { + aws = aws + } + + create_inspector = false + name = "tardigrade-inspector-no-create" +} + diff --git a/tests/premade-policy/prereq/versions.tf b/tests/no_create/versions.tf similarity index 100% rename from tests/premade-policy/prereq/versions.tf rename to tests/no_create/versions.tf diff --git a/tests/premade-policy/main.tf b/tests/premade_policy/main.tf similarity index 94% rename from tests/premade-policy/main.tf rename to tests/premade_policy/main.tf index 74302c4..c99e3d2 100644 --- a/tests/premade-policy/main.tf +++ b/tests/premade_policy/main.tf @@ -9,7 +9,7 @@ data "terraform_remote_state" "prereq" { } } -module "inspector" { +module "premade_policy" { source = "../../" providers = { diff --git a/tests/premade-policy/prereq/main.tf b/tests/premade_policy/prereq/main.tf similarity index 100% rename from tests/premade-policy/prereq/main.tf rename to tests/premade_policy/prereq/main.tf diff --git a/tests/premade-policy/versions.tf b/tests/premade_policy/prereq/versions.tf similarity index 100% rename from tests/premade-policy/versions.tf rename to tests/premade_policy/prereq/versions.tf diff --git a/tests/premade_policy/versions.tf b/tests/premade_policy/versions.tf new file mode 100644 index 0000000..d9b6f79 --- /dev/null +++ b/tests/premade_policy/versions.tf @@ -0,0 +1,3 @@ +terraform { + required_version = ">= 0.12" +} From f6638903434d173a584df30859e8b6b36b4b06d1 Mon Sep 17 00:00:00 2001 From: confusdcodr Date: Thu, 19 Sep 2019 18:45:47 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=201.0.2=20=E2=86=92=201.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7c02978..89690d7 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.2 +current_version = 1.0.3 commit = True tag = False tag_name = {new_version}