Skip to content

Commit fb7bc71

Browse files
committed
update external agent handling in workspace agents and adjust Terraform resource references
1 parent b91397d commit fb7bc71

File tree

4 files changed

+9
-32
lines changed

4 files changed

+9
-32
lines changed

enterprise/coderd/workspaceagents.go

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,6 @@ func (api *API) workspaceExternalAgentCredentials(rw http.ResponseWriter, r *htt
5252
return
5353
}
5454

55-
resources, err := api.Database.GetWorkspaceResourcesByJobID(ctx, build.JobID)
56-
if err != nil {
57-
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
58-
Message: "Failed to get workspace resources.",
59-
Detail: err.Error(),
60-
})
61-
return
62-
}
63-
64-
found := false
65-
for _, resource := range resources {
66-
if resource.Type == "coder_external_agent" && resource.Name == agentName {
67-
found = true
68-
break
69-
}
70-
}
71-
if !found {
72-
httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
73-
Message: fmt.Sprintf("Agent '%s' does not have an external agent associated with it.", agentName),
74-
})
75-
return
76-
}
77-
7855
agents, err := api.Database.GetWorkspaceAgentsByWorkspaceAndBuildNumber(ctx, database.GetWorkspaceAgentsByWorkspaceAndBuildNumberParams{
7956
WorkspaceID: workspace.ID,
8057
BuildNumber: build.BuildNumber,

provisioner/terraform/testdata/resources/external-agents/external-agents.tfplan.json

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

provisioner/terraform/testdata/resources/external-agents/external-agents.tfstate.json

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

provisioner/terraform/testdata/resources/external-agents/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ resource "coder_agent" "dev1" {
1717
}
1818

1919
resource "coder_external_agent" "dev1" {
20-
token = coder_agent.dev1.token
20+
agent_id = coder_agent.dev1.token
2121
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy