From 9155ab90b51ea9674558e6c76ffa71f57fc19cdc Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 15 Sep 2023 15:25:37 +0100 Subject: [PATCH 1/2] fix(coderd): emit zero time as utc in convertWorkspaceAgentMetadata --- coderd/workspaceagents.go | 3 +++ coderd/workspaceagents_test.go | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go index 789ce0a74244d..6729ab5d32cc5 100644 --- a/coderd/workspaceagents.go +++ b/coderd/workspaceagents.go @@ -1804,6 +1804,9 @@ func convertWorkspaceAgentMetadata(db []database.WorkspaceAgentMetadatum) []code // An empty array is easier for clients to handle than a null. result := []codersdk.WorkspaceAgentMetadata{} for _, datum := range db { + if datum.CollectedAt.UTC().IsZero() { + datum.CollectedAt = datum.CollectedAt.UTC() + } result = append(result, codersdk.WorkspaceAgentMetadata{ Result: codersdk.WorkspaceAgentMetadataResult{ Value: datum.Value, diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index 6dfddfd1cb952..d900ead4175cf 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -23,7 +23,6 @@ import ( "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" - "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" @@ -1185,12 +1184,8 @@ func TestWorkspaceAgent_LifecycleState(t *testing.T) { func TestWorkspaceAgent_Metadata(t *testing.T) { t.Parallel() - // nolint:gocritic // https://github.com/coder/coder/issues/9682 - db, ps := dbtestutil.NewDB(t, dbtestutil.WithTimezone("UTC")) client := coderdtest.New(t, &coderdtest.Options{ IncludeProvisionerDaemon: true, - Database: db, - Pubsub: ps, }) user := coderdtest.CreateFirstUser(t, client) authToken := uuid.NewString() From f2d7881175855382b42ef3b9a9f20b94fee040b7 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 15 Sep 2023 19:37:41 +0100 Subject: [PATCH 2/2] always emit UTC --- coderd/workspaceagents.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go index 6729ab5d32cc5..d92f614766c4b 100644 --- a/coderd/workspaceagents.go +++ b/coderd/workspaceagents.go @@ -1804,14 +1804,11 @@ func convertWorkspaceAgentMetadata(db []database.WorkspaceAgentMetadatum) []code // An empty array is easier for clients to handle than a null. result := []codersdk.WorkspaceAgentMetadata{} for _, datum := range db { - if datum.CollectedAt.UTC().IsZero() { - datum.CollectedAt = datum.CollectedAt.UTC() - } result = append(result, codersdk.WorkspaceAgentMetadata{ Result: codersdk.WorkspaceAgentMetadataResult{ Value: datum.Value, Error: datum.Error, - CollectedAt: datum.CollectedAt, + CollectedAt: datum.CollectedAt.UTC(), Age: int64(time.Since(datum.CollectedAt).Seconds()), }, Description: codersdk.WorkspaceAgentMetadataDescription{