From 2a2e2f532b4d0d0786935448f76b077048bd098b Mon Sep 17 00:00:00 2001
From: Ryan Richard <richardry@vmware.com>
Date: Wed, 10 Mar 2021 14:17:20 -0800
Subject: [PATCH] Remove an integration test that is covered elsewhere now

The same coverage that was supplied by
TestCredentialRequest_OtherwiseValidRequestWithRealTokenShouldFailWhenTheClusterIsNotCapable
is now provided by an assertion at the end of TestImpersonationProxy,
so delete the duplicate test which was failing on GKE because the
impersonation proxy is now active by default on GKE.
---
 .../concierge_credentialrequest_test.go       | 39 ++++---------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/test/integration/concierge_credentialrequest_test.go b/test/integration/concierge_credentialrequest_test.go
index 196670d4..6dedfcac 100644
--- a/test/integration/concierge_credentialrequest_test.go
+++ b/test/integration/concierge_credentialrequest_test.go
@@ -31,11 +31,14 @@ func TestUnsuccessfulCredentialRequest(t *testing.T) {
 	defer cancel()
 
 	response, err := library.CreateTokenCredentialRequest(ctx, t,
-		validCredentialRequestSpecWithRealToken(t, corev1.TypedLocalObjectReference{
-			APIGroup: &auth1alpha1.SchemeGroupVersion.Group,
-			Kind:     "WebhookAuthenticator",
-			Name:     "some-webhook-that-does-not-exist",
-		}),
+		loginv1alpha1.TokenCredentialRequestSpec{
+			Token: env.TestUser.Token,
+			Authenticator: corev1.TypedLocalObjectReference{
+				APIGroup: &auth1alpha1.SchemeGroupVersion.Group,
+				Kind:     "WebhookAuthenticator",
+				Name:     "some-webhook-that-does-not-exist",
+			},
+		},
 	)
 	require.NoError(t, err)
 	require.Nil(t, response.Status.Credential)
@@ -182,32 +185,6 @@ func TestCredentialRequest_ShouldFailWhenRequestDoesNotIncludeToken(t *testing.T
 	require.Nil(t, response.Status.Credential)
 }
 
-func TestCredentialRequest_OtherwiseValidRequestWithRealTokenShouldFailWhenTheClusterIsNotCapable(t *testing.T) {
-	env := library.IntegrationEnv(t).WithoutCapability(library.ClusterSigningKeyIsAvailable)
-
-	library.AssertNoRestartsDuringTest(t, env.ConciergeNamespace, "")
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
-
-	testWebhook := library.CreateTestWebhookAuthenticator(ctx, t)
-
-	response, err := library.CreateTokenCredentialRequest(ctx, t, validCredentialRequestSpecWithRealToken(t, testWebhook))
-
-	require.NoError(t, err)
-
-	require.Empty(t, response.Spec)
-	require.Nil(t, response.Status.Credential)
-	require.Equal(t, stringPtr("authentication failed"), response.Status.Message)
-}
-
-func validCredentialRequestSpecWithRealToken(t *testing.T, authenticator corev1.TypedLocalObjectReference) loginv1alpha1.TokenCredentialRequestSpec {
-	return loginv1alpha1.TokenCredentialRequestSpec{
-		Token:         library.IntegrationEnv(t).TestUser.Token,
-		Authenticator: authenticator,
-	}
-}
-
 func stringPtr(s string) *string {
 	return &s
 }