Adapt count parser to tf 0.15.5 (#925)

* Adapt count parser to tf 0.15.5 * Fix build
gruntwork-io · Jun 11, 2021 · e4f4b36 · e4f4b36
1 parent eb13c38
commit e4f4b36
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ env: &env
     GRUNTWORK_INSTALLER_VERSION: v0.0.36
     MODULE_CI_VERSION: v0.33.3
     MODULE_GCP_CI_VERSION: v0.1.1
-    TERRAFORM_VERSION: 0.15.0
+    TERRAFORM_VERSION: 0.15.5
     TERRAGRUNT_VERSION: v0.28.24
     PACKER_VERSION: 1.6.6
     GO_VERSION: 1.16.3

diff --git a/modules/terraform/count.go b/modules/terraform/count.go
@@ -21,7 +21,7 @@ const (
 	applyRegexp             = `Apply complete! Resources: (\d+) added, (\d+) changed, (\d+) destroyed\.`
 	destroyRegexp           = `Destroy complete! Resources: (\d+) destroyed\.`
 	planWithChangesRegexp   = `(\033\[1m)?Plan:(\033\[0m)? (\d+) to add, (\d+) to change, (\d+) to destroy\.`
-	planWithNoChangesRegexp = `No changes\. Infrastructure is up-to-date\.`
+	planWithNoChangesRegexp = `No changes\. (Infrastructure is up-to-date)|(Your infrastructure matches the configuration)\.`
 )
 
 const getResourceCountErrMessage = "Can't parse Terraform output"

diff --git a/modules/terraform/plan_test.go b/modules/terraform/plan_test.go
@@ -41,7 +41,7 @@ func TestInitAndPlanWithNoError(t *testing.T) {
 	InitAndApply(t, options)
 	out, err := PlanE(t, options)
 	require.NoError(t, err)
-	require.Contains(t, out, "No changes. Infrastructure is up-to-date.")
+	require.Contains(t, out, "No changes.")
 }
 
 func TestInitAndPlanWithOutput(t *testing.T) {