Commit56ff0fb

authored

fix(agent/agentcontainers): make sure arch is set for sub agents (#18428)

1 parent2f59cd0 commit56ff0fbCopy full SHA for 56ff0fb

File tree

+15

-0

lines changed

+15

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1063,6 +1063,10 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c`
`1063`	`1063`	`)`
`1064`	`1064`	`returnnil`
`1065`	`1065`	`}`
	`1066`	`+ifproc.agent.ID==uuid.Nil {`
	`1067`	`+proc.agent.Architecture=arch`
	`1068`	`+}`
	`1069`	`+`
`1066`	`1070`	`agentBinaryPath,err:=os.Executable()`
`1067`	`1071`	`iferr!=nil {`
`1068`	`1072`	`returnxerrors.Errorf("get agent binary path: %w",err)`
`@@ -1107,6 +1111,8 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c`
`1107`	`1111`
`1108`	`1112`	`subAgentConfig:=proc.agent.CloneConfig(dc)`
`1109`	`1113`	`ifproc.agent.ID==uuid.Nil\|\|maybeRecreateSubAgent {`
	`1114`	`+subAgentConfig.Architecture=arch`
	`1115`	`+`
`1110`	`1116`	// Detect workspace folder by executing `pwd` in the container.
`1111`	`1117`	`// NOTE(mafredri): This is a quick and dirty way to detect the`
`1112`	`1118`	`// workspace folder inside the container. In the future we will`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,15 @@ func (m *fakeSubAgentClient) Create(ctx context.Context, agent agentcontainers.S`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`	`}`
	`255`	`+ifagent.Name=="" {`
	`256`	`+return agentcontainers.SubAgent{},xerrors.New("name must be set")`
	`257`	`+}`
	`258`	`+ifagent.Architecture=="" {`
	`259`	`+return agentcontainers.SubAgent{},xerrors.New("architecture must be set")`
	`260`	`+}`
	`261`	`+ifagent.OperatingSystem=="" {`
	`262`	`+return agentcontainers.SubAgent{},xerrors.New("operating system must be set")`
	`263`	`+}`
`255`	`264`	`agent.ID=uuid.New()`
`256`	`265`	`agent.AuthToken=uuid.New()`
`257`	`266`	`ifm.agents==nil {`

Comments

(0)