Merge pull request #1469 from vmware-tanzu/fix_typo_for_go1.19

Fix typo that prevented compiling with Go 1.19
vmware-tanzu · Apr 3, 2023 · 64263fd · 64263fd
2 parents 6ae3c0a + a041295
commit 64263fd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 29 deletions.
diff --git a/internal/testutil/tlsassertions/assertions_before_go1.20.go b/internal/testutil/tlsassertions/assertions_before_go1.20.go
@@ -5,6 +5,6 @@
 
 package tlsassertions
 
-func GetTlsErrorPrefix() string {
+func GetTLSErrorPrefix() string {
 	return ""
 }
diff --git a/internal/testutil/tlsassertions/assertions_test.go b/internal/testutil/tlsassertions/assertions_test.go
diff --git a/test/integration/supervisor_oidc_client_test.go b/test/integration/supervisor_oidc_client_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 the Pinniped contributors. All Rights Reserved.
+// Copyright 2022-2023 the Pinniped contributors. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package integration
@@ -34,7 +34,7 @@ func TestOIDCClientStaticValidation_Parallel(t *testing.T) {
 	groupFix := strings.NewReplacer(".supervisor.pinniped.dev", ".supervisor."+env.APIGroupSuffix)
 	errFix := strings.NewReplacer(makeErrFix(reallyOld)...)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
 	t.Cleanup(cancel)
 
 	namespaceClient := adminClient.CoreV1().Namespaces()
@@ -516,7 +516,7 @@ func makeErrFix(reallyOld bool) []string {
 func TestOIDCClientControllerValidations_Parallel(t *testing.T) {
 	env := testlib.IntegrationEnv(t)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
 	t.Cleanup(cancel)
 
 	secrets := testlib.NewKubernetesClientset(t).CoreV1().Secrets(env.SupervisorNamespace)

diff --git a/test/integration/supervisor_oidcclientsecret_test.go b/test/integration/supervisor_oidcclientsecret_test.go
@@ -211,7 +211,7 @@ func TestKubectlOIDCClientSecretRequest_Parallel(t *testing.T) {
 
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
+			ctx, cancel := context.WithTimeout(context.Background(), 13*time.Minute)
 			t.Cleanup(cancel)
 
 			supervisorClient := testlib.NewSupervisorClientset(t)
@@ -877,7 +877,7 @@ func TestCreateOIDCClientSecretRequest_Parallel(t *testing.T) {
 
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
+			ctx, cancel := context.WithTimeout(context.Background(), 13*time.Minute)
 			t.Cleanup(cancel)
 
 			kubeClient := testlib.NewKubernetesClientset(t)
@@ -1020,7 +1020,7 @@ func prependSecret(list []string, newItem string) []string {
 func TestOIDCClientSecretRequestUnauthenticated_Parallel(t *testing.T) {
 	env := testlib.IntegrationEnv(t)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
+	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute)
 	t.Cleanup(cancel)
 
 	client := testlib.NewAnonymousSupervisorClientset(t)