Commit83df557

authored

revert(agent): removeCODER_AGENT_IS_SUB_AGENT cli flag (#17875)

The RFC has changed, this information will be passed through themanifest instead.

1 parentcf98268 commit83df557Copy full SHA for 83df557

File tree

-18

lines changed

-18

lines changed

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ type Options struct {`
`89`	`89`	`ServiceBannerRefreshInterval time.Duration`
`90`	`90`	`BlockFileTransferbool`
`91`	`91`	`Execer agentexec.Execer`
`92`		`-SubAgentbool`
`93`	`92`
`94`	`93`	`ExperimentalDevcontainersEnabledbool`
`95`	`94`	`ContainerAPIOptions []agentcontainers.Option// Enable ExperimentalDevcontainersEnabled for these to be effective.`
`@@ -191,8 +190,6 @@ func New(options Options) Agent {`
`191`	`190`	`metrics:newAgentMetrics(prometheusRegistry),`
`192`	`191`	`execer:options.Execer,`
`193`	`192`
`194`		`-subAgent:options.SubAgent,`
`195`		`-`
`196`	`193`	`experimentalDevcontainersEnabled:options.ExperimentalDevcontainersEnabled,`
`197`	`194`	`containerAPIOptions:options.ContainerAPIOptions,`
`198`	`195`	`}`
`@@ -275,8 +272,6 @@ type agent struct {`
`275`	`272`	`metrics*agentMetrics`
`276`	`273`	`execer agentexec.Execer`
`277`	`274`
`278`		`-subAgentbool`
`279`		`-`
`280`	`275`	`experimentalDevcontainersEnabledbool`
`281`	`276`	`containerAPIOptions []agentcontainers.Option`
`282`	`277`	`containerAPI atomic.Pointer[agentcontainers.API]// Set by apiHandler.`

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ func (r RootCmd) workspaceAgent() serpent.Command {`
`54`	`54`	`blockFileTransferbool`
`55`	`55`	`agentHeaderCommandstring`
`56`	`56`	`agentHeader []string`
`57`		`-subAgentbool`
`58`	`57`
`59`	`58`	`experimentalDevcontainersEnabledbool`
`60`	`59`	`)`
`@@ -362,7 +361,6 @@ func (r RootCmd) workspaceAgent() serpent.Command {`
`362`	`361`	`PrometheusRegistry:prometheusRegistry,`
`363`	`362`	`BlockFileTransfer:blockFileTransfer,`
`364`	`363`	`Execer:execer,`
`365`		`-SubAgent:subAgent,`
`366`	`364`	`ExperimentalDevcontainersEnabled:experimentalDevcontainersEnabled,`
`367`	`365`	`})`
`368`	`366`
`@@ -509,17 +507,6 @@ func (r RootCmd) workspaceAgent() serpent.Command {`
`509`	`507`	`Description:"Allow the agent to automatically detect running devcontainers.",`
`510`	`508`	`Value:serpent.BoolOf(&experimentalDevcontainersEnabled),`
`511`	`509`	`},`
`512`		`-{`
`513`		`-Flag:"is-sub-agent",`
`514`		`-Default:"false",`
`515`		`-Env:"CODER_AGENT_IS_SUB_AGENT",`
`516`		`-Description:"Specify whether this is a sub agent or not.",`
`517`		`-Value:serpent.BoolOf(&subAgent),`
`518`		-// As `coderd` handles the creation of sub-agents, it does not make
`519`		`-// sense for this to be exposed. We do not want people setting an`
`520`		`-// agent as a sub-agent if it is not.`
`521`		`-Hidden:true,`
`522`		`-},`
`523`	`510`	`}`
`524`	`511`
`525`	`512`	`returncmd`

Comments

(0)