Fix: race conditions during run (#144)

internal/tfschema/tfschema.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"strings"
+	"sync"
 
 	"github.com/env0/terratag/internal/providers"
 	"github.com/env0/terratag/internal/tagging"
@@ -16,6 +17,7 @@ import (
 )
 
 var providerToClientMap = map[string]tfschema.Client{}
+var providerToClientMapLock sync.Mutex
 
 var customSupportedProviderNames = [...]string{"google-beta"}
 
@@ -83,6 +85,14 @@ func detectProviderName(resource hclwrite.Block) (string, error) {
 }
 
 func getClient(providerName string, dir string) (tfschema.Client, error) {
+	providerToClientMapLock.Lock()
+	defer providerToClientMapLock.Unlock()
+
+	client, exists := providerToClientMap[providerName]
+	if exists {
+		return client, nil
+	}
+
 	logger := hclog.New(&hclog.LoggerOptions{
 		Name:   "plugin",
 		Level:  hclog.Trace,
@@ -92,19 +102,16 @@ func getClient(providerName string, dir string) (tfschema.Client, error) {
 		// weird to need to bypass the issue by assigning the default
 		// output ¯\_(ツ)_/¯
 	})
-	client, exists := providerToClientMap[providerName]
-	if exists {
-		return client, nil
-	} else {
-		newClient, err := tfschema.NewClient(providerName, tfschema.Option{
-			RootDir: dir,
-			Logger:  logger,
-		})
-		if err != nil {
-			return nil, err
-		}
 
-		providerToClientMap[providerName] = newClient
-		return newClient, nil
+	newClient, err := tfschema.NewClient(providerName, tfschema.Option{
+		RootDir: dir,
+		Logger:  logger,
+	})
+	if err != nil {
+		return nil, err
 	}
+
+	providerToClientMap[providerName] = newClient
+
+	return newClient, nil
 }

terratag_test.go

@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"sync"
 	"testing"
 
 	"github.com/bmatcuk/doublestar"
@@ -28,6 +29,7 @@ var args = []string{
 }
 var testsDir = "test/tests"
 var fixtureDir = "test/fixture"
+var osArgsLock sync.Mutex
 
 type TestCase struct {
 	suite    string
@@ -233,17 +235,19 @@ func run_terratag(entryDir string, filter string) (err interface{}) {
 			err = innerErr
 		}
 	}()
+	osArgsLock.Lock()
 	if filter == "" {
 		os.Args = append(args, "-dir="+entryDir)
 	} else {
 		os.Args = append(args, "-dir="+entryDir, "-filter="+filter)
 	}
 	args, isMissingArg := cli.InitArgs()
+	os.Args = cleanArgs
+	osArgsLock.Unlock()
 	if isMissingArg {
 		return errors.New("Missing arg")
 	}
 	Terratag(args)
-	os.Args = cleanArgs
 
 	return nil
 }