add internal lock to serialize terraform init to avoid potential prov…

…ider plugin cache concurrent error
Azure · May 27, 2024 · 3bf523b · 3bf523b
1 parent 3382edc
commit 3bf523b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/e2etest.go b/e2etest.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"sync"
 	"testing"
 	"time"
 
@@ -24,6 +25,7 @@ type TestOptions struct {
 }
 
 var copyLock = &KeyedMutex{}
+var initLock = &sync.Mutex{}
 
 type TerraformOutput = map[string]interface{}
 
@@ -108,6 +110,8 @@ func initAndApply(t terratest.TestingT, options *terraform.Options) string {
 }
 
 func tfInit(t terratest.TestingT, options *terraform.Options) {
+	initLock.Lock()
+	defer initLock.Unlock()
 	terraform.Init(t, options)
 }
 

diff --git a/version_helper.go b/version_helper.go
@@ -159,7 +159,11 @@ func (s *TestVersionSnapshot) load(t *testing.T) {
 		NoColor:      true,
 		Logger:       logger.Discard,
 	}
-	if output, err := initE(t, &opts); err != nil {
+	if output, err := func() (string, error) {
+		initLock.Lock()
+		defer initLock.Unlock()
+		return initE(t, &opts)
+	}(); err != nil {
 		s.Success = false
 		s.ErrorMsg = output
 		return