lock only when execute init

Azure · Feb 2, 2023 · 36c5e97 · 36c5e97
1 parent f0ae9b7
commit 36c5e97
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/e2etest.go b/e2etest.go
@@ -42,9 +42,14 @@ func RunE2ETest(t *testing.T, moduleRootPath, exampleRelativePath string, option
 }
 
 func initAndApply(t terratest.TestingT, options *terraform.Options) string {
+	tfInit(t, options)
+	return terraform.InitAndApply(t, options)
+}
+
+func tfInit(t terratest.TestingT, options *terraform.Options) {
 	initLock.Lock()
 	defer initLock.Unlock()
-	return terraform.InitAndApply(t, options)
+	terraform.Init(t, options)
 }
 
 func destroy(t *testing.T, option terraform.Options) {

diff --git a/upgradetest.go b/upgradetest.go
@@ -251,7 +251,6 @@ func sameMajorVersion(majorVersion int) func(i interface{}) bool {
 }
 
 func initAndPlanWithExitCode(t terratest.TestingT, options *terraform.Options) int {
-	initLock.Lock()
-	defer initLock.Unlock()
-	return terraform.InitAndPlanWithExitCode(t, options)
-}
+	tfInit(t, options)
+	return terraform.PlanExitCode(t, options)
+}