mirror of
https://github.com/vmware-tanzu/pinniped.git
synced 2026-09-06 08:07:08 +00:00
change wording of TLS config loaded success messages
This commit is contained in:
@@ -222,7 +222,7 @@ func TestConciergeJWTAuthenticatorStatus_Parallel(t *testing.T) {
|
||||
Type: "TLSConfigurationValid",
|
||||
Status: "True",
|
||||
Reason: "Success",
|
||||
Message: "spec.tls is valid: loaded TLS configuration",
|
||||
Message: "spec.tls is valid: using configured CA bundle",
|
||||
},
|
||||
},
|
||||
),
|
||||
@@ -424,7 +424,7 @@ func TestConciergeJWTAuthenticatorCRDValidations_Parallel(t *testing.T) {
|
||||
func allSuccessfulJWTAuthenticatorConditions(caBundleExists bool) []metav1.Condition {
|
||||
tlsConfigValidMsg := "no CA bundle specified"
|
||||
if caBundleExists {
|
||||
tlsConfigValidMsg = "spec.tls is valid: loaded TLS configuration"
|
||||
tlsConfigValidMsg = "spec.tls is valid: using configured CA bundle"
|
||||
}
|
||||
return []metav1.Condition{{
|
||||
Type: "AuthenticatorValid",
|
||||
|
||||
@@ -382,7 +382,7 @@ func allSuccessfulWebhookAuthenticatorConditions() []metav1.Condition {
|
||||
Type: "TLSConfigurationValid",
|
||||
Status: "True",
|
||||
Reason: "Success",
|
||||
Message: "spec.tls is valid: loaded TLS configuration",
|
||||
Message: "spec.tls is valid: using configured CA bundle",
|
||||
},
|
||||
{
|
||||
Type: "WebhookConnectionValid",
|
||||
|
||||
@@ -410,7 +410,7 @@ func TestGitHubIDPPhaseAndConditions_Parallel(t *testing.T) {
|
||||
Type: "TLSConfigurationValid",
|
||||
Status: metav1.ConditionTrue,
|
||||
Reason: "Success",
|
||||
Message: "spec.githubAPI.tls is valid: no TLS configuration provided",
|
||||
Message: "spec.githubAPI.tls is valid: no TLS configuration provided: using default root CA bundle from container image",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -479,7 +479,7 @@ func TestGitHubIDPPhaseAndConditions_Parallel(t *testing.T) {
|
||||
Type: "TLSConfigurationValid",
|
||||
Status: metav1.ConditionTrue,
|
||||
Reason: "Success",
|
||||
Message: `spec.githubAPI.tls is valid: no TLS configuration provided`,
|
||||
Message: `spec.githubAPI.tls is valid: no TLS configuration provided: using default root CA bundle from container image`,
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -686,7 +686,7 @@ func TestGitHubIDPSecretInOtherNamespace_Parallel(t *testing.T) {
|
||||
Type: "TLSConfigurationValid",
|
||||
Status: metav1.ConditionTrue,
|
||||
Reason: "Success",
|
||||
Message: "spec.githubAPI.tls is valid: no TLS configuration provided",
|
||||
Message: "spec.githubAPI.tls is valid: no TLS configuration provided: using default root CA bundle from container image",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
@@ -2811,7 +2811,7 @@ func requireSuccessfulLDAPIdentityProviderConditions(t *testing.T, ldapIDP *idpv
|
||||
case "BindSecretValid":
|
||||
require.Equal(t, "loaded bind secret", condition.Message)
|
||||
case "TLSConfigurationValid":
|
||||
require.Equal(t, "spec.tls is valid: loaded TLS configuration", condition.Message)
|
||||
require.Equal(t, "spec.tls is valid: using configured CA bundle", condition.Message)
|
||||
case "LDAPConnectionValid":
|
||||
require.Equal(t, expectedLDAPConnectionValidMessage, condition.Message)
|
||||
}
|
||||
@@ -2836,7 +2836,7 @@ func requireSuccessfulActiveDirectoryIdentityProviderConditions(t *testing.T, ad
|
||||
case "BindSecretValid":
|
||||
require.Equal(t, "loaded bind secret", condition.Message)
|
||||
case "TLSConfigurationValid":
|
||||
require.Equal(t, "spec.tls is valid: loaded TLS configuration", condition.Message)
|
||||
require.Equal(t, "spec.tls is valid: using configured CA bundle", condition.Message)
|
||||
case "LDAPConnectionValid":
|
||||
require.Equal(t, expectedActiveDirectoryConnectionValidMessage, condition.Message)
|
||||
}
|
||||
@@ -2870,7 +2870,7 @@ func requireEventuallySuccessfulLDAPIdentityProviderConditions(t *testing.T, req
|
||||
case "BindSecretValid":
|
||||
requireEventually.Equal("loaded bind secret", condition.Message)
|
||||
case "TLSConfigurationValid":
|
||||
requireEventually.Equal("spec.tls is valid: loaded TLS configuration", condition.Message)
|
||||
requireEventually.Equal("spec.tls is valid: using configured CA bundle", condition.Message)
|
||||
case "LDAPConnectionValid":
|
||||
requireEventually.Equal(expectedLDAPConnectionValidMessage, condition.Message)
|
||||
}
|
||||
@@ -2896,7 +2896,7 @@ func requireEventuallySuccessfulActiveDirectoryIdentityProviderConditions(t *tes
|
||||
case "BindSecretValid":
|
||||
requireEventually.Equal("loaded bind secret", condition.Message)
|
||||
case "TLSConfigurationValid":
|
||||
requireEventually.Equal("spec.tls is valid: loaded TLS configuration", condition.Message)
|
||||
requireEventually.Equal("spec.tls is valid: using configured CA bundle", condition.Message)
|
||||
case "LDAPConnectionValid":
|
||||
requireEventually.Equal(expectedActiveDirectoryConnectionValidMessage, condition.Message)
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ Get "https://127.0.0.1:444444/invalid-url-that-is-really-really-long-nananananan
|
||||
Type: "TLSConfigurationValid",
|
||||
Status: "True",
|
||||
Reason: "Success",
|
||||
Message: `spec.tls is valid: no TLS configuration provided`,
|
||||
Message: `spec.tls is valid: no TLS configuration provided: using default root CA bundle from container image`,
|
||||
},
|
||||
})
|
||||
})
|
||||
@@ -94,7 +94,7 @@ oidc: issuer did not match the issuer returned by provider, expected "` + env.Su
|
||||
Type: "TLSConfigurationValid",
|
||||
Status: "True",
|
||||
Reason: "Success",
|
||||
Message: `spec.tls is valid: loaded TLS configuration`,
|
||||
Message: `spec.tls is valid: using configured CA bundle`,
|
||||
},
|
||||
})
|
||||
})
|
||||
@@ -137,7 +137,7 @@ oidc: issuer did not match the issuer returned by provider, expected "` + env.Su
|
||||
Type: "TLSConfigurationValid",
|
||||
Status: "True",
|
||||
Reason: "Success",
|
||||
Message: `spec.tls is valid: loaded TLS configuration`,
|
||||
Message: `spec.tls is valid: using configured CA bundle`,
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user