synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(coderd): emit CollectedAt as UTC in convertWorkspaceAgentMetadata (#9700)

Browse Source
This commit is contained in:
Cian Johnston
2023-09-18 09:17:18 +01:00
committed by GitHub
parent 5de5d20808
commit 653488e8ee
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coderd/workspaceagents.go
View File

@ -1808,7 +1808,7 @@ func convertWorkspaceAgentMetadata(db []database.WorkspaceAgentMetadatum) []code
Result: codersdk.WorkspaceAgentMetadataResult{ Result: codersdk.WorkspaceAgentMetadataResult{
Value: datum.Value, Value: datum.Value,
Error: datum.Error, Error: datum.Error,
CollectedAt: datum.CollectedAt, CollectedAt: datum.CollectedAt.UTC(),
Age: int64(time.Since(datum.CollectedAt).Seconds()), Age: int64(time.Since(datum.CollectedAt).Seconds()),
}, },
Description: codersdk.WorkspaceAgentMetadataDescription{ Description: codersdk.WorkspaceAgentMetadataDescription{

5
coderd/workspaceagents_test.go
View File

@ -23,7 +23,6 @@ import (
"github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/coderd/database" "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/coderd/database/dbtime"
"github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/coder/v2/codersdk/agentsdk"
@ -1185,12 +1184,8 @@ func TestWorkspaceAgent_LifecycleState(t *testing.T) {
func TestWorkspaceAgent_Metadata(t *testing.T) { func TestWorkspaceAgent_Metadata(t *testing.T) {
t.Parallel() 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{ client := coderdtest.New(t, &coderdtest.Options{
IncludeProvisionerDaemon: true, IncludeProvisionerDaemon: true,
Database: db,
Pubsub: ps,
}) })
user := coderdtest.CreateFirstUser(t, client) user := coderdtest.CreateFirstUser(t, client)
authToken := uuid.NewString() authToken := uuid.NewString()