From fbe422e8dccaef7aca33aa08ebe3413954cf5bf3 Mon Sep 17 00:00:00 2001 From: Alexander Guy Date: Wed, 27 Aug 2025 12:32:53 -0700 Subject: [PATCH 1/2] Don't panic when RunnerConfig isn't set --- pkg/runner/command.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/runner/command.go b/pkg/runner/command.go index 9e5f5c1..bd9965f 100644 --- a/pkg/runner/command.go +++ b/pkg/runner/command.go @@ -45,10 +45,6 @@ func (r *RunnerCommand) AddToPayload(p *Payload) error { } func (r *RunnerCommand) Env() *EnvBuilder { - if r.RunnerConfig == nil { - panic("environment cannot be configured if the runner config's defaults haven't been set!") - } - if r.packageGroup == nil { panic("environment cannot be configured if the package group hasn't been updated!") } @@ -56,7 +52,7 @@ func (r *RunnerCommand) Env() *EnvBuilder { env := NewEnvBuilder() env.SetArray("PACKAGE_LIST", r.packageGroup.Args()) - if r.RunnerConfig.AptLockTimeout != nil { + if r.RunnerConfig != nil && r.RunnerConfig.AptLockTimeout != nil { env.SetInt("APT_LOCK_TIMEOUT", *r.RunnerConfig.AptLockTimeout) } else { env.SetInt("APT_LOCK_TIMEOUT", aptLockTimeout) From 3c3011515fce367c6de07ab576e2b51369bcf784 Mon Sep 17 00:00:00 2001 From: Alexander Guy Date: Wed, 27 Aug 2025 12:34:03 -0700 Subject: [PATCH 2/2] Remove redundant setting of apt lock timeout We already provide a default when we set the environment variable. Overriding the value here causes the value to be sent back as an output to Pulumi, which isn't what we want. --- pkg/runner/command.go | 7 +------ pkg/runner/config.go | 7 ------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pkg/runner/command.go b/pkg/runner/command.go index bd9965f..14da130 100644 --- a/pkg/runner/command.go +++ b/pkg/runner/command.go @@ -16,12 +16,7 @@ func (r *RunnerCommand) Config() *Config { } func (r *RunnerCommand) SetConfigDefaults() { - if r.RunnerConfig != nil { - r.RunnerConfig.SetDefaults() - } else { - r.RunnerConfig = &Config{} - r.RunnerConfig.SetDefaults() - } + // XXX - Reserved for future use. } func (r *RunnerCommand) UpdatePackageGroup(grp *deb.PackageGroup) error { diff --git a/pkg/runner/config.go b/pkg/runner/config.go index 725bb89..1e32097 100644 --- a/pkg/runner/config.go +++ b/pkg/runner/config.go @@ -14,13 +14,6 @@ type Config struct { KeepPayload *bool `pulumi:"keepPayload,optional"` } -func (c *Config) SetDefaults() { - if c.AptLockTimeout == nil { - temp := aptLockTimeout - c.AptLockTimeout = &temp - } -} - func (c *Config) UpdatePackageGroup(grp *deb.PackageGroup) error { if c.PackageConfig == nil { return nil