From cf471d6422dd2432844ba6adb72732612d029a9c Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Tue, 29 Mar 2022 09:13:44 -0700 Subject: [PATCH] Remove unused env.SupervisorHTTPAddress integration test var --- test/testlib/env.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/testlib/env.go b/test/testlib/env.go index 18f9753c..a1df0e97 100644 --- a/test/testlib/env.go +++ b/test/testlib/env.go @@ -48,7 +48,6 @@ type TestEnv struct { KubernetesDistribution KubeDistro `json:"kubernetesDistribution"` Capabilities map[Capability]bool `json:"capabilities"` TestWebhook auth1alpha1.WebhookAuthenticatorSpec `json:"testWebhook"` - SupervisorHTTPAddress string `json:"supervisorHttpAddress"` SupervisorHTTPSAddress string `json:"supervisorHttpsAddress"` SupervisorHTTPSIngressAddress string `json:"supervisorHttpsIngressAddress"` SupervisorHTTPSIngressCABundle string `json:"supervisorHttpsIngressCABundle"` @@ -207,12 +206,7 @@ func loadEnvVars(t *testing.T, result *TestEnv) { result.SupervisorAppName = needEnv(t, "PINNIPED_TEST_SUPERVISOR_APP_NAME") result.TestWebhook.TLS = &auth1alpha1.TLSSpec{CertificateAuthorityData: needEnv(t, "PINNIPED_TEST_WEBHOOK_CA_BUNDLE")} - result.SupervisorHTTPAddress = os.Getenv("PINNIPED_TEST_SUPERVISOR_HTTP_ADDRESS") result.SupervisorHTTPSIngressAddress = os.Getenv("PINNIPED_TEST_SUPERVISOR_HTTPS_INGRESS_ADDRESS") - require.NotEmptyf(t, - result.SupervisorHTTPAddress+result.SupervisorHTTPSIngressAddress, - "must specify either PINNIPED_TEST_SUPERVISOR_HTTP_ADDRESS or PINNIPED_TEST_SUPERVISOR_HTTPS_INGRESS_ADDRESS env var (or both) for integration tests", - ) result.SupervisorHTTPSAddress = needEnv(t, "PINNIPED_TEST_SUPERVISOR_HTTPS_ADDRESS") require.NotRegexp(t, "^[0-9]", result.SupervisorHTTPSAddress, "PINNIPED_TEST_SUPERVISOR_HTTPS_ADDRESS must be a hostname with an optional port and cannot be an IP address",