Skip to content

fix: Fix properly selecting workspace apps by agent #3684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Aug 29, 2022
Merged

fix: Fix properly selecting workspace apps by agent #3684

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
433705d
fix: Fix properly naming workspace agents
Emyrk Aug 24, 2022
7d0bc56
chore: Make workspace and agent extract a middleware
Emyrk Aug 24, 2022
0bb51b4
chore: Write unit tests for agent selector
Emyrk Aug 24, 2022
8b3f46d
Add unit test cases
Emyrk Aug 24, 2022
f44f5c0
Linting
Emyrk Aug 24, 2022
712906e
Fix authorize unit test
Emyrk Aug 24, 2022
c5bacc6
Merge remote-tracking branch 'origin/main' into stevenmasley/select_a…
Emyrk Aug 25, 2022
4058665
Add test cases
Emyrk Aug 25, 2022
5401e70
Merge remote-tracking branch 'origin/main' into stevenmasley/select_a…
Emyrk Aug 25, 2022
48ed5db
Merge remote-tracking branch 'origin/main' into stevenmasley/select_a…
Emyrk Aug 26, 2022
991448d
Fix auth test on all http method types
Emyrk Aug 26, 2022
2a30b23
Rename url variable
Emyrk Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add unit test cases
  • Loading branch information
@Emyrk
Emyrk committed Aug 24, 2022
commit 8b3f46d50a3713a9153d162364ecff090b304850
8 changes: 5 additions & 3 deletions coderd/httpmw/workspaceparam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,12 @@ func ExtractWorkspaceAndAgentParam(db database.Store) func(http.Handler) http.Ha
return
}

// If we have more than 1 workspace agent, we need to specify which one to use.
var agent database.WorkspaceAgent
var found bool
if len(agents) > 1 {
// If we have more than 1 workspace agent, we need to specify which one to use.
// If the user specified an agent, we need to make sure that agent
// actually exists.
if len(workspaceParts) > 1 || len(agents) > 1 {
for _, otherAgent := range agents {
if otherAgent.Name == workspaceParts[1] {
agent = otherAgent
Expand All @@ -141,7 +143,7 @@ func ExtractWorkspaceAndAgentParam(db database.Store) func(http.Handler) http.Ha
}
if !found {
httpapi.Write(rw, http.StatusBadRequest, codersdk.Response{
Message: fmt.Sprintf("No agent exists with the name %s", workspaceParts[1]),
Message: fmt.Sprintf("No agent exists with the name %q", workspaceParts[1]),
})
return
}
Expand Down
30 changes: 30 additions & 0 deletions coderd/httpmw/workspaceparam_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,36 @@ func TestWorkspaceAgentByNameParam(t *testing.T) {
ExpectedStatusCode: http.StatusBadRequest,
ExpectedError: "More than one agent exists, but no agent specified",
},
{
Name: "NotExistsOneAgent",
WorkspaceName: "dev",
Agents: map[string][]string{
"resource-a": {
"agent-one",
},
},
UrlParam: "dev.not-exists",
ExpectedStatusCode: http.StatusBadRequest,
ExpectedError: "No agent exists with the name",
},
{
Name: "NotExistsMultipleAgents",
WorkspaceName: "dev",
Agents: map[string][]string{
"resource-a": {
"agent-one",
},
"resource-b": {
"agent-two",
},
"resource-c": {
"agent-three",
},
},
UrlParam: "dev.not-exists",
ExpectedStatusCode: http.StatusBadRequest,
ExpectedError: "No agent exists with the name",
},

// OKs
{
Expand Down