fix

aslilac · aslilac · commit 2b5800eca97c · 2025-05-05T22:04:36.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -9315,6 +9315,7 @@ func (q *FakeQuerier) InsertTemplateVersionTerraformValuesByJobID(_ context.Cont
 	row := database.TemplateVersionTerraformValue{
 		TemplateVersionID: templateVersion.ID,
 		CachedPlan:        arg.CachedPlan,
+		CachedModuleFiles: arg.CachedModuleFiles,
 		UpdatedAt:         arg.UpdatedAt,
 	}
 	q.templateVersionTerraformValues = append(q.templateVersionTerraformValues, row)
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templateversionterraformvalues.sql b/coderd/database/queries/templateversionterraformvalues.sql
@@ -11,11 +11,13 @@ INSERT INTO
 	template_version_terraform_values (
 		template_version_id,
 		cached_plan,
+		cached_module_files,
 		updated_at
 	)
 VALUES
 	(
 		(select id from template_versions where job_id = @job_id),
 		@cached_plan,
+		@cached_module_files,
 		@updated_at
 	);
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1437,7 +1437,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 			hashBytes := sha256.Sum256(moduleFilesTar)
 			hash := hex.EncodeToString(hashBytes[:])
 			// nolint:gocritic // Requires system privileges
-			_, err := s.Database.InsertFile(dbauthz.AsSystemRestricted(ctx), database.InsertFileParams{
+			file, err := s.Database.InsertFile(dbauthz.AsSystemRestricted(ctx), database.InsertFileParams{
 				ID:        uuid.New(),
 				Hash:      hash,
 				CreatedBy: uuid.Nil, // TODO
@@ -1450,10 +1450,10 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 			}
 
 			err = s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
-				JobID:      jobID,
-				UpdatedAt:  now,
-				CachedPlan: jobType.TemplateImport.Plan,
-				// CachedModules: jobType.TemplateImport.ModuleFiles,
+				JobID:             jobID,
+				UpdatedAt:         now,
+				CachedPlan:        jobType.TemplateImport.Plan,
+				CachedModuleFiles: uuid.NullUUID{Valid: true, UUID: file.ID},
 			})
 			if err != nil {
 				return nil, xerrors.Errorf("insert template version terraform data: %w", err)
diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go
@@ -307,13 +307,19 @@ func (e *executor) plan(ctx, killCtx context.Context, env, vars []string, logr l
 
 	graphTimings.ingest(createGraphTimingsEvent(timingGraphComplete))
 
+	moduleFiles, err := getModulesArchive(e.workdir)
+	if err != nil {
+		return nil, err
+	}
+
 	return &proto.PlanComplete{
 		Parameters:            state.Parameters,
 		Resources:             state.Resources,
 		ExternalAuthProviders: state.ExternalAuthProviders,
 		Timings:               append(e.timings.aggregate(), graphTimings.aggregate()...),
 		Presets:               state.Presets,
 		Plan:                  plan,
+		ModuleFiles:           moduleFiles,
 	}, nil
 }
 
diff --git a/provisioner/terraform/modules.go b/provisioner/terraform/modules.go
@@ -84,7 +84,7 @@ func getModulesArchive(workdir string) ([]byte, error) {
 			return nil
 		}
 		empty = false
-		archivePath, found := strings.CutPrefix(filePath, modulesDir+"/")
+		archivePath, found := strings.CutPrefix(filePath, workdir+"/")
 		if !found {
 			return xerrors.Errorf("walked invalid file path: %q", filePath)
 		}
diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go
@@ -595,6 +595,7 @@ func (r *Runner) runTemplateImport(ctx context.Context) (*proto.CompletedJob, *p
 				StopModules:                stopProvision.Modules,
 				Presets:                    startProvision.Presets,
 				Plan:                       startProvision.Plan,
+				ModuleFiles:                startProvision.ModuleFiles,
 			},
 		},
 	}, nil
@@ -657,6 +658,7 @@ type templateImportProvision struct {
 	Modules               []*sdkproto.Module
 	Presets               []*sdkproto.Preset
 	Plan                  json.RawMessage
+	ModuleFiles           []byte
 }
 
 // Performs a dry-run provision when importing a template.
@@ -751,6 +753,7 @@ func (r *Runner) runTemplateImportProvisionWithRichParameters(
 				Modules:               c.Modules,
 				Presets:               c.Presets,
 				Plan:                  c.Plan,
+				ModuleFiles:           c.ModuleFiles,
 			}, nil
 		default:
 			return nil, xerrors.Errorf("invalid message type %q received from provisioner",

Original file line number	Diff line number	Diff line change
`@@ -9315,6 +9315,7 @@ func (q *FakeQuerier) InsertTemplateVersionTerraformValuesByJobID(_ context.Cont`
`9315`	`9315`	`row := database.TemplateVersionTerraformValue{`
`9316`	`9316`	`TemplateVersionID: templateVersion.ID,`
`9317`	`9317`	`CachedPlan: arg.CachedPlan,`
	`9318`	`+ CachedModuleFiles: arg.CachedModuleFiles,`
`9318`	`9319`	`UpdatedAt: arg.UpdatedAt,`
`9319`	`9320`	`}`
`9320`	`9321`	`q.templateVersionTerraformValues = append(q.templateVersionTerraformValues, row)`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,13 @@ INSERT INTO`
`11`	`11`	`template_version_terraform_values (`
`12`	`12`	`template_version_id,`
`13`	`13`	`cached_plan,`
	`14`	`+ cached_module_files,`
`14`	`15`	`updated_at`
`15`	`16`	`)`
`16`	`17`	`VALUES`
`17`	`18`	`(`
`18`	`19`	`(select id from template_versions where job_id = @job_id),`
`19`	`20`	`@cached_plan,`
	`21`	`+ @cached_module_files,`
`20`	`22`	`@updated_at`
`21`	`23`	`);`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func getModulesArchive(workdir string) ([]byte, error) {`
`84`	`84`	`return nil`
`85`	`85`	`}`
`86`	`86`	`empty = false`
`87`		`- archivePath, found := strings.CutPrefix(filePath, modulesDir+"/")`
	`87`	`+ archivePath, found := strings.CutPrefix(filePath, workdir+"/")`
`88`	`88`	`if !found {`
`89`	`89`	`return xerrors.Errorf("walked invalid file path: %q", filePath)`
`90`	`90`	`}`