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

osbuildexecutor/aws.ec2: set hostname of executor via cloud-init

Browse source 
This way much more of the journal will be captured under the new
hostname.
This commit is contained in:
Sanne Raymaekers 2024-06-20 13:40:07 +02:00
parent 14052e25db
commit 2a621521a8
7 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/osbuildexecutor/osbuild-executor.go
View file

@ -14,9 +14,6 @@ type OsbuildOpts struct {
Checkpoints []string
ExtraEnv []string
Result bool
// not strict a osbuild opt
JobID string
}
type Executor interface {

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

@ -25,6 +25,7 @@ type awsEC2Executor struct {
iamProfile string
keyName string
cloudWatchGroup string
hostname string
tmpDir string
}
@ -268,7 +269,7 @@ func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, opts *OsbuildOpts, error
return nil, fmt.Errorf("Failed to get default aws client in %s region: %w", region, err)
}
si, err := aws.RunSecureInstance(ec2e.iamProfile, ec2e.keyName, ec2e.cloudWatchGroup)
si, err := aws.RunSecureInstance(ec2e.iamProfile, ec2e.keyName, ec2e.cloudWatchGroup, ec2e.hostname)
if err != nil {
return nil, fmt.Errorf("Unable to start secure instance: %w", err)
}
@ -317,11 +318,12 @@ func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, opts *OsbuildOpts, error
return osbuildResult, nil
}
func NewAWSEC2Executor(iamProfile, keyName, cloudWatchGroup, tmpDir string) Executor {
func NewAWSEC2Executor(iamProfile, keyName, cloudWatchGroup, hostname, tmpDir string) Executor {
return &awsEC2Executor{
iamProfile,
keyName,
cloudWatchGroup,
hostname,
tmpDir,
}
}