use defaults for internal ports

dominikschubert · dfangl · commit 1409082c41a2 · 2022-11-10T18:52:57.000+01:00
diff --git a/cmd/localstack/main.go b/cmd/localstack/main.go
@@ -28,10 +28,11 @@ func GetEnvOrDie(env string) string {
 
 func InitLsOpts() *LsOpts {
 	return &LsOpts{
-		InteropPort:     GetEnvOrDie("LOCALSTACK_INTEROP_PORT"),
 		RuntimeEndpoint: GetEnvOrDie("LOCALSTACK_RUNTIME_ENDPOINT"),
 		RuntimeId:       GetEnvOrDie("LOCALSTACK_RUNTIME_ID"),
-		InitTracingPort: GetEnvOrDie("LOCALSTACK_RUNTIME_TRACING_PORT"),
+		// optional with default
+		InteropPort:     GetenvWithDefault("LOCALSTACK_INTEROP_PORT", "9563"),
+		InitTracingPort: GetenvWithDefault("LOCALSTACK_RUNTIME_TRACING_PORT", "9564"),
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,11 @@ func GetEnvOrDie(env string) string {`
`28`	`28`
`29`	`29`	`func InitLsOpts() *LsOpts {`
`30`	`30`	`return &LsOpts{`
`31`		`- InteropPort: GetEnvOrDie("LOCALSTACK_INTEROP_PORT"),`
`32`	`31`	`RuntimeEndpoint: GetEnvOrDie("LOCALSTACK_RUNTIME_ENDPOINT"),`
`33`	`32`	`RuntimeId: GetEnvOrDie("LOCALSTACK_RUNTIME_ID"),`
`34`		`- InitTracingPort: GetEnvOrDie("LOCALSTACK_RUNTIME_TRACING_PORT"),`
	`33`	`+ // optional with default`
	`34`	`+ InteropPort: GetenvWithDefault("LOCALSTACK_INTEROP_PORT", "9563"),`
	`35`	`+ InitTracingPort: GetenvWithDefault("LOCALSTACK_RUNTIME_TRACING_PORT", "9564"),`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`