chore: rename WithUserName and WithWorkspaceName to WithManifestInfo

DanielleMaywood · DanielleMaywood · commit 0ae2616364ed · 2025-06-18T11:35:33.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -64,7 +64,7 @@ type API struct {
 	subAgentURL                 string
 	subAgentEnv                 []string
 
-	userName      string
+	ownerName     string
 	workspaceName string
 
 	mu                      sync.RWMutex
@@ -156,17 +156,12 @@ func WithSubAgentEnv(env ...string) Option {
 	}
 }
 
-// WithWorkspaceName sets the workspace name for the sub-agent.
-func WithWorkspaceName(name string) Option {
+// WithManifestInfo sets the owner name, and workspace name
+// for the sub-agent.
+func WithManifestInfo(owner, workspace string) Option {
 	return func(api *API) {
-		api.workspaceName = name
-	}
-}
-
-// WithUserName sets the user name for the sub-agent.
-func WithUserName(name string) Option {
-	return func(api *API) {
-		api.userName = name
+		api.ownerName = owner
+		api.workspaceName = workspace
 	}
 }
 
@@ -1149,7 +1144,7 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c
 		if config, err := api.dccli.ReadConfig(ctx, dc.WorkspaceFolder, dc.ConfigPath,
 			[]string{
 				fmt.Sprintf("CODER_WORKSPACE_AGENT_NAME=%s", dc.Name),
-				fmt.Sprintf("CODER_WORKSPACE_OWNER_NAME=%s", api.userName),
+				fmt.Sprintf("CODER_WORKSPACE_OWNER_NAME=%s", api.ownerName),
 				fmt.Sprintf("CODER_WORKSPACE_NAME=%s", api.workspaceName),
 				fmt.Sprintf("CODER_URL=%s", api.subAgentURL),
 			},
diff --git a/agent/agentcontainers/api_test.go b/agent/agentcontainers/api_test.go
@@ -1294,8 +1294,7 @@ func TestAPI(t *testing.T) {
 			agentcontainers.WithSubAgentClient(fakeSAC),
 			agentcontainers.WithSubAgentURL("test-subagent-url"),
 			agentcontainers.WithDevcontainerCLI(fakeDCCLI),
-			agentcontainers.WithUserName("test-user"),
-			agentcontainers.WithWorkspaceName("test-workspace"),
+			agentcontainers.WithManifestInfo("test-user", "test-workspace"),
 		)
 		apiClose := func() {
 			closeOnce.Do(func() {
diff --git a/agent/api.go b/agent/api.go
@@ -51,8 +51,7 @@ func (a *agent) apiHandler(aAPI proto.DRPCAgentClient26) (http.Handler, func() e
 		manifest := a.manifest.Load()
 		if manifest != nil {
 			containerAPIOpts = append(containerAPIOpts,
-				agentcontainers.WithUserName(manifest.OwnerName),
-				agentcontainers.WithWorkspaceName(manifest.WorkspaceName),
+				agentcontainers.WithManifestInfo(manifest.OwnerName, manifest.WorkspaceName),
 			)
 
 			if len(manifest.Devcontainers) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ func (a *agent) apiHandler(aAPI proto.DRPCAgentClient26) (http.Handler, func() e`
`51`	`51`	`manifest := a.manifest.Load()`
`52`	`52`	`if manifest != nil {`
`53`	`53`	`containerAPIOpts = append(containerAPIOpts,`
`54`		`- agentcontainers.WithUserName(manifest.OwnerName),`
`55`		`- agentcontainers.WithWorkspaceName(manifest.WorkspaceName),`
	`54`	`+ agentcontainers.WithManifestInfo(manifest.OwnerName, manifest.WorkspaceName),`
`56`	`55`	`)`
`57`	`56`
`58`	`57`	`if len(manifest.Devcontainers) > 0 {`