Skip to content

Commit f48d807

Browse files
mafredrimafredri
committed
simplify name
1 parent 013bb45 commit f48d807

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

‎coderd/agentapi/manifest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (a *ManifestAPI) GetManifest(ctx context.Context, _ *agentproto.GetManifest
8383
return err
8484
})
8585
eg.Go(func() (err error) {
86-
devcontainers, err = a.Database.GetWorkspaceAgentDevcontainersByWorkspaceAgentID(ctx, workspaceAgent.ID)
86+
devcontainers, err = a.Database.GetWorkspaceAgentDevcontainersByAgentID(ctx, workspaceAgent.ID)
8787
if err != nil && !errors.Is(err, sql.ErrNoRows) {
8888
return err
8989
}

‎coderd/agentapi/manifest_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ func TestGetManifest(t *testing.T) {
323323
WorkspaceAgentID: agent.ID,
324324
Keys: nil, // all
325325
}).Return(metadata, nil)
326-
mDB.EXPECT().GetWorkspaceAgentDevcontainersByWorkspaceAgentID(gomock.Any(), agent.ID).Return(devcontainers, nil)
326+
mDB.EXPECT().GetWorkspaceAgentDevcontainersByAgentID(gomock.Any(), agent.ID).Return(devcontainers, nil)
327327
mDB.EXPECT().GetWorkspaceByID(gomock.Any(), workspace.ID).Return(workspace, nil)
328328
mDB.EXPECT().GetUserByID(gomock.Any(), workspace.OwnerID).Return(owner, nil)
329329

@@ -390,7 +390,7 @@ func TestGetManifest(t *testing.T) {
390390
WorkspaceAgentID: agent.ID,
391391
Keys: nil, // all
392392
}).Return(metadata, nil)
393-
mDB.EXPECT().GetWorkspaceAgentDevcontainersByWorkspaceAgentID(gomock.Any(), agent.ID).Return(devcontainers, nil)
393+
mDB.EXPECT().GetWorkspaceAgentDevcontainersByAgentID(gomock.Any(), agent.ID).Return(devcontainers, nil)
394394
mDB.EXPECT().GetWorkspaceByID(gomock.Any(), workspace.ID).Return(workspace, nil)
395395
mDB.EXPECT().GetUserByID(gomock.Any(), workspace.OwnerID).Return(owner, nil)
396396

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2660,12 +2660,12 @@ func (q *querier) GetWorkspaceAgentByInstanceID(ctx context.Context, authInstanc
26602660
return agent, nil
26612661
}
26622662

2663-
func (q *querier) GetWorkspaceAgentDevcontainersByWorkspaceAgentID(ctx context.Context, workspaceAgentID uuid.UUID) ([]database.WorkspaceAgentDevcontainer, error) {
2663+
func (q *querier) GetWorkspaceAgentDevcontainersByAgentID(ctx context.Context, workspaceAgentID uuid.UUID) ([]database.WorkspaceAgentDevcontainer, error) {
26642664
_, err := q.GetWorkspaceAgentByID(ctx, workspaceAgentID)
26652665
if err != nil {
26662666
return nil, err
26672667
}
2668-
return q.db.GetWorkspaceAgentDevcontainersByWorkspaceAgentID(ctx, workspaceAgentID)
2668+
return q.db.GetWorkspaceAgentDevcontainersByAgentID(ctx, workspaceAgentID)
26692669
}
26702670

26712671
func (q *querier) GetWorkspaceAgentLifecycleStateByID(ctx context.Context, id uuid.UUID) (database.GetWorkspaceAgentLifecycleStateByIDRow, error) {

‎coderd/database/dbmem/dbmem.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6697,7 +6697,7 @@ func (q *FakeQuerier) GetWorkspaceAgentByInstanceID(_ context.Context, instanceI
66976697
return database.WorkspaceAgent{}, sql.ErrNoRows
66986698
}
66996699

6700-
func (q *FakeQuerier) GetWorkspaceAgentDevcontainersByWorkspaceAgentID(_ context.Context, workspaceAgentID uuid.UUID) ([]database.WorkspaceAgentDevcontainer, error) {
6700+
func (q *FakeQuerier) GetWorkspaceAgentDevcontainersByAgentID(_ context.Context, workspaceAgentID uuid.UUID) ([]database.WorkspaceAgentDevcontainer, error) {
67016701
q.mutex.RLock()
67026702
defer q.mutex.RUnlock()
67036703

‎coderd/database/dbmetrics/querymetrics.go

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

‎coderd/database/dbmock/dbmock.go

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

‎coderd/database/querier.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

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

‎coderd/database/queries/workspaceagentdevcontainers.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SELECT
99
unnest(@config_path::text[]) AS config_path
1010
RETURNING workspace_agent_devcontainers.*;
1111

12-
-- name: GetWorkspaceAgentDevcontainersByWorkspaceAgentID :many
12+
-- name: GetWorkspaceAgentDevcontainersByAgentID :many
1313
SELECT
1414
*
1515
FROM

‎coderd/provisionerdserver/provisionerdserver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2214,7 +2214,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
22142214
require.NoError(t, err)
22152215
require.Len(t, agents, 1)
22162216
agent := agents[0]
2217-
devcontainers, err := db.GetWorkspaceAgentDevcontainersByWorkspaceAgentID(ctx, agent.ID)
2217+
devcontainers, err := db.GetWorkspaceAgentDevcontainersByAgentID(ctx, agent.ID)
22182218
require.NoError(t, err)
22192219
require.Len(t, devcontainers, 2)
22202220
require.Equal(t, "/workspace1", devcontainers[0].WorkspaceFolder)

0 commit comments

Comments
 (0)