WIP

mtojek · mtojek · commit 3a510ea569d4 · 2023-02-13T12:41:19.000Z
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -398,23 +398,26 @@ func (server *Server) UpdateJob(ctx context.Context, request *proto.UpdateJobReq
 		}
 
 		var variableValues []*sdkproto.VariableValue
-		server.Logger.Info(ctx, "variable values from request", slog.F("template_version_id", templateVersion.ID), slog.F("variable_values", request.VariableValues))
-
 		for _, templateVariable := range request.TemplateVariables {
-			server.Logger.Info(ctx, "insert template variable", slog.F("template_version_id", templateVersion.ID), slog.F("template_variable", templateVariable))
+			server.Logger.Debug(ctx, "insert template variable", slog.F("template_version_id", templateVersion.ID), slog.F("template_variable", templateVariable))
 
 			var value = templateVariable.DefaultValue
 			for _, v := range request.VariableValues {
 				if v.Name == templateVariable.Name {
 					value = v.Value
-					variableValues = append(variableValues, &sdkproto.VariableValue{
-						Name:  v.Name,
-						Value: v.Value,
-					})
 					break
 				}
 			}
 
+			if templateVariable.Required && value == "" {
+				return nil, xerrors.Errorf("template variable %q is required but it is missing", templateVariable.Name)
+			}
+
+			variableValues = append(variableValues, &sdkproto.VariableValue{
+				Name:  templateVariable.Name,
+				Value: value,
+			})
+
 			_, err = server.Database.InsertTemplateVersionVariable(ctx, database.InsertTemplateVersionVariableParams{
 				TemplateVersionID: templateVersion.ID,
 				Name:              templateVariable.Name,
diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go
@@ -416,7 +416,7 @@ func (r *Runner) do(ctx context.Context) (*proto.CompletedJob, *proto.FailedJob)
 	}
 	switch jobType := r.job.Type.(type) {
 	case *proto.AcquiredJob_TemplateImport_:
-		r.logger.Info(context.Background(), "acquired job is template import",
+		r.logger.Debug(context.Background(), "acquired job is template import",
 			slog.F("variable_values", jobType.TemplateImport.VariableValues), // FIXME to be redacted
 		)
 
@@ -1071,3 +1071,7 @@ func (r *Runner) flushQueuedLogs(ctx context.Context) {
 		r.logger.Error(ctx, "flush queued logs", slog.Error(err))
 	}
 }
+
+func redactVariableValues(variableValues []*sdkproto.VariableValue) []*sdkproto.VariableValue {
+
+}

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ func (r Runner) do(ctx context.Context) (proto.CompletedJob, *proto.FailedJob)`
`416`	`416`	`}`
`417`	`417`	`switch jobType := r.job.Type.(type) {`
`418`	`418`	`case *proto.AcquiredJob_TemplateImport_:`
`419`		`- r.logger.Info(context.Background(), "acquired job is template import",`
	`419`	`+ r.logger.Debug(context.Background(), "acquired job is template import",`
`420`	`420`	`slog.F("variable_values", jobType.TemplateImport.VariableValues), // FIXME to be redacted`
`421`	`421`	`)`
`422`	`422`
`@@ -1071,3 +1071,7 @@ func (r *Runner) flushQueuedLogs(ctx context.Context) {`
`1071`	`1071`	`r.logger.Error(ctx, "flush queued logs", slog.Error(err))`
`1072`	`1072`	`}`
`1073`	`1073`	`}`
	`1074`	`+`
	`1075`	`+func redactVariableValues(variableValues []sdkproto.VariableValue) []sdkproto.VariableValue {`
	`1076`	`+`
	`1077`	`+}`