change unit-test

bridgecrewio · Aug 5, 2024 · 7877a68 · 7877a68
1 parent 93854e7
commit 7877a68
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/terraform/structure/terraform_parser.go b/src/terraform/structure/terraform_parser.go
@@ -261,13 +261,13 @@ func (p *TerraformParser) WriteFile(readFilePath string, blocks []structure.IBlo
 	}
 
 	// can't delete files on windows if you dont close them
-	// if err = fd.Close(); err != nil {
-	// 	return err
-	// }
-	// err = os.Remove(tempFile.Name())
-	// if err != nil {
-	// 	return err
-	// }
+	if err = fd.Close(); err != nil {
+		return err
+	}
+	err = os.Remove(tempFile.Name())
+	if err != nil {
+		return err
+	}
 
 	// #nosec G304
 	f, err := os.OpenFile(writeFilePath, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0600)
@@ -828,19 +828,18 @@ func (p *TerraformParser) parseTagAttribute(tokens hclwrite.Tokens) (map[string]
 		hclData := new(Resource)
 		hclBytes := tokens.Bytes()
 		hclBytes = []byte(strings.Replace(string(hclBytes), "{", " tags= {", 1))
-		// Unmarshalling the HCL data into a map
 
 		err := dethcl.Unmarshal([]byte(hclBytes), hclData)
 		if err != nil {
 			return nil, fmt.Errorf("failed to unmarshel data because %s", err)
 		}
 
-		jsonData, err := dethcl.Marshal(hclData)
+		tempHclData, err := dethcl.Marshal(hclData)
 		if err != nil {
 			return nil, fmt.Errorf("failed to marshel data because %s", err)
 
 		}
-		hclFile, diagnostics := hclwrite.ParseConfig(jsonData, "", hcl.InitialPos)
+		hclFile, diagnostics := hclwrite.ParseConfig(tempHclData, "", hcl.InitialPos)
 		if diagnostics != nil && diagnostics.HasErrors() {
 			return nil, fmt.Errorf("failed to convert to hclFile %s", diagnostics)
 		}

diff --git a/src/terraform/structure/terraform_parser_test.go b/src/terraform/structure/terraform_parser_test.go
@@ -53,7 +53,7 @@ func TestTerraformParser_SkipResourceByComment(t *testing.T) {
 }
 
 func TestParseTagAttribute(t *testing.T) {
-	filePath := "../../../tests/terraform/foorOption/one.tf"
+	filePath := "../../../tests/terraform/forLoop/main.tf"
 	expectedTags := map[string]string{
 		"c": "d",
 	}
@@ -69,9 +69,9 @@ func TestParseTagAttribute(t *testing.T) {
 		if tagsAttribute != nil {
 			tagsTokens := tagsAttribute.Expr().BuildTokens(hclwrite.Tokens{})
 			parsedTags, _ := parser.parseTagAttribute(tagsTokens)
-			if(block.GetResourceName()=="a"){
-			assert.Equal(t, parsedTags, expectedTags)
-		}
+			if block.GetResourceName() == "bucket_var_tags" {
+				assert.Equal(t, parsedTags, expectedTags)
+			}
 		}
 
 	}