Commit0f9ad9b

committed

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

1 parent5e3a225 commit0f9ad9bCopy full SHA for 0f9ad9b

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
`@@ -1051,6 +1051,10 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c`
`1051`	`1051`	`)`
`1052`	`1052`	`returnnil`
`1053`	`1053`	`}`
	`1054`	`+ifproc.agent.ID==uuid.Nil {`
	`1055`	`+proc.agent.Architecture=arch`
	`1056`	`+}`
	`1057`	`+`
`1054`	`1058`	`agentBinaryPath,err:=os.Executable()`
`1055`	`1059`	`iferr!=nil {`
`1056`	`1060`	`returnxerrors.Errorf("get agent binary path: %w",err)`
`@@ -1095,6 +1099,8 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c`
`1095`	`1099`
`1096`	`1100`	`subAgentConfig:=proc.agent.CloneConfig(dc)`
`1097`	`1101`	`ifproc.agent.ID==uuid.Nil\|\|maybeRecreateSubAgent {`
	`1102`	`+subAgentConfig.Architecture=arch`
	`1103`	`+`
`1098`	`1104`	// Detect workspace folder by executing `pwd` in the container.
`1099`	`1105`	`// NOTE(mafredri): This is a quick and dirty way to detect the`
`1100`	`1106`	`// 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)