fix TestGenerateSpiloPodEnvVars

Schmaetz · Schmaetz · commit fd2cc85425a6 · 2025-12-12T10:32:25.000+01:00
diff --git a/pkg/cluster/k8sres_test.go b/pkg/cluster/k8sres_test.go
@@ -529,67 +529,67 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {
 	}
 	expectedSpiloWalPathCompat := []ExpectedValue{
 		{
-			envIndex:       12,
+			envIndex:       15,
 			envVarConstant: "ENABLE_WAL_PATH_COMPAT",
 			envVarValue:    "true",
 		},
 	}
 	expectedValuesS3Bucket := []ExpectedValue{
 		{
-			envIndex:       15,
+			envIndex:       18,
 			envVarConstant: "WAL_S3_BUCKET",
 			envVarValue:    "global-s3-bucket",
 		},
 		{
-			envIndex:       16,
+			envIndex:       19,
 			envVarConstant: "WAL_BUCKET_SCOPE_SUFFIX",
 			envVarValue:    fmt.Sprintf("/%s", dummyUUID),
 		},
 		{
-			envIndex:       17,
+			envIndex:       20,
 			envVarConstant: "WAL_BUCKET_SCOPE_PREFIX",
 			envVarValue:    "",
 		},
 	}
 	expectedValuesGCPCreds := []ExpectedValue{
 		{
-			envIndex:       15,
+			envIndex:       18,
 			envVarConstant: "WAL_GS_BUCKET",
 			envVarValue:    "global-gs-bucket",
 		},
 		{
-			envIndex:       16,
+			envIndex:       19,
 			envVarConstant: "WAL_BUCKET_SCOPE_SUFFIX",
 			envVarValue:    fmt.Sprintf("/%s", dummyUUID),
 		},
 		{
-			envIndex:       17,
+			envIndex:       20,
 			envVarConstant: "WAL_BUCKET_SCOPE_PREFIX",
 			envVarValue:    "",
 		},
 		{
-			envIndex:       18,
+			envIndex:       21,
 			envVarConstant: "GOOGLE_APPLICATION_CREDENTIALS",
 			envVarValue:    "some-path-to-credentials",
 		},
 	}
 	expectedS3BucketConfigMap := []ExpectedValue{
 		{
-			envIndex:       17,
+			envIndex:       20,
 			envVarConstant: "wal_s3_bucket",
 			envVarValue:    "global-s3-bucket-configmap",
 		},
 	}
 	expectedCustomS3BucketSpec := []ExpectedValue{
 		{
-			envIndex:       15,
+			envIndex:       18,
 			envVarConstant: "WAL_S3_BUCKET",
 			envVarValue:    "custom-s3-bucket",
 		},
 	}
 	expectedCustomVariableSecret := []ExpectedValue{
 		{
-			envIndex:       16,
+			envIndex:       19,
 			envVarConstant: "custom_variable",
 			envVarValueRef: &v1.EnvVarSource{
 				SecretKeyRef: &v1.SecretKeySelector{
@@ -603,72 +603,72 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {
 	}
 	expectedCustomVariableConfigMap := []ExpectedValue{
 		{
-			envIndex:       16,
+			envIndex:       19,
 			envVarConstant: "custom_variable",
 			envVarValue:    "configmap-test",
 		},
 	}
 	expectedCustomVariableSpec := []ExpectedValue{
 		{
-			envIndex:       15,
+			envIndex:       18,
 			envVarConstant: "CUSTOM_VARIABLE",
 			envVarValue:    "spec-env-test",
 		},
 	}
 	expectedCloneEnvSpec := []ExpectedValue{
 		{
-			envIndex:       16,
+			envIndex:       19,
 			envVarConstant: "CLONE_WALE_S3_PREFIX",
 			envVarValue:    "s3://another-bucket",
 		},
 		{
-			envIndex:       19,
+			envIndex:       22,
 			envVarConstant: "CLONE_WAL_BUCKET_SCOPE_PREFIX",
 			envVarValue:    "",
 		},
 		{
-			envIndex:       20,
+			envIndex:       23,
 			envVarConstant: "CLONE_AWS_ENDPOINT",
 			envVarValue:    "s3.eu-central-1.amazonaws.com",
 		},
 	}
 	expectedCloneEnvSpecEnv := []ExpectedValue{
 		{
-			envIndex:       15,
+			envIndex:       18,
 			envVarConstant: "CLONE_WAL_BUCKET_SCOPE_PREFIX",
 			envVarValue:    "test-cluster",
 		},
 		{
-			envIndex:       17,
+			envIndex:       20,
 			envVarConstant: "CLONE_WALE_S3_PREFIX",
 			envVarValue:    "s3://another-bucket",
 		},
 		{
-			envIndex:       21,
+			envIndex:       24,
 			envVarConstant: "CLONE_AWS_ENDPOINT",
 			envVarValue:    "s3.eu-central-1.amazonaws.com",
 		},
 	}
 	expectedCloneEnvConfigMap := []ExpectedValue{
 		{
-			envIndex:       16,
+			envIndex:       19,
 			envVarConstant: "CLONE_WAL_S3_BUCKET",
 			envVarValue:    "global-s3-bucket",
 		},
 		{
-			envIndex:       17,
+			envIndex:       20,
 			envVarConstant: "CLONE_WAL_BUCKET_SCOPE_SUFFIX",
 			envVarValue:    fmt.Sprintf("/%s", dummyUUID),
 		},
 		{
-			envIndex:       21,
+			envIndex:       24,
 			envVarConstant: "clone_aws_endpoint",
 			envVarValue:    "s3.eu-west-1.amazonaws.com",
 		},
 	}
 	expectedCloneEnvSecret := []ExpectedValue{
 		{
-			envIndex:       21,
+			envIndex:       24,
 			envVarConstant: "clone_aws_access_key_id",
 			envVarValueRef: &v1.EnvVarSource{
 				SecretKeyRef: &v1.SecretKeySelector{
@@ -682,12 +682,12 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {
 	}
 	expectedStandbyEnvSecret := []ExpectedValue{
 		{
-			envIndex:       15,
+			envIndex:       18,
 			envVarConstant: "STANDBY_WALE_GS_PREFIX",
 			envVarValue:    "gs://some/path/",
 		},
 		{
-			envIndex:       20,
+			envIndex:       23,
 			envVarConstant: "standby_google_application_credentials",
 			envVarValueRef: &v1.EnvVarSource{
 				SecretKeyRef: &v1.SecretKeySelector{

Original file line number	Diff line number	Diff line change
`@@ -529,67 +529,67 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {`
`529`	`529`	`}`
`530`	`530`	`expectedSpiloWalPathCompat := []ExpectedValue{`
`531`	`531`	`{`
`532`		`- envIndex: 12,`
	`532`	`+ envIndex: 15,`
`533`	`533`	`envVarConstant: "ENABLE_WAL_PATH_COMPAT",`
`534`	`534`	`envVarValue: "true",`
`535`	`535`	`},`
`536`	`536`	`}`
`537`	`537`	`expectedValuesS3Bucket := []ExpectedValue{`
`538`	`538`	`{`
`539`		`- envIndex: 15,`
	`539`	`+ envIndex: 18,`
`540`	`540`	`envVarConstant: "WAL_S3_BUCKET",`
`541`	`541`	`envVarValue: "global-s3-bucket",`
`542`	`542`	`},`
`543`	`543`	`{`
`544`		`- envIndex: 16,`
	`544`	`+ envIndex: 19,`
`545`	`545`	`envVarConstant: "WAL_BUCKET_SCOPE_SUFFIX",`
`546`	`546`	`envVarValue: fmt.Sprintf("/%s", dummyUUID),`
`547`	`547`	`},`
`548`	`548`	`{`
`549`		`- envIndex: 17,`
	`549`	`+ envIndex: 20,`
`550`	`550`	`envVarConstant: "WAL_BUCKET_SCOPE_PREFIX",`
`551`	`551`	`envVarValue: "",`
`552`	`552`	`},`
`553`	`553`	`}`
`554`	`554`	`expectedValuesGCPCreds := []ExpectedValue{`
`555`	`555`	`{`
`556`		`- envIndex: 15,`
	`556`	`+ envIndex: 18,`
`557`	`557`	`envVarConstant: "WAL_GS_BUCKET",`
`558`	`558`	`envVarValue: "global-gs-bucket",`
`559`	`559`	`},`
`560`	`560`	`{`
`561`		`- envIndex: 16,`
	`561`	`+ envIndex: 19,`
`562`	`562`	`envVarConstant: "WAL_BUCKET_SCOPE_SUFFIX",`
`563`	`563`	`envVarValue: fmt.Sprintf("/%s", dummyUUID),`
`564`	`564`	`},`
`565`	`565`	`{`
`566`		`- envIndex: 17,`
	`566`	`+ envIndex: 20,`
`567`	`567`	`envVarConstant: "WAL_BUCKET_SCOPE_PREFIX",`
`568`	`568`	`envVarValue: "",`
`569`	`569`	`},`
`570`	`570`	`{`
`571`		`- envIndex: 18,`
	`571`	`+ envIndex: 21,`
`572`	`572`	`envVarConstant: "GOOGLE_APPLICATION_CREDENTIALS",`
`573`	`573`	`envVarValue: "some-path-to-credentials",`
`574`	`574`	`},`
`575`	`575`	`}`
`576`	`576`	`expectedS3BucketConfigMap := []ExpectedValue{`
`577`	`577`	`{`
`578`		`- envIndex: 17,`
	`578`	`+ envIndex: 20,`
`579`	`579`	`envVarConstant: "wal_s3_bucket",`
`580`	`580`	`envVarValue: "global-s3-bucket-configmap",`
`581`	`581`	`},`
`582`	`582`	`}`
`583`	`583`	`expectedCustomS3BucketSpec := []ExpectedValue{`
`584`	`584`	`{`
`585`		`- envIndex: 15,`
	`585`	`+ envIndex: 18,`
`586`	`586`	`envVarConstant: "WAL_S3_BUCKET",`
`587`	`587`	`envVarValue: "custom-s3-bucket",`
`588`	`588`	`},`
`589`	`589`	`}`
`590`	`590`	`expectedCustomVariableSecret := []ExpectedValue{`
`591`	`591`	`{`
`592`		`- envIndex: 16,`
	`592`	`+ envIndex: 19,`
`593`	`593`	`envVarConstant: "custom_variable",`
`594`	`594`	`envVarValueRef: &v1.EnvVarSource{`
`595`	`595`	`SecretKeyRef: &v1.SecretKeySelector{`
`@@ -603,72 +603,72 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {`
`603`	`603`	`}`
`604`	`604`	`expectedCustomVariableConfigMap := []ExpectedValue{`
`605`	`605`	`{`
`606`		`- envIndex: 16,`
	`606`	`+ envIndex: 19,`
`607`	`607`	`envVarConstant: "custom_variable",`
`608`	`608`	`envVarValue: "configmap-test",`
`609`	`609`	`},`
`610`	`610`	`}`
`611`	`611`	`expectedCustomVariableSpec := []ExpectedValue{`
`612`	`612`	`{`
`613`		`- envIndex: 15,`
	`613`	`+ envIndex: 18,`
`614`	`614`	`envVarConstant: "CUSTOM_VARIABLE",`
`615`	`615`	`envVarValue: "spec-env-test",`
`616`	`616`	`},`
`617`	`617`	`}`
`618`	`618`	`expectedCloneEnvSpec := []ExpectedValue{`
`619`	`619`	`{`
`620`		`- envIndex: 16,`
	`620`	`+ envIndex: 19,`
`621`	`621`	`envVarConstant: "CLONE_WALE_S3_PREFIX",`
`622`	`622`	`envVarValue: "s3://another-bucket",`
`623`	`623`	`},`
`624`	`624`	`{`
`625`		`- envIndex: 19,`
	`625`	`+ envIndex: 22,`
`626`	`626`	`envVarConstant: "CLONE_WAL_BUCKET_SCOPE_PREFIX",`
`627`	`627`	`envVarValue: "",`
`628`	`628`	`},`
`629`	`629`	`{`
`630`		`- envIndex: 20,`
	`630`	`+ envIndex: 23,`
`631`	`631`	`envVarConstant: "CLONE_AWS_ENDPOINT",`
`632`	`632`	`envVarValue: "s3.eu-central-1.amazonaws.com",`
`633`	`633`	`},`
`634`	`634`	`}`
`635`	`635`	`expectedCloneEnvSpecEnv := []ExpectedValue{`
`636`	`636`	`{`
`637`		`- envIndex: 15,`
	`637`	`+ envIndex: 18,`
`638`	`638`	`envVarConstant: "CLONE_WAL_BUCKET_SCOPE_PREFIX",`
`639`	`639`	`envVarValue: "test-cluster",`
`640`	`640`	`},`
`641`	`641`	`{`
`642`		`- envIndex: 17,`
	`642`	`+ envIndex: 20,`
`643`	`643`	`envVarConstant: "CLONE_WALE_S3_PREFIX",`
`644`	`644`	`envVarValue: "s3://another-bucket",`
`645`	`645`	`},`
`646`	`646`	`{`
`647`		`- envIndex: 21,`
	`647`	`+ envIndex: 24,`
`648`	`648`	`envVarConstant: "CLONE_AWS_ENDPOINT",`
`649`	`649`	`envVarValue: "s3.eu-central-1.amazonaws.com",`
`650`	`650`	`},`
`651`	`651`	`}`
`652`	`652`	`expectedCloneEnvConfigMap := []ExpectedValue{`
`653`	`653`	`{`
`654`		`- envIndex: 16,`
	`654`	`+ envIndex: 19,`
`655`	`655`	`envVarConstant: "CLONE_WAL_S3_BUCKET",`
`656`	`656`	`envVarValue: "global-s3-bucket",`
`657`	`657`	`},`
`658`	`658`	`{`
`659`		`- envIndex: 17,`
	`659`	`+ envIndex: 20,`
`660`	`660`	`envVarConstant: "CLONE_WAL_BUCKET_SCOPE_SUFFIX",`
`661`	`661`	`envVarValue: fmt.Sprintf("/%s", dummyUUID),`
`662`	`662`	`},`
`663`	`663`	`{`
`664`		`- envIndex: 21,`
	`664`	`+ envIndex: 24,`
`665`	`665`	`envVarConstant: "clone_aws_endpoint",`
`666`	`666`	`envVarValue: "s3.eu-west-1.amazonaws.com",`
`667`	`667`	`},`
`668`	`668`	`}`
`669`	`669`	`expectedCloneEnvSecret := []ExpectedValue{`
`670`	`670`	`{`
`671`		`- envIndex: 21,`
	`671`	`+ envIndex: 24,`
`672`	`672`	`envVarConstant: "clone_aws_access_key_id",`
`673`	`673`	`envVarValueRef: &v1.EnvVarSource{`
`674`	`674`	`SecretKeyRef: &v1.SecretKeySelector{`
`@@ -682,12 +682,12 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {`
`682`	`682`	`}`
`683`	`683`	`expectedStandbyEnvSecret := []ExpectedValue{`
`684`	`684`	`{`
`685`		`- envIndex: 15,`
	`685`	`+ envIndex: 18,`
`686`	`686`	`envVarConstant: "STANDBY_WALE_GS_PREFIX",`
`687`	`687`	`envVarValue: "gs://some/path/",`
`688`	`688`	`},`
`689`	`689`	`{`
`690`		`- envIndex: 20,`
	`690`	`+ envIndex: 23,`
`691`	`691`	`envVarConstant: "standby_google_application_credentials",`
`692`	`692`	`envVarValueRef: &v1.EnvVarSource{`
`693`	`693`	`SecretKeyRef: &v1.SecretKeySelector{`