Skip to content

Commit 9df6bc7

Browse files
AbhineetJainAbhineetJain
authored
fix: update template updated_at value (coder#2729)
* fix: update template updated_at value * use Go time for all updated_at updates
1 parent 7df5827 commit 9df6bc7

9 files changed

+51
-28
lines changed

‎coderd/database/databasefake/databasefake.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,6 +1830,7 @@ func (q *fakeQuerier) UpdateTemplateActiveVersionByID(_ context.Context, arg dat
18301830
continue
18311831
}
18321832
template.ActiveVersionID = arg.ActiveVersionID
1833+
template.UpdatedAt = arg.UpdatedAt
18331834
q.templates[index] = template
18341835
return nil
18351836
}
@@ -1845,6 +1846,7 @@ func (q *fakeQuerier) UpdateTemplateDeletedByID(_ context.Context, arg database.
18451846
continue
18461847
}
18471848
template.Deleted = arg.Deleted
1849+
template.UpdatedAt = arg.UpdatedAt
18481850
q.templates[index] = template
18491851
return nil
18501852
}
@@ -1876,7 +1878,7 @@ func (q *fakeQuerier) UpdateTemplateVersionDescriptionByJobID(_ context.Context,
18761878
continue
18771879
}
18781880
templateVersion.Readme = arg.Readme
1879-
templateVersion.UpdatedAt = database.Now()
1881+
templateVersion.UpdatedAt = arg.UpdatedAt
18801882
q.templateVersions[index] = templateVersion
18811883
return nil
18821884
}
@@ -1910,6 +1912,7 @@ func (q *fakeQuerier) UpdateWorkspaceAgentConnectionByID(_ context.Context, arg
19101912
agent.FirstConnectedAt = arg.FirstConnectedAt
19111913
agent.LastConnectedAt = arg.LastConnectedAt
19121914
agent.DisconnectedAt = arg.DisconnectedAt
1915+
agent.UpdatedAt = arg.UpdatedAt
19131916
q.provisionerJobAgents[index] = agent
19141917
return nil
19151918
}
@@ -1927,7 +1930,7 @@ func (q *fakeQuerier) UpdateWorkspaceAgentKeysByID(_ context.Context, arg databa
19271930

19281931
agent.WireguardNodePublicKey = arg.WireguardNodePublicKey
19291932
agent.WireguardDiscoPublicKey = arg.WireguardDiscoPublicKey
1930-
agent.UpdatedAt = database.Now()
1933+
agent.UpdatedAt = arg.UpdatedAt
19311934
q.provisionerJobAgents[index] = agent
19321935
return nil
19331936
}

‎coderd/database/queries.sql.go

Lines changed: 28 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/templates.sql

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,17 @@ VALUES
7373
UPDATE
7474
templates
7575
SET
76-
active_version_id = $2
76+
active_version_id = $2,
77+
updated_at = $3
7778
WHERE
7879
id = $1;
7980

8081
-- name: UpdateTemplateDeletedByID :exec
8182
UPDATE
8283
templates
8384
SET
84-
deleted = $2
85+
deleted = $2,
86+
updated_at = $3
8587
WHERE
8688
id = $1;
8789

‎coderd/database/queries/templateversions.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ UPDATE
8989
template_versions
9090
SET
9191
readme = $2,
92-
updated_at = now()
92+
updated_at = $3
9393
WHERE
9494
job_id = $1;

‎coderd/database/queries/workspaceagents.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@ VALUES
6565
UPDATE
6666
workspace_agents
6767
SET
68-
updated_at = now(),
6968
first_connected_at = $2,
7069
last_connected_at = $3,
71-
disconnected_at = $4
70+
disconnected_at = $4,
71+
updated_at = $5
7272
WHERE
7373
id = $1;
7474

7575
-- name: UpdateWorkspaceAgentKeysByID :exec
7676
UPDATE
7777
workspace_agents
7878
SET
79-
updated_at = now(),
8079
wireguard_node_public_key = $2,
81-
wireguard_disco_public_key = $3
80+
wireguard_disco_public_key = $3,
81+
updated_at = $4
8282
WHERE
8383
id = $1;

‎coderd/provisionerdaemons.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,9 @@ func (server *provisionerdServer) UpdateJob(ctx context.Context, request *proto.
385385

386386
if len(request.Readme) > 0 {
387387
err := server.Database.UpdateTemplateVersionDescriptionByJobID(ctx, database.UpdateTemplateVersionDescriptionByJobIDParams{
388-
JobID: job.ID,
389-
Readme: string(request.Readme),
388+
JobID: job.ID,
389+
Readme: string(request.Readme),
390+
UpdatedAt: database.Now(),
390391
})
391392
if err != nil {
392393
return nil, xerrors.Errorf("update template version description: %w", err)

‎coderd/templates.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ func (api *API) deleteTemplate(rw http.ResponseWriter, r *http.Request) {
9696
return
9797
}
9898
err = api.Database.UpdateTemplateDeletedByID(r.Context(), database.UpdateTemplateDeletedByIDParams{
99-
ID: template.ID,
100-
Deleted: true,
99+
ID: template.ID,
100+
Deleted: true,
101+
UpdatedAt: database.Now(),
101102
})
102103
if err != nil {
103104
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{

‎coderd/templateversions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,7 @@ func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Reque
564564
err = store.UpdateTemplateActiveVersionByID(r.Context(), database.UpdateTemplateActiveVersionByIDParams{
565565
ID: template.ID,
566566
ActiveVersionID: req.ID,
567+
UpdatedAt: database.Now(),
567568
})
568569
if err != nil {
569570
return xerrors.Errorf("update active version: %w", err)

‎coderd/workspaceagents.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ func (api *API) workspaceAgentListen(rw http.ResponseWriter, r *http.Request) {
282282
FirstConnectedAt: firstConnectedAt,
283283
LastConnectedAt: lastConnectedAt,
284284
DisconnectedAt: disconnectedAt,
285+
UpdatedAt: database.Now(),
285286
})
286287
if err != nil {
287288
return err
@@ -491,6 +492,7 @@ func (api *API) postWorkspaceAgentKeys(rw http.ResponseWriter, r *http.Request)
491492
ID: workspaceAgent.ID,
492493
WireguardNodePublicKey: dbtypes.NodePublic(keys.Public),
493494
WireguardDiscoPublicKey: dbtypes.DiscoPublic(keys.Disco),
495+
UpdatedAt: database.Now(),
494496
})
495497
if err != nil {
496498
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{

0 commit comments

Comments
 (0)