particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuildexecutor/ec2: pass extraEnv only to sources invocation

Browse source 
The extra env only contains paths to secrets which are needed to pull
sources. Since the sources don't get pulled on the executor, don't pass
the env along to the executor.
This commit is contained in:
Sanne Raymaekers 2024-04-17 21:39:44 +02:00
parent 7684dbeedd
commit 7d24ac5567
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/osbuildexecutor/runner-impl-aws-ec2.go
View file

@ -18,16 +18,16 @@ type awsEC2Executor struct {
cloudWatchGroup string
}
func prepareSources(manifest []byte, store string, result bool, errorWriter io.Writer) error {
func prepareSources(manifest []byte, store string, extraEnv []string, result bool, errorWriter io.Writer) error {
hostExecutor := NewHostExecutor()
_, err := hostExecutor.RunOSBuild(manifest, store, "", nil, nil, nil, nil, result, errorWriter)
_, err := hostExecutor.RunOSBuild(manifest, store, "", nil, nil, nil, extraEnv, result, errorWriter)
return err
}
func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, store, outputDirectory string, exports, exportPaths, checkpoints,
extraEnv []string, result bool, errorWriter io.Writer) (*osbuild.Result, error) {
err := prepareSources(manifest, store, result, errorWriter)
err := prepareSources(manifest, store, extraEnv, result, errorWriter)
if err != nil {
return nil, err
}
@ -67,9 +67,6 @@ func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, store, outputDirectory s
for _, exp := range exportPaths {
args = append(args, "--export-file", exp)
}
for _, env := range extraEnv {
args = append(args, "--environment", env)
}
args = append(args, "--output", outputDirectory)
cmd := exec.Command(