Skip to content

Commit 8810326

Browse files
kylecarbskylecarbs
committed
Uncomment test
1 parent 75388f7 commit 8810326

File tree

7 files changed

+61
-52
lines changed

7 files changed

+61
-52
lines changed

‎agent/agentscripts/agentscripts.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ func (r *Runner) Init(scripts []codersdk.WorkspaceAgentScript) error {
6565
r.scripts = scripts
6666

6767
for _, script := range scripts {
68-
if script.CRON == "" {
68+
if script.Cron == "" {
6969
continue
7070
}
7171
script := script
72-
_, err := r.cron.AddFunc(script.CRON, func() {
72+
_, err := r.cron.AddFunc(script.Cron, func() {
7373
err := r.run(script)
7474
if err != nil {
7575
r.Logger.Warn(r.ctx, "run agent script on schedule", slog.Error(err))

‎coderd/database/querier_test.go

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -92,50 +92,50 @@ func TestGetDeploymentWorkspaceAgentStats(t *testing.T) {
9292
})
9393
}
9494

95-
// func TestInsertWorkspaceAgentLogs(t *testing.T) {
96-
// t.Parallel()
97-
// if testing.Short() {
98-
// t.SkipNow()
99-
// }
100-
// sqlDB := testSQLDB(t)
101-
// ctx := context.Background()
102-
// err := migrations.Up(sqlDB)
103-
// require.NoError(t, err)
104-
// db := database.New(sqlDB)
105-
// org := dbgen.Organization(t, db, database.Organization{})
106-
// job := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{
107-
// OrganizationID: org.ID,
108-
// })
109-
// resource := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
110-
// JobID: job.ID,
111-
// })
112-
// agent := dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{
113-
// ResourceID: resource.ID,
114-
// })
115-
// source := dbgen.WorkspaceAgentLogSource(t, db, database.WorkspaceAgentLogSource{})
116-
// logs, err := db.InsertWorkspaceAgentLogs(ctx, database.InsertWorkspaceAgentLogsParams{
117-
// AgentID: agent.ID,
118-
// CreatedAt: []time.Time{dbtime.Now()},
119-
// Output: []string{"first"},
120-
// Level: []database.LogLevel{database.LogLevelInfo},
121-
// LogSourceID: uuid.New(),
122-
// Source: []database.WorkspaceAgentLogSource{database.WorkspaceAgentLogSourceExternal},
123-
// // 1 MB is the max
124-
// OutputLength: 1 << 20,
125-
// })
126-
// require.NoError(t, err)
127-
// require.Equal(t, int64(1), logs[0].ID)
128-
129-
// _, err = db.InsertWorkspaceAgentLogs(ctx, database.InsertWorkspaceAgentLogsParams{
130-
// AgentID: agent.ID,
131-
// CreatedAt: []time.Time{dbtime.Now()},
132-
// Output: []string{"second"},
133-
// Level: []database.LogLevel{database.LogLevelInfo},
134-
// Source: []database.WorkspaceAgentLogSource{database.WorkspaceAgentLogSourceExternal},
135-
// OutputLength: 1,
136-
// })
137-
// require.True(t, database.IsWorkspaceAgentLogsLimitError(err))
138-
// }
95+
func TestInsertWorkspaceAgentLogs(t *testing.T) {
96+
t.Parallel()
97+
if testing.Short() {
98+
t.SkipNow()
99+
}
100+
sqlDB := testSQLDB(t)
101+
ctx := context.Background()
102+
err := migrations.Up(sqlDB)
103+
require.NoError(t, err)
104+
db := database.New(sqlDB)
105+
org := dbgen.Organization(t, db, database.Organization{})
106+
job := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{
107+
OrganizationID: org.ID,
108+
})
109+
resource := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
110+
JobID: job.ID,
111+
})
112+
agent := dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{
113+
ResourceID: resource.ID,
114+
})
115+
source := dbgen.WorkspaceAgentLogSource(t, db, database.WorkspaceAgentLogSource{})
116+
117+
logs, err := db.InsertWorkspaceAgentLogs(ctx, database.InsertWorkspaceAgentLogsParams{
118+
AgentID: agent.ID,
119+
CreatedAt: dbtime.Now(),
120+
Output: []string{"first"},
121+
Level: []database.LogLevel{database.LogLevelInfo},
122+
LogSourceID: source.ID,
123+
// 1 MB is the max
124+
OutputLength: 1 << 20,
125+
})
126+
require.NoError(t, err)
127+
require.Equal(t, int64(1), logs[0].ID)
128+
129+
_, err = db.InsertWorkspaceAgentLogs(ctx, database.InsertWorkspaceAgentLogsParams{
130+
AgentID: agent.ID,
131+
CreatedAt: dbtime.Now(),
132+
Output: []string{"second"},
133+
Level: []database.LogLevel{database.LogLevelInfo},
134+
LogSourceID: source.ID,
135+
OutputLength: 1,
136+
})
137+
require.True(t, database.IsWorkspaceAgentLogsLimitError(err))
138+
}
139139

140140
func TestProxyByHostname(t *testing.T) {
141141
t.Parallel()

‎coderd/database/queries.sql.go

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

‎coderd/database/queries/workspaceagents.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ INSERT INTO
162162

163163
-- name: InsertWorkspaceAgentLogSources :many
164164
INSERT INTO
165-
workspace_agent_log_sources (workspace_agent_id, id, created_at, display_name, icon)
165+
workspace_agent_log_sources (workspace_agent_id, created_at, id, display_name, icon)
166166
SELECT
167167
@workspace_agent_id :: uuid AS workspace_agent_id,
168168
@created_at :: timestamptz AS created_at,

‎coderd/database/queries/workspacescripts.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-- name: InsertWorkspaceAgentScripts :many
22
INSERT INTO
3-
workspace_agent_scripts (workspace_agent_id, log_source_id, log_path, created_at, script, cron, start_blocks_login, run_on_start, run_on_stop, timeout_seconds)
3+
workspace_agent_scripts (workspace_agent_id, created_at, log_source_id, log_path, script, cron, start_blocks_login, run_on_start, run_on_stop, timeout_seconds)
44
SELECT
55
@workspace_agent_id :: uuid AS workspace_agent_id,
66
@created_at :: timestamptz AS created_at,

‎coderd/workspaceagents.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,15 @@ func (api *API) workspaceAgent(rw http.ResponseWriter, r *http.Request) {
7575
logSources, err = api.Database.GetWorkspaceAgentLogSourcesByAgentIDs(ctx, []uuid.UUID{workspaceAgent.ID})
7676
return err
7777
})
78+
err := eg.Wait()
79+
if err != nil {
80+
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
81+
Message: "Internal error fetching workspace agent.",
82+
Detail: err.Error(),
83+
})
84+
return
85+
}
86+
7887
apiAgent, err := convertWorkspaceAgent(
7988
api.DERPMap(), *api.TailnetCoordinator.Load(), workspaceAgent, convertApps(dbApps), convertScripts(scripts), convertLogSources(logSources), api.AgentInactiveDisconnectTimeout,
8089
api.DeploymentValues.AgentFallbackTroubleshootingURL.String(),
@@ -1321,7 +1330,7 @@ func convertScripts(dbScripts []database.WorkspaceAgentScript) []codersdk.Worksp
13211330
LogPath: dbScript.LogPath,
13221331
LogSourceID: dbScript.LogSourceID,
13231332
Script: dbScript.Script,
1324-
CRON: dbScript.Cron,
1333+
Cron: dbScript.Cron,
13251334
RunOnStart: dbScript.RunOnStart,
13261335
RunOnStop: dbScript.RunOnStop,
13271336
StartBlocksLogin: dbScript.StartBlocksLogin,

‎codersdk/workspaceagents.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ type WorkspaceAgentScript struct {
189189
LogSourceID uuid.UUID `json:"log_source_id" format:"uuid"`
190190
LogPath string `json:"log_path"`
191191
Script string `json:"script"`
192-
CRON string `json:"cron"`
192+
Cron string `json:"cron"`
193193
RunOnStart bool `json:"run_on_start"`
194194
RunOnStop bool `json:"run_on_stop"`
195195
StartBlocksLogin bool `json:"start_blocks_login"`

0 commit comments

Comments
 (0)