WIP

mtojek · mtojek · commit fe1872a82315 · 2024-05-17T12:00:38.000+02:00
diff --git a/provisioner/terraform/parse.go b/provisioner/terraform/parse.go
@@ -78,12 +78,12 @@ func (s *server) loadWorkspaceTags(ctx context.Context, module *tfconfig.Module)
 		var file *hcl.File
 		var diags hcl.Diagnostics
 		parser := hclparse.NewParser()
-		if strings.HasSuffix(dataResource.Pos.Filename, ".tf") {
-			file, diags = parser.ParseHCLFile(dataResource.Pos.Filename)
-		} else {
+
+		if !strings.HasSuffix(dataResource.Pos.Filename, ".tf") {
 			s.logger.Debug(ctx, "only .tf files can be parsed", "filename", dataResource.Pos.Filename)
 			continue
 		}
+		file, diags = parser.ParseHCLFile(dataResource.Pos.Filename)
 
 		if diags.HasErrors() {
 			return nil, xerrors.Errorf("can't parse the resource file: %s", diags.Error())
@@ -122,6 +122,10 @@ func (s *server) loadWorkspaceTags(ctx context.Context, module *tfconfig.Module)
 				}
 
 				s.logger.Info(ctx, "workspace tag found", "key", key, "value", value)
+
+				if _, ok := workspaceTags[key]; ok {
+					return nil, xerrors.Errorf(`workspace tag "%s" is defined multiple times`, key)
+				}
 				workspaceTags[key] = value
 			}
 		}
diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go
@@ -517,7 +517,7 @@ func (r *Runner) runTemplateImport(ctx context.Context) (*proto.CompletedJob, *p
 		Stage:     "Parsing template parameters",
 		CreatedAt: time.Now().UnixMilli(),
 	})
-	templateVariables, readme, err := r.runTemplateImportParse(ctx)
+	_, templateVariables, readme, err := r.runTemplateImportParse(ctx) // TODO workspace_tags
 	if err != nil {
 		return nil, r.failedJobf("run parse: %s", err)
 	}
@@ -586,19 +586,19 @@ func (r *Runner) runTemplateImport(ctx context.Context) (*proto.CompletedJob, *p
 
 // Parses template variables and README from source.
 func (r *Runner) runTemplateImportParse(ctx context.Context) (
-	vars []*sdkproto.TemplateVariable, readme []byte, err error,
+	workspaceTags map[string]string, vars []*sdkproto.TemplateVariable, readme []byte, err error,
 ) {
 	ctx, span := r.startTrace(ctx, tracing.FuncName())
 	defer span.End()
 
 	err = r.session.Send(&sdkproto.Request{Type: &sdkproto.Request_Parse{Parse: &sdkproto.ParseRequest{}}})
 	if err != nil {
-		return nil, nil, xerrors.Errorf("parse source: %w", err)
+		return nil, nil, nil, xerrors.Errorf("parse source: %w", err)
 	}
 	for {
 		msg, err := r.session.Recv()
 		if err != nil {
-			return nil, nil, xerrors.Errorf("recv parse source: %w", err)
+			return nil, nil, nil, xerrors.Errorf("recv parse source: %w", err)
 		}
 		switch msgType := msg.Type.(type) {
 		case *sdkproto.Response_Log:
@@ -617,17 +617,18 @@ func (r *Runner) runTemplateImportParse(ctx context.Context) (
 		case *sdkproto.Response_Parse:
 			pc := msgType.Parse
 			r.logger.Debug(context.Background(), "parse complete",
+				slog.F("workspace_tags", pc.WorkspaceTags),
 				slog.F("template_variables", pc.TemplateVariables),
 				slog.F("readme_len", len(pc.Readme)),
 				slog.F("error", pc.Error),
 			)
 			if pc.Error != "" {
-				return nil, nil, xerrors.Errorf("parse error: %s", pc.Error)
+				return nil, nil, nil, xerrors.Errorf("parse error: %s", pc.Error)
 			}
 
-			return msgType.Parse.TemplateVariables, msgType.Parse.Readme, nil
+			return msgType.Parse.WorkspaceTags, msgType.Parse.TemplateVariables, msgType.Parse.Readme, nil
 		default:
-			return nil, nil, xerrors.Errorf("invalid message type %q received from provisioner",
+			return nil, nil, nil, xerrors.Errorf("invalid message type %q received from provisioner",
 				reflect.TypeOf(msg.Type).String())
 		}
 	}
diff --git a/site/e2e/provisionerGenerated.ts b/site/e2e/provisionerGenerated.ts

Original file line number	Diff line number	Diff line change
`@@ -78,12 +78,12 @@ func (s server) loadWorkspaceTags(ctx context.Context, module tfconfig.Module)`
`78`	`78`	`var file *hcl.File`
`79`	`79`	`var diags hcl.Diagnostics`
`80`	`80`	`parser := hclparse.NewParser()`
`81`		`- if strings.HasSuffix(dataResource.Pos.Filename, ".tf") {`
`82`		`- file, diags = parser.ParseHCLFile(dataResource.Pos.Filename)`
`83`		`- } else {`
	`81`	`+`
	`82`	`+ if !strings.HasSuffix(dataResource.Pos.Filename, ".tf") {`
`84`	`83`	`s.logger.Debug(ctx, "only .tf files can be parsed", "filename", dataResource.Pos.Filename)`
`85`	`84`	`continue`
`86`	`85`	`}`
	`86`	`+ file, diags = parser.ParseHCLFile(dataResource.Pos.Filename)`
`87`	`87`
`88`	`88`	`if diags.HasErrors() {`
`89`	`89`	`return nil, xerrors.Errorf("can't parse the resource file: %s", diags.Error())`
`@@ -122,6 +122,10 @@ func (s server) loadWorkspaceTags(ctx context.Context, module tfconfig.Module)`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`s.logger.Info(ctx, "workspace tag found", "key", key, "value", value)`
	`125`	`+`
	`126`	`+ if _, ok := workspaceTags[key]; ok {`
	`127`	+ return nil, xerrors.Errorf(`workspace tag "%s" is defined multiple times`, key)
	`128`	`+ }`
`125`	`129`	`workspaceTags[key] = value`
`126`	`130`	`}`
`127`	`131`	`}`