Merge pull request #78 from plus3it/dependabot/go_modules/tests/terra…

…form/github.com/gruntwork-io/terratest-0.28.13 Bump github.com/gruntwork-io/terratest from 0.28.12 to 0.28.13 in /tests/terraform
plus3it · Aug 18, 2020 · 28a8b78 · 28a8b78
2 parents e4082ac + 2021f77
commit 28a8b78
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.18
+current_version = 0.1.0
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ green = $(shell echo -e '\x1b[32;01m$1\x1b[0m')
 yellow = $(shell echo -e '\x1b[33;01m$1\x1b[0m')
 red = $(shell echo -e '\x1b[33;31m$1\x1b[0m')
 
-PROJECT_ROOT ?= .
+PROJECT_ROOT ?= ./
 
 export SELF ?= $(MAKE)
 
@@ -284,7 +284,7 @@ docs/lint: | terraform/lint
 	@ $(README_FILES) | $(XARGS) $(MAKE) docs/lint/{}
 
 
-docker/%: IMAGE_NAME := $(shell basename $(PROJECT_ROOT)):latest
+docker/%: IMAGE_NAME := $(shell basename $$(readlink -f $(PROJECT_ROOT))):latest
 
 ## Builds the tardigrade-ci docker image
 docker/build: GET_IMAGE_ID := docker inspect --type=image -f '{{.Id}}' "$(IMAGE_NAME)" 2> /dev/null || true

diff --git a/tests/make/terraform_test_success.bats b/tests/make/terraform_test_success.bats
@@ -21,6 +21,6 @@ EOF
 }
 
 function teardown() {
-  find "$TEST_DIR/example_testcase/" -name "*terraform*" -exec rm -rf {} \;
+  find "$TEST_DIR/example_testcase" -name "*terraform*" -exec rm -rf {} \;
   rm $TEST_DIR/main.tf
 }
diff --git a/tests/terraform/example_testcase/main.tf b/tests/terraform/example_testcase/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = ">= 0.12.0"
 }
 
 module "example" {

diff --git a/tests/terraform/go.mod b/tests/terraform/go.mod
@@ -2,4 +2,4 @@ module tardigrade-ci/tests
 
 go 1.13
 
-require github.com/gruntwork-io/terratest v0.28.12
+require github.com/gruntwork-io/terratest v0.28.13
diff --git a/tests/terraform/go.sum b/tests/terraform/go.sum
@@ -266,6 +266,8 @@ github.com/gruntwork-io/terratest v0.28.10 h1:4K3idJK5atavZ7iwY+L+RPCA7lFwPu87dV
 github.com/gruntwork-io/terratest v0.28.10/go.mod h1:PkVylPuUNmItkfOTwSiFreYA4FkanK8AluBuNeGxQOw=
 github.com/gruntwork-io/terratest v0.28.12 h1:XPLiZMV0XkRGNj1JRVvvZ2wj99tiQ4CWYfDtPI9cBlI=
 github.com/gruntwork-io/terratest v0.28.12/go.mod h1:PkVylPuUNmItkfOTwSiFreYA4FkanK8AluBuNeGxQOw=
+github.com/gruntwork-io/terratest v0.28.13 h1:wzydkaIekNMuIpeU/ksgxuUFwc0wgEL5Y5hVkPAzni4=
+github.com/gruntwork-io/terratest v0.28.13/go.mod h1:PkVylPuUNmItkfOTwSiFreYA4FkanK8AluBuNeGxQOw=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module tardigrade-ci/tests

		go 1.13

		require github.com/gruntwork-io/terratest v0.28.12
		require github.com/gruntwork-io/terratest v0.28.13