Make createAgentClient use token file and errors

code-asher · code-asher · commit 4678def1f4a8 · 2025-06-11T01:20:19.000-08:00
diff --git a/cli/root.go b/cli/root.go
@@ -81,6 +81,7 @@ const (
 	envAgentToken = "CODER_AGENT_TOKEN"
 	//nolint:gosec
 	envAgentTokenFile = "CODER_AGENT_TOKEN_FILE"
+	envAgentURL       = "CODER_AGENT_URL"
 	envURL            = "CODER_URL"
 )
 
@@ -398,7 +399,7 @@ func (r *RootCmd) Command(subcommands []*serpent.Command) (*serpent.Command, err
 		},
 		{
 			Flag:        varAgentURL,
-			Env:         "CODER_AGENT_URL",
+			Env:         envAgentURL,
 			Description: "URL for an agent to access your deployment.",
 			Value:       serpent.URLOf(r.agentURL),
 			Hidden:      true,
@@ -668,11 +669,26 @@ func (r *RootCmd) createUnauthenticatedClient(ctx context.Context, serverURL *ur
 	return &client, err
 }
 
-// createAgentClient returns a new client from the command context.
-// It works just like CreateClient, but uses the agent token and URL instead.
+// createAgentClient returns a new client from the command context.  It works
+// just like InitClient, but uses the agent token and URL instead.
 func (r *RootCmd) createAgentClient() (*agentsdk.Client, error) {
-	client := agentsdk.New(r.agentURL)
-	client.SetSessionToken(r.agentToken)
+	agentURL := r.agentURL
+	if agentURL == nil || agentURL.String() == "" {
+		return nil, xerrors.Errorf("%s must be set", envAgentURL)
+	}
+	token := r.agentToken
+	if token == "" {
+		if r.agentTokenFile == "" {
+			return nil, xerrors.Errorf("Either %s or %s must be set", envAgentToken, envAgentTokenFile)
+		}
+		tokenBytes, err := os.ReadFile(r.agentTokenFile)
+		if err != nil {
+			return nil, xerrors.Errorf("read token file %q: %w", r.agentTokenFile, err)
+		}
+		token = strings.TrimSpace(string(tokenBytes))
+	}
+	client := agentsdk.New(agentURL)
+	client.SetSessionToken(token)
 	return client, nil
 }
 
