diff --git a/terratest/src/test/pega/pega-deployment-with-srs-auth-enabled-and-disabled_test.go b/terratest/src/test/pega/pega-deployment-with-srs-auth-enabled-and-disabled_test.go index a1ac354c4..2047c728f 100644 --- a/terratest/src/test/pega/pega-deployment-with-srs-auth-enabled-and-disabled_test.go +++ b/terratest/src/test/pega/pega-deployment-with-srs-auth-enabled-and-disabled_test.go @@ -93,6 +93,9 @@ func assertNoSRSAuthSettings(t *testing.T, pegaTierDeployment string) { UnmarshalK8SYaml(t, pegaTierDeployment, &deployment) for _, container := range deployment.Spec.Template.Spec.Containers { for _, envVar := range container.Env { + if "SERV_AUTH_PRIVATE_KEY" == envVar.Name { + require.Fail(t, "container '"+container.Name+"' should not have 'SERV_AUTH_PRIVATE_KEY' environment variable") + } if "SERV_AUTH_CLIENT_SECRET" == envVar.Name { require.Fail(t, "container '"+container.Name+"' should not have 'SERV_AUTH_CLIENT_SECRET' environment variable") } @@ -105,13 +108,20 @@ func assertHasSRSAuthSettings(t *testing.T, pegaTierDeployment string) { UnmarshalK8SYaml(t, pegaTierDeployment, &deployment) for _, container := range deployment.Spec.Template.Spec.Containers { hasPrivateKey := false + hasClientPrivateKey := false for _, envVar := range container.Env { - if "SERV_AUTH_CLIENT_SECRET" == envVar.Name { + if "SERV_AUTH_PRIVATE_KEY" == envVar.Name { require.Equal(t, "pega-srs-auth-secret", envVar.ValueFrom.SecretKeyRef.Name) require.Equal(t, "privateKey", envVar.ValueFrom.SecretKeyRef.Key) hasPrivateKey = true } + if "SERV_AUTH_CLIENT_SECRET" == envVar.Name { + require.Equal(t, "pega-srs-auth-secret", envVar.ValueFrom.SecretKeyRef.Name) + require.Equal(t, "privateKey", envVar.ValueFrom.SecretKeyRef.Key) + hasClientPrivateKey = true + } } - require.True(t, hasPrivateKey, "container '"+container.Name+"' should have 'SERV_AUTH_CLIENT_SECRET' environment variable") + require.True(t, hasPrivateKey, "container '"+container.Name+"' should have 'SERV_AUTH_PRIVATE_KEY' environment variable") + require.True(t, hasClientPrivateKey, "container '"+container.Name+"' should have 'SERV_AUTH_CLIENT_SECRET' environment variable") } } diff --git a/terratest/src/test/pega/pega-environment-config-with-external-srs_test.go b/terratest/src/test/pega/pega-environment-config-with-external-srs_test.go index 355caf58b..51eec66a1 100644 --- a/terratest/src/test/pega/pega-environment-config-with-external-srs_test.go +++ b/terratest/src/test/pega/pega-environment-config-with-external-srs_test.go @@ -190,7 +190,7 @@ func VerifyPegaWithoutExternalSRSEnvironmentConfig(t *testing.T, yamlContent str } func VerifyEnvConfigDataWithoutAuthVariables(t *testing.T, envConfigData map[string]string) { - authEnvironmentVariables := []string{"SERV_AUTH_URL", "SERV_AUTH_CLIENT_ID", "SERV_AUTH_SCOPES", "SERV_AUTH_PRIVATE_KEY_ALGORITHM", "SERV_AUTH_CLIENT_SECRET"} + authEnvironmentVariables := []string{"SERV_AUTH_URL", "SERV_AUTH_CLIENT_ID", "SERV_AUTH_SCOPES", "SERV_AUTH_PRIVATE_KEY_ALGORITHM", "SERV_AUTH_PRIVAYE_KEY", "SERV_AUTH_CLIENT_SECRET"} for _, authEnvironmentVariable := range authEnvironmentVariables { require.Emptyf(t, envConfigData[authEnvironmentVariable], "Environment variable '%s' should be empty", authEnvironmentVariable) } @@ -201,6 +201,8 @@ func VerifyEnvConfigDataWithAuthVariables(t *testing.T, envConfigData map[string require.Equal(t, "client-id", envConfigData["SERV_AUTH_CLIENT_ID"]) require.Equal(t, expectedScope, envConfigData["SERV_AUTH_SCOPES"]) require.Equal(t, expectedAlgorithm, envConfigData["SERV_AUTH_PRIVATE_KEY_ALGORITHM"]) - _, hasPrivateKey := envConfigData["SERV_AUTH_CLIENT_SECRET"] + _, hasPrivateKey := envConfigData["SERV_AUTH_PRIVATE_KEY"] require.False(t, hasPrivateKey) + _, hasClientPrivateKey := envConfigData["SERV_AUTH_CLIENT_SECRET"] + require.False(t, hasClientPrivateKey) }