Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 738a38d

Browse files
f0sself0ssel
authored
chore: remove resources calls (#4344)
1 parent 9bc0d06 commit 738a38d

28 files changed

+447
-648
lines changed

‎cli/agent_test.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,11 @@ func TestWorkspaceAgent(t *testing.T) {
6060
ctx := context.WithValue(ctx, "azure-client", metadataClient)
6161
errC <- cmd.ExecuteContext(ctx)
6262
}()
63-
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
64-
resources, err := client.WorkspaceResourcesByBuild(ctx, workspace.LatestBuild.ID)
63+
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
64+
workspace, err := client.Workspace(ctx, workspace.ID)
6565
require.NoError(t, err)
66-
if assert.NotEmpty(t, resources) && assert.NotEmpty(t, resources[0].Agents) {
66+
resources := workspace.LatestBuild.Resources
67+
if assert.NotEmpty(t, workspace.LatestBuild.Resources) && assert.NotEmpty(t, resources[0].Agents) {
6768
assert.NotEmpty(t, resources[0].Agents[0].Version)
6869
}
6970
dialer, err := client.DialWorkspaceAgentTailnet(ctx, slog.Logger{}, resources[0].Agents[0].ID)
@@ -120,9 +121,10 @@ func TestWorkspaceAgent(t *testing.T) {
120121
ctx := context.WithValue(ctx, "aws-client", metadataClient)
121122
errC <- cmd.ExecuteContext(ctx)
122123
}()
123-
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
124-
resources, err := client.WorkspaceResourcesByBuild(ctx, workspace.LatestBuild.ID)
124+
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
125+
workspace, err := client.Workspace(ctx, workspace.ID)
125126
require.NoError(t, err)
127+
resources := workspace.LatestBuild.Resources
126128
if assert.NotEmpty(t, resources) && assert.NotEmpty(t, resources[0].Agents) {
127129
assert.NotEmpty(t, resources[0].Agents[0].Version)
128130
}
@@ -180,9 +182,10 @@ func TestWorkspaceAgent(t *testing.T) {
180182
ctx := context.WithValue(ctx, "gcp-client", metadata)
181183
errC <- cmd.ExecuteContext(ctx)
182184
}()
183-
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
184-
resources, err := client.WorkspaceResourcesByBuild(ctx, workspace.LatestBuild.ID)
185+
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
186+
workspace, err := client.Workspace(ctx, workspace.ID)
185187
require.NoError(t, err)
188+
resources := workspace.LatestBuild.Resources
186189
if assert.NotEmpty(t, resources) && assert.NotEmpty(t, resources[0].Agents) {
187190
assert.NotEmpty(t, resources[0].Agents[0].Version)
188191
}

‎cli/configssh_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func TestConfigSSH(t *testing.T) {
114114
defer func() {
115115
_ = agentCloser.Close()
116116
}()
117-
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
117+
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
118118
agentConn, err := client.DialWorkspaceAgentTailnet(context.Background(), slog.Logger{}, resources[0].Agents[0].ID)
119119
require.NoError(t, err)
120120
defer agentConn.Close()

‎cli/gitssh_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func prepareTestGitSSH(ctx context.Context, t *testing.T) (*codersdk.Client, str
8181
errC <- cmd.ExecuteContext(ctx)
8282
}()
8383
t.Cleanup(func() { require.NoError(t, <-errC) })
84-
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
84+
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
8585
return agentClient, agentToken, pubkey
8686
}
8787

‎cli/portforward_test.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ func TestPortForward(t *testing.T) {
114114
// Setup agent once to be shared between test-cases (avoid expensive
115115
// non-parallel setup).
116116
var (
117-
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
118-
user = coderdtest.CreateFirstUser(t, client)
119-
_, workspace = runAgent(t, client, user.UserID)
117+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
118+
user = coderdtest.CreateFirstUser(t, client)
119+
workspace = runAgent(t, client, user.UserID)
120120
)
121121

122122
for _, c := range cases { //nolint:paralleltest // the `c := c` confuses the linter
@@ -283,7 +283,7 @@ func TestPortForward(t *testing.T) {
283283
// runAgent creates a fake workspace and starts an agent locally for that
284284
// workspace. The agent will be cleaned up on test completion.
285285
// nolint:unused
286-
func runAgent(t *testing.T, client *codersdk.Client, userID uuid.UUID) ([]codersdk.WorkspaceResource, codersdk.Workspace) {
286+
func runAgent(t *testing.T, client *codersdk.Client, userID uuid.UUID) codersdk.Workspace {
287287
ctx := context.Background()
288288
user, err := client.User(ctx, userID.String())
289289
require.NoError(t, err, "specified user does not exist")
@@ -336,11 +336,9 @@ func runAgent(t *testing.T, client *codersdk.Client, userID uuid.UUID) ([]coders
336336
errC <- cmd.ExecuteContext(agentCtx)
337337
}()
338338

339-
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
340-
resources, err := client.WorkspaceResourcesByBuild(context.Background(), workspace.LatestBuild.ID)
341-
require.NoError(t, err)
339+
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
342340

343-
return resources, workspace
341+
return workspace
344342
}
345343

346344
// setupTestListener starts accepting connections and echoing a single packet.

‎cli/show.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@ func show() *cobra.Command {
2626
if err != nil {
2727
return xerrors.Errorf("get workspace: %w", err)
2828
}
29-
resources, err := client.WorkspaceResourcesByBuild(cmd.Context(), workspace.LatestBuild.ID)
30-
if err != nil {
31-
return xerrors.Errorf("get workspace resources: %w", err)
32-
}
33-
return cliui.WorkspaceResources(cmd.OutOrStdout(), resources, cliui.WorkspaceResourcesOptions{
29+
return cliui.WorkspaceResources(cmd.OutOrStdout(), workspace.LatestBuild.Resources, cliui.WorkspaceResourcesOptions{
3430
WorkspaceName: workspace.Name,
3531
ServerVersion: buildInfo.Version,
3632
})

‎cli/speedtest_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestSpeedtest(t *testing.T) {
2929
Logger: slogtest.Make(t, nil).Named("agent"),
3030
})
3131
defer agentCloser.Close()
32-
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
32+
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
3333

3434
cmd, root := clitest.New(t, "speedtest", workspace.Name)
3535
clitest.SetupConfig(t, client, root)

‎cli/ssh.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,7 @@ func getWorkspaceAndAgent(ctx context.Context, cmd *cobra.Command, client *coder
261261
return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, xerrors.Errorf("workspace %q is being deleted", workspace.Name)
262262
}
263263

264-
resources, err := client.WorkspaceResourcesByBuild(ctx, workspace.LatestBuild.ID)
265-
if err != nil {
266-
return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, xerrors.Errorf("fetch workspace resources: %w", err)
267-
}
264+
resources := workspace.LatestBuild.Resources
268265

269266
agents := make([]codersdk.WorkspaceAgent, 0)
270267
for _, resource := range resources {

‎coderd/activitybump_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestWorkspaceActivityBump(t *testing.T) {
3636
)
3737
firstDeadline := workspace.LatestBuild.Deadline.Time
3838

39-
_ = coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
39+
_ = coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
4040

4141
return client, workspace, func(want bool) {
4242
if !want {
@@ -73,7 +73,7 @@ func TestWorkspaceActivityBump(t *testing.T) {
7373

7474
client, workspace, assertBumped := setupActivityTest(t)
7575

76-
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
76+
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
7777
conn, err := client.DialWorkspaceAgentTailnet(ctx, slogtest.Make(t, nil), resources[0].Agents[0].ID)
7878
require.NoError(t, err)
7979
defer conn.Close()
@@ -90,9 +90,9 @@ func TestWorkspaceActivityBump(t *testing.T) {
9090

9191
client, workspace, assertBumped := setupActivityTest(t)
9292

93-
// Benign operations like retrieving resources must not
93+
// Benign operations like retrieving workspace must not
9494
// bump the deadline.
95-
_, err := client.WorkspaceResourcesByBuild(ctx, workspace.LatestBuild.ID)
95+
_, err := client.Workspace(ctx, workspace.ID)
9696
require.NoError(t, err)
9797

9898
assertBumped(false)

‎coderd/coderd.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -449,14 +449,6 @@ func New(options *Options) *API {
449449
})
450450
})
451451
})
452-
r.Route("/workspaceresources/{workspaceresource}", func(r chi.Router) {
453-
r.Use(
454-
apiKeyMiddleware,
455-
httpmw.ExtractWorkspaceResourceParam(options.Database),
456-
httpmw.ExtractWorkspaceParam(options.Database),
457-
)
458-
r.Get("/", api.workspaceResource)
459-
})
460452
r.Route("/workspaces", func(r chi.Router) {
461453
r.Use(
462454
apiKeyMiddleware,

‎coderd/coderdtest/authorize.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ func AGPLRoutes(a *AuthTester) (map[string]string, map[string]RouteCheck) {
100100
AssertAction: rbac.ActionUpdate,
101101
AssertObject: workspaceRBACObj,
102102
},
103-
"GET:/api/v2/workspaceresources/{workspaceresource}": {
104-
AssertAction: rbac.ActionRead,
105-
AssertObject: workspaceRBACObj,
106-
},
107103
"PATCH:/api/v2/workspacebuilds/{workspacebuild}/cancel": {
108104
AssertAction: rbac.ActionUpdate,
109105
AssertObject: workspaceRBACObj,
@@ -351,7 +347,7 @@ func NewAuthTester(ctx context.Context, t *testing.T, client *codersdk.Client, a
351347
AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
352348
file, err := client.Upload(ctx, codersdk.ContentTypeTar, make([]byte, 1024))
353349
require.NoError(t, err, "upload file")
354-
workspaceResources, err := client.WorkspaceResourcesByBuild(ctx, workspace.LatestBuild.ID)
350+
workspace, err = client.Workspace(ctx, workspace.ID)
355351
require.NoError(t, err, "workspace resources")
356352
templateVersionDryRun, err := client.CreateTemplateVersionDryRun(ctx, version.ID, codersdk.CreateTemplateVersionDryRunRequest{
357353
ParameterValues: []codersdk.CreateParameterRequest{},
@@ -372,16 +368,16 @@ func NewAuthTester(ctx context.Context, t *testing.T, client *codersdk.Client, a
372368
"{workspace}": workspace.ID.String(),
373369
"{workspacebuild}": workspace.LatestBuild.ID.String(),
374370
"{workspacename}": workspace.Name,
375-
"{workspaceagent}": workspaceResources[0].Agents[0].ID.String(),
371+
"{workspaceagent}": workspace.LatestBuild.Resources[0].Agents[0].ID.String(),
376372
"{buildnumber}": strconv.FormatInt(int64(workspace.LatestBuild.BuildNumber), 10),
377373
"{template}": template.ID.String(),
378374
"{hash}": file.Hash,
379-
"{workspaceresource}": workspaceResources[0].ID.String(),
380-
"{workspaceapp}": workspaceResources[0].Agents[0].Apps[0].Name,
375+
"{workspaceresource}": workspace.LatestBuild.Resources[0].ID.String(),
376+
"{workspaceapp}": workspace.LatestBuild.Resources[0].Agents[0].Apps[0].Name,
381377
"{templateversion}": version.ID.String(),
382378
"{jobID}": templateVersionDryRun.ID.String(),
383379
"{templatename}": template.Name,
384-
"{workspace_and_agent}": workspace.Name + "." + workspaceResources[0].Agents[0].Name,
380+
"{workspace_and_agent}": workspace.Name + "." + workspace.LatestBuild.Resources[0].Agents[0].Name,
385381
// Only checking template scoped params here
386382
"parameters/{scope}/{id}": fmt.Sprintf("parameters/%s/%s",
387383
string(templateParam.Scope), templateParam.ScopeID.String()),
@@ -397,7 +393,7 @@ func NewAuthTester(ctx context.Context, t *testing.T, client *codersdk.Client, a
397393
Admin: admin,
398394
Template: template,
399395
Version: version,
400-
WorkspaceResource: workspaceResources[0],
396+
WorkspaceResource: workspace.LatestBuild.Resources[0],
401397
File: file,
402398
TemplateVersionDryRun: templateVersionDryRun,
403399
TemplateParam: templateParam,

0 commit comments

Comments
 (0)