parse

mtojek · mtojek · commit 0f34937f5cbb · 2024-05-17T12:00:38.000+02:00
diff --git a/provisioner/terraform/parse.go b/provisioner/terraform/parse.go
@@ -71,7 +71,7 @@ func (s *server) loadWorkspaceTags(ctx context.Context, module *tfconfig.Module)
 
 	for _, dataResource := range module.DataResources {
 		if dataResource.Type != "coder_workspace_tags" {
-			s.logger.Debug(ctx, "skip resource as it is not a coder_workspace_tags", "resource_name", dataResource.Name)
+			s.logger.Debug(ctx, "skip resource as it is not a coder_workspace_tags", "resource_name", dataResource.Name, "resource_type", dataResource.Type)
 			continue
 		}
 
@@ -114,6 +114,8 @@ func (s *server) loadWorkspaceTags(ctx context.Context, module *tfconfig.Module)
 				if err != nil {
 					return nil, xerrors.Errorf("can't preview the resource file: %v", err)
 				}
+				key = strings.Trim(key, `"`)
+
 				value, err := previewFileContent(tagItem.ValueExpr.Range())
 				if err != nil {
 					return nil, xerrors.Errorf("can't preview the resource file: %v", err)
@@ -124,14 +126,15 @@ func (s *server) loadWorkspaceTags(ctx context.Context, module *tfconfig.Module)
 			}
 		}
 	}
-	return workspaceTags, nil // TODO
+	return workspaceTags, nil
 }
 
 func previewFileContent(fileRange hcl.Range) (string, error) {
 	body, err := os.ReadFile(fileRange.Filename)
 	if err != nil {
 		return "", err
 	}
+	return string(fileRange.SliceBytes(body)), nil
 
 }
 
diff --git a/provisioner/terraform/parse_test.go b/provisioner/terraform/parse_test.go
@@ -23,7 +23,7 @@ func TestParse(t *testing.T) {
 		// If ErrorContains is not empty, then the ParseComplete should have an Error containing the given string
 		ErrorContains string
 	}{
-		/*{
+		{
 			Name: "single-variable",
 			Files: map[string]string{
 				"main.tf": `variable "A" {
@@ -200,7 +200,7 @@ func TestParse(t *testing.T) {
 					},
 				},
 			},
-		},*/
+		},
 		{
 			Name: "workspace-tags",
 			Files: map[string]string{
@@ -252,6 +252,14 @@ func TestParse(t *testing.T) {
 					}
 				  }`,
 			},
+			Response: &proto.ParseComplete{
+				WorkspaceTags: map[string]string{
+					"cluster": `"developers"`,
+					"os":      `data.coder_parameter.os_selector.value`,
+					"debug":   `"${data.coder_parameter.feature_debug_enabled.value}+12345"`,
+					"cache":   `data.coder_parameter.feature_cache_enabled.value == "true" ? "nix-with-cache" : "no-cache"`,
+				},
+			},
 		},
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func (s server) loadWorkspaceTags(ctx context.Context, module tfconfig.Module)`
`71`	`71`
`72`	`72`	`for _, dataResource := range module.DataResources {`
`73`	`73`	`if dataResource.Type != "coder_workspace_tags" {`
`74`		`- s.logger.Debug(ctx, "skip resource as it is not a coder_workspace_tags", "resource_name", dataResource.Name)`
	`74`	`+ s.logger.Debug(ctx, "skip resource as it is not a coder_workspace_tags", "resource_name", dataResource.Name, "resource_type", dataResource.Type)`
`75`	`75`	`continue`
`76`	`76`	`}`
`77`	`77`
`@@ -114,6 +114,8 @@ func (s server) loadWorkspaceTags(ctx context.Context, module tfconfig.Module)`
`114`	`114`	`if err != nil {`
`115`	`115`	`return nil, xerrors.Errorf("can't preview the resource file: %v", err)`
`116`	`116`	`}`
	`117`	+ key = strings.Trim(key, `"`)
	`118`	`+`
`117`	`119`	`value, err := previewFileContent(tagItem.ValueExpr.Range())`
`118`	`120`	`if err != nil {`
`119`	`121`	`return nil, xerrors.Errorf("can't preview the resource file: %v", err)`
`@@ -124,14 +126,15 @@ func (s server) loadWorkspaceTags(ctx context.Context, module tfconfig.Module)`
`124`	`126`	`}`
`125`	`127`	`}`
`126`	`128`	`}`
`127`		`- return workspaceTags, nil // TODO`
	`129`	`+ return workspaceTags, nil`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`func previewFileContent(fileRange hcl.Range) (string, error) {`
`131`	`133`	`body, err := os.ReadFile(fileRange.Filename)`
`132`	`134`	`if err != nil {`
`133`	`135`	`return "", err`
`134`	`136`	`}`
	`137`	`+ return string(fileRange.SliceBytes(body)), nil`
`135`	`138`
`136`	`139`	`}`
`137`	`140`