Fix integration_test and go-lint tests 2

bridgecrewio · Jun 9, 2024 · 1fe6d9f · 1fe6d9f
1 parent c44c968
commit 1fe6d9f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/common/runner/runner_test.go b/src/common/runner/runner_test.go
@@ -223,24 +223,24 @@ func TestRunnerInternals(t *testing.T) {
 	})
 
 	t.Run("Test skip resource by comment", func(t *testing.T) {
-        options := clioptions.TagOptions{
-            Directory: "../../../tests/terraform/skipComment/skipOne.tf",
-            Parsers:   []string{"Terraform"},
-        }
-        runner := Runner{}
-        err := runner.Init(&options)
-        if err != nil {
-            t.Error(err)
-        }
-        tfBlocks, err := runner.parsers[0].ParseFile(options.Directory)
-        if err != nil {
-            t.Error(err)
-        }
-        assert.Equal(t, 3, len(tfBlocks))
-        utils.AppendSkipedByCommentToRunnerSkippedResources(&runner.skippedResources)
+		options := clioptions.TagOptions{
+			Directory: "../../../tests/terraform/skipComment/skipOne.tf",
+			Parsers:   []string{"Terraform"},
+		}
+		runner := Runner{}
+		err := runner.Init(&options)
+		if err != nil {
+			t.Error(err)
+		}
+		tfBlocks, err := runner.parsers[0].ParseFile(options.Directory)
+		if err != nil {
+			t.Error(err)
+		}
+		assert.Equal(t, 3, len(tfBlocks))
+		utils.AppendSkipedByCommentToRunnerSkippedResources(&runner.skippedResources)
 		result := []string{"aws_instance.example_instance"}
-        assert.Equal(t, result, runner.skippedResources)
-    })
+		assert.Equal(t, result, runner.skippedResources)
+	})
 
 	t.Run("Test skip resource - cloudformation", func(t *testing.T) {
 		runner := Runner{}

diff --git a/src/common/utils/utils.go b/src/common/utils/utils.go
@@ -19,9 +19,9 @@ import (
 // RemoveGcpInvalidChars Source of regex: https://cloud.google.com/compute/docs/labeling-resources
 var RemoveGcpInvalidChars = regexp.MustCompile(`[^\p{Ll}\p{Lo}\p{N}_-]`)
 var SkipResourcesByComment = make([]string, 0)
+var mutex sync.Mutex
 
 func AppendSkipedByCommentToRunnerSkippedResources(skippedResources *[]string) {
-    var mutex sync.Mutex
 	mutex.Lock()
 	defer mutex.Unlock()
 

diff --git a/src/terraform/structure/terraform_parser.go b/src/terraform/structure/terraform_parser.go
@@ -182,7 +182,7 @@ func (p *TerraformParser) ParseFile(filePath string) ([]structure.IBlock, error)
 			if strings.ToUpper(strings.TrimSpace(lineAbove)) == "#YOR:SKIPALL" {
 				skipAll = true
 			}
-			
+
 			if strings.ToUpper(strings.TrimSpace(lineAbove)) == "#YOR:SKIP" || skipAll {
 				utils.SkipResourcesByComment = append(utils.SkipResourcesByComment, terraformBlock.GetResourceID())
 			}