Fix some integration tests

This commit is contained in:
Joshua Casey
2024-07-25 10:05:59 -05:00
committed by Ryan Richard
parent 9420bfde5b
commit de86809b69
3 changed files with 6 additions and 7 deletions

View File

@@ -170,7 +170,7 @@ func TestTLSSpecKubeBuilderValidationConcierge_Parallel(t *testing.T) {
performKubectlApply(
t,
webhookYamlBytes,
`webhookauthenticator.authentication.concierge.pinniped.dev`,
fmt.Sprintf(`webhookauthenticator.authentication.concierge.%s`, env.APIGroupSuffix),
tc.expectedErrorSnippets,
"WebhookAuthenticator",
webhookResourceName,
@@ -187,7 +187,7 @@ func TestTLSSpecKubeBuilderValidationConcierge_Parallel(t *testing.T) {
performKubectlApply(
t,
jwtAuthenticatorYamlBytes,
`jwtauthenticator.authentication.concierge.pinniped.dev`,
fmt.Sprintf(`jwtauthenticator.authentication.concierge.%s`, env.APIGroupSuffix),
tc.expectedErrorSnippets,
"JWTAuthenticator",
jwtAuthenticatorResourceName,

View File

@@ -1696,11 +1696,10 @@ func TestE2EFullIntegration_Browser(t *testing.T) {
expectedDownstreamLDAPGroups := env.SupervisorUpstreamLDAP.TestUserDirectGroupsDNs
expectedDownstreamOIDCGroups := env.SupervisorUpstreamOIDC.ExpectedGroups
authenticator := testlib.CreateTestJWTAuthenticator(testCtx, t, defaultJWTAuthenticatorSpec, authenticationv1alpha1.JWTAuthenticatorPhaseError)
createdLDAPProvider := setupClusterForEndToEndLDAPTest(t, expectedDownstreamLDAPUsername, env)
// Having one IDP should put the FederationDomain into a ready state.
testlib.WaitForFederationDomainStatusPhase(testCtx, t, federationDomain.Name, supervisorconfigv1alpha1.FederationDomainPhaseReady)
testlib.WaitForJWTAuthenticatorStatusPhase(testCtx, t, authenticator.Name, authenticationv1alpha1.JWTAuthenticatorPhaseReady)
authenticator := testlib.CreateTestJWTAuthenticator(testCtx, t, defaultJWTAuthenticatorSpec, authenticationv1alpha1.JWTAuthenticatorPhaseReady)
// Create a ClusterRoleBinding to give our test user from the upstream read-only access to the cluster.
testlib.CreateTestClusterRoleBinding(t,

View File

@@ -226,7 +226,7 @@ func TestTLSSpecKubeBuilderValidationSupervisor_Parallel(t *testing.T) {
performKubectlApply(
t,
yamlBytes,
`oidcidentityprovider.idp.supervisor.pinniped.dev`,
fmt.Sprintf(`oidcidentityprovider.idp.supervisor.%s`, env.APIGroupSuffix),
tc.expectedErrorSnippets,
"OIDCIdentityProvider",
resourceName,
@@ -241,7 +241,7 @@ func TestTLSSpecKubeBuilderValidationSupervisor_Parallel(t *testing.T) {
performKubectlApply(
t,
yamlBytes,
`ldapidentityprovider.idp.supervisor.pinniped.dev`,
fmt.Sprintf(`ldapidentityprovider.idp.supervisor.%s`, env.APIGroupSuffix),
tc.expectedErrorSnippets,
"LDAPIdentityProvider",
resourceName,
@@ -256,7 +256,7 @@ func TestTLSSpecKubeBuilderValidationSupervisor_Parallel(t *testing.T) {
performKubectlApply(
t,
yamlBytes,
`activedirectoryidentityprovider.idp.supervisor.pinniped.dev`,
fmt.Sprintf(`activedirectoryidentityprovider.idp.supervisor.%s`, env.APIGroupSuffix),
tc.expectedErrorSnippets,
"ActiveDirectoryIdentityProvider",
resourceName,