more integration tests pass

Signed-off-by: Ashish Amarnath <ashish.amarnath@broadcom.com>
This commit is contained in:
Ashish Amarnath
2024-07-03 00:58:59 -07:00
committed by Ryan Richard
parent edc327ba33
commit afcd80de37
5 changed files with 27 additions and 9 deletions

View File

@@ -289,7 +289,7 @@ func allSuccessfulWebhookAuthenticatorConditions() []metav1.Condition {
Type: "TLSConfigurationValid",
Status: "True",
Reason: "Success",
Message: "successfully parsed specified CA bundle",
Message: "spec.tls is valid: loaded TLS configuration",
},
{
Type: "WebhookConnectionValid",

View File

@@ -452,7 +452,7 @@ func TestGetAPIResourceList(t *testing.T) { //nolint:gocyclo // each t.Run is pr
}
// manually update this value whenever you add additional fields to an API resource and then run the generator
totalExpectedAPIFields := 289
totalExpectedAPIFields := 313
// Because we are parsing text from `kubectl explain` and because the format of that text can change
// over time, make a rudimentary assertion that this test exercised the whole tree of all fields of all

View File

@@ -410,7 +410,7 @@ func TestGitHubIDPPhaseAndConditions_Parallel(t *testing.T) {
Type: "TLSConfigurationValid",
Status: metav1.ConditionTrue,
Reason: "Success",
Message: "spec.githubAPI.tls.certificateAuthorityData is valid",
Message: "spec.githubAPI.tls is valid: no TLS configuration provided",
},
},
},
@@ -479,7 +479,7 @@ func TestGitHubIDPPhaseAndConditions_Parallel(t *testing.T) {
Type: "TLSConfigurationValid",
Status: metav1.ConditionTrue,
Reason: "Success",
Message: `spec.githubAPI.tls.certificateAuthorityData is valid`,
Message: `spec.githubAPI.tls is valid: no TLS configuration provided`,
},
},
},
@@ -686,7 +686,7 @@ func TestGitHubIDPSecretInOtherNamespace_Parallel(t *testing.T) {
Type: "TLSConfigurationValid",
Status: metav1.ConditionTrue,
Reason: "Success",
Message: "spec.githubAPI.tls.certificateAuthorityData is valid",
Message: "spec.githubAPI.tls is valid: no TLS configuration provided",
},
})
}

View File

@@ -2415,7 +2415,7 @@ func requireSuccessfulLDAPIdentityProviderConditions(t *testing.T, ldapIDP *idpv
case "BindSecretValid":
require.Equal(t, "loaded bind secret", condition.Message)
case "TLSConfigurationValid":
require.Equal(t, "loaded TLS configuration", condition.Message)
require.Equal(t, "spec.tls is valid: loaded TLS configuration", condition.Message)
case "LDAPConnectionValid":
require.Equal(t, expectedLDAPConnectionValidMessage, condition.Message)
}
@@ -2440,7 +2440,7 @@ func requireSuccessfulActiveDirectoryIdentityProviderConditions(t *testing.T, ad
case "BindSecretValid":
require.Equal(t, "loaded bind secret", condition.Message)
case "TLSConfigurationValid":
require.Equal(t, "loaded TLS configuration", condition.Message)
require.Equal(t, "spec.tls is valid: loaded TLS configuration", condition.Message)
case "LDAPConnectionValid":
require.Equal(t, expectedActiveDirectoryConnectionValidMessage, condition.Message)
}
@@ -2474,7 +2474,7 @@ func requireEventuallySuccessfulLDAPIdentityProviderConditions(t *testing.T, req
case "BindSecretValid":
requireEventually.Equal("loaded bind secret", condition.Message)
case "TLSConfigurationValid":
requireEventually.Equal("loaded TLS configuration", condition.Message)
requireEventually.Equal("spec.tls is valid: loaded TLS configuration", condition.Message)
case "LDAPConnectionValid":
requireEventually.Equal(expectedLDAPConnectionValidMessage, condition.Message)
}
@@ -2500,7 +2500,7 @@ func requireEventuallySuccessfulActiveDirectoryIdentityProviderConditions(t *tes
case "BindSecretValid":
requireEventually.Equal("loaded bind secret", condition.Message)
case "TLSConfigurationValid":
requireEventually.Equal("loaded TLS configuration", condition.Message)
requireEventually.Equal("spec.tls is valid: loaded TLS configuration", condition.Message)
case "LDAPConnectionValid":
requireEventually.Equal(expectedActiveDirectoryConnectionValidMessage, condition.Message)
}

View File

@@ -46,6 +46,12 @@ Get "https://127.0.0.1:444444/invalid-url-that-is-really-really-long-nananananan
Reason: "Success",
Message: "additionalAuthorizeParameters parameter names are allowed",
},
{
Type: "TLSConfigurationValid",
Status: "True",
Reason: "Success",
Message: `spec.tls is valid: no TLS configuration provided`,
},
})
})
@@ -84,6 +90,12 @@ oidc: issuer did not match the issuer returned by provider, expected "` + env.Su
Reason: "Success",
Message: "additionalAuthorizeParameters parameter names are allowed",
},
{
Type: "TLSConfigurationValid",
Status: "True",
Reason: "Success",
Message: `spec.tls is valid: loaded TLS configuration`,
},
})
})
@@ -121,6 +133,12 @@ oidc: issuer did not match the issuer returned by provider, expected "` + env.Su
Reason: "Success",
Message: "additionalAuthorizeParameters parameter names are allowed",
},
{
Type: "TLSConfigurationValid",
Status: "True",
Reason: "Success",
Message: `spec.tls is valid: loaded TLS configuration`,
},
})
})
}