fix up inserts a little

aslilac · aslilac · commit 5fa92163092d · 2025-05-05T22:21:14.000Z
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1432,28 +1432,45 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 			return nil, xerrors.Errorf("update template version external auth providers: %w", err)
 		}
 
-		if len(jobType.TemplateImport.Plan) > 0 {
-			moduleFilesTar := jobType.TemplateImport.ModuleFiles
-			hashBytes := sha256.Sum256(moduleFilesTar)
-			hash := hex.EncodeToString(hashBytes[:])
-			// nolint:gocritic // Requires system privileges
-			file, err := s.Database.InsertFile(dbauthz.AsSystemRestricted(ctx), database.InsertFileParams{
-				ID:        uuid.New(),
-				Hash:      hash,
-				CreatedBy: uuid.Nil, // TODO
-				CreatedAt: dbtime.Now(),
-				Mimetype:  tarMimeType,
-				Data:      moduleFilesTar,
-			})
-			if err != nil {
-				return nil, xerrors.Errorf("insert template version terraform modules: %w", err)
+		plan := jobType.TemplateImport.Plan
+		moduleFiles := jobType.TemplateImport.ModuleFiles
+		// If there is a plan, or a module files archive we need to insert a
+		// template_version_terraform_values row.
+		if len(plan) > 0 || len(moduleFiles) > 0 {
+			// ...but the plan and the module files archive are both optional! So
+			// we need to fallback to a valid JSON object if the plan was omitted.
+			if len(plan) == 0 {
+				plan = []byte("{}")
+			}
+
+			// ...and we only want to insert a files row if an archive was provided.
+			var fileID uuid.NullUUID
+			if len(moduleFiles) > 0 {
+				hashBytes := sha256.Sum256(moduleFiles)
+				hash := hex.EncodeToString(hashBytes[:])
+				// nolint:gocritic // Requires system privileges
+				file, err := s.Database.InsertFile(dbauthz.AsSystemRestricted(ctx), database.InsertFileParams{
+					ID:        uuid.New(),
+					Hash:      hash,
+					CreatedBy: uuid.Nil, // TODO
+					CreatedAt: dbtime.Now(),
+					Mimetype:  tarMimeType,
+					Data:      moduleFiles,
+				})
+				if err != nil {
+					return nil, xerrors.Errorf("insert template version terraform modules: %w", err)
+				}
+				fileID = uuid.NullUUID{
+					Valid: true,
+					UUID:  file.ID,
+				}
 			}
 
 			err = s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
 				JobID:             jobID,
 				UpdatedAt:         now,
-				CachedPlan:        jobType.TemplateImport.Plan,
-				CachedModuleFiles: uuid.NullUUID{Valid: true, UUID: file.ID},
+				CachedPlan:        plan,
+				CachedModuleFiles: fileID,
 			})
 			if err != nil {
 				return nil, xerrors.Errorf("insert template version terraform data: %w", err)
