fix tests and potential segfault in `configureLaunchInputForReleaseCo…

…mmand`
superfly · Apr 5, 2023 · 463f0c2 · 463f0c2
1 parent ea12756
commit 463f0c2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/internal/command/deploy/deploy.go b/internal/command/deploy/deploy.go
@@ -71,7 +71,7 @@ var CommonFlags = flag.Set{
 	flag.Int{
 		Name:        "release-command-memory",
 		Description: "Set release command machine memory to a number of megabytes",
-		Default:     256,
+		Default:     DefaultReleaseCommandMemoryMb,
 	},
 	flag.Bool{
 		Name:        "force-nomad",

diff --git a/internal/command/deploy/machines.go b/internal/command/deploy/machines.go
@@ -27,8 +27,9 @@ import (
 )
 
 const (
-	DefaultWaitTimeout = 120 * time.Second
-	DefaultLeaseTtl    = 13 * time.Second
+	DefaultWaitTimeout            = 120 * time.Second
+	DefaultLeaseTtl               = 13 * time.Second
+	DefaultReleaseCommandMemoryMb = 256
 )
 
 type MachineDeployment interface {
@@ -504,6 +505,9 @@ func (md *machineDeployment) configureLaunchInputForReleaseCommand(launchInput *
 	if _, present := launchInput.Config.Env["RELEASE_COMMAND"]; !present {
 		launchInput.Config.Env["RELEASE_COMMAND"] = "1"
 	}
+	if launchInput.Config.Guest == nil {
+		launchInput.Config.Guest = &api.MachineGuest{}
+	}
 	launchInput.Config.Guest.MemoryMB = md.releaseCommandMemory
 	return launchInput
 }

diff --git a/internal/command/deploy/machines_test.go b/internal/command/deploy/machines_test.go
@@ -16,8 +16,9 @@ func stabMachineDeployment(appConfig *appconfig.Config) (*machineDeployment, err
 				ID: "my-dangling-org",
 			},
 		},
-		img:       "super/balloon",
-		appConfig: appConfig,
+		img:                  "super/balloon",
+		appConfig:            appConfig,
+		releaseCommandMemory: 891,
 	}
 	var err error
 	md.processConfigs, err = md.appConfig.GetProcessConfigs()
@@ -161,6 +162,9 @@ func Test_resolveUpdatedMachineConfig_ReleaseCommand(t *testing.T) {
 			DNS: &api.DNSConfig{
 				SkipRegistration: true,
 			},
+			Guest: &api.MachineGuest{
+				MemoryMB: 891,
+			},
 		},
 	}, md.resolveUpdatedMachineConfig(nil, true))
 
@@ -204,6 +208,9 @@ func Test_resolveUpdatedMachineConfig_ReleaseCommand(t *testing.T) {
 			DNS: &api.DNSConfig{
 				SkipRegistration: true,
 			},
+			Guest: &api.MachineGuest{
+				MemoryMB: 891,
+			},
 		},
 	}, md.resolveUpdatedMachineConfig(origMachine, true))
 }