Skip to content

Commit 6d46c7e

Browse files
aslilacaslilac
committed
🧹
1 parent 6a92c6e commit 6d46c7e

File tree

7 files changed

+13
-11
lines changed

7 files changed

+13
-11
lines changed

‎coderd/database/dump.sql

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/foreign_key_constraint.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000304_template_version_terraform_values.up.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
create table template_version_terraform_values (
2-
template_version_id uuid not null unique references template_versions(id),
2+
template_version_id uuid not null unique references template_versions(id) on delete cascade,
33
updated_at timestamptz not null default now(),
44
cached_plan jsonb not null
55
);

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,6 +1270,8 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
12701270
return nil, xerrors.Errorf("template version ID is expected: %w", err)
12711271
}
12721272

1273+
now := s.timeNow()
1274+
12731275
for transition, resources := range map[database.WorkspaceTransition][]*sdkproto.Resource{
12741276
database.WorkspaceTransitionStart: jobType.TemplateImport.StartResources,
12751277
database.WorkspaceTransitionStop: jobType.TemplateImport.StopResources,
@@ -1354,7 +1356,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
13541356
}
13551357
}
13561358

1357-
err = InsertWorkspacePresetsAndParameters(ctx, s.Logger, s.Database, jobID, input.TemplateVersionID, jobType.TemplateImport.Presets, s.timeNow())
1359+
err = InsertWorkspacePresetsAndParameters(ctx, s.Logger, s.Database, jobID, input.TemplateVersionID, jobType.TemplateImport.Presets, now)
13581360
if err != nil {
13591361
return nil, xerrors.Errorf("insert workspace presets and parameters: %w", err)
13601362
}
@@ -1407,7 +1409,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
14071409
err = s.Database.UpdateTemplateVersionExternalAuthProvidersByJobID(ctx, database.UpdateTemplateVersionExternalAuthProvidersByJobIDParams{
14081410
JobID: jobID,
14091411
ExternalAuthProviders: externalAuthProvidersMessage,
1410-
UpdatedAt: s.timeNow(),
1412+
UpdatedAt: now,
14111413
})
14121414
if err != nil {
14131415
return nil, xerrors.Errorf("update template version external auth providers: %w", err)
@@ -1416,17 +1418,17 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
14161418
err = s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
14171419
JobID: jobID,
14181420
CachedPlan: jobType.TemplateImport.Plan,
1419-
UpdatedAt: s.timeNow(),
1421+
UpdatedAt: now,
14201422
})
14211423
if err != nil {
14221424
return nil, xerrors.Errorf("insert template version terraform data: %w", err)
14231425
}
14241426

14251427
err = s.Database.UpdateProvisionerJobWithCompleteByID(ctx, database.UpdateProvisionerJobWithCompleteByIDParams{
14261428
ID: jobID,
1427-
UpdatedAt: s.timeNow(),
1429+
UpdatedAt: now,
14281430
CompletedAt: sql.NullTime{
1429-
Time: s.timeNow(),
1431+
Time: now,
14301432
Valid: true,
14311433
},
14321434
Error: completedError,

‎provisioner/terraform/executor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func onlyDataResources(sm tfjson.StateModule) tfjson.StateModule {
331331
}
332332

333333
// planResources must only be called while the lock is held.
334-
func (e *executor) planResources(ctx, killCtx context.Context, planfilePath string) (*State, []byte, error) {
334+
func (e *executor) planResources(ctx, killCtx context.Context, planfilePath string) (*State, json.RawMessage, error) {
335335
ctx, span := e.server.startTrace(ctx, tracing.FuncName())
336336
defer span.End()
337337

‎provisioner/terraform/resources.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ type State struct {
157157
Parameters []*proto.RichParameter
158158
Presets []*proto.Preset
159159
ExternalAuthProviders []*proto.ExternalAuthProviderResource
160-
Plan []byte
161160
}
162161

163162
var ErrInvalidTerraformAddr = xerrors.New("invalid terraform address")

‎provisionerd/runner/runner.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package runner
22

33
import (
44
"context"
5+
"encoding/json"
56
"errors"
67
"fmt"
78
"reflect"
@@ -655,7 +656,7 @@ type templateImportProvision struct {
655656
ExternalAuthProviders []*sdkproto.ExternalAuthProviderResource
656657
Modules []*sdkproto.Module
657658
Presets []*sdkproto.Preset
658-
Plan []byte
659+
Plan json.RawMessage
659660
}
660661

661662
// Performs a dry-run provision when importing a template.

0 commit comments

Comments
 (0)