djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Fix typo that prevented compiling with Go 1.19
This commit is contained in:
Ben Petersen 2023-04-03 16:38:59 -04:00 committed by GitHub
commit 64263fdb0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/testutil/tlsassertions/assertions_before_go1.20.go
View File

@ -5,6 +5,6 @@
package tlsassertions package tlsassertions
func GetTlsErrorPrefix() string { func GetTLSErrorPrefix() string {
return "" return ""
} }

22
internal/testutil/tlsassertions/assertions_test.go
View File

@ -1,22 +0,0 @@
// Copyright 2023 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package tlsassertions
import (
"runtime"
"strings"
"testing"
"github.com/stretchr/testify/require"
)
func TestGetTLSErrorPrefix(t *testing.T) {
expected := "tls: failed to verify certificate: "
if strings.Contains(runtime.Version(), "1.19") {
expected = ""
}
require.Equal(t, expected, GetTLSErrorPrefix())
}

6
test/integration/supervisor_oidc_client_test.go
View File

@ -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 // SPDX-License-Identifier: Apache-2.0
package integration package integration
@ -34,7 +34,7 @@ func TestOIDCClientStaticValidation_Parallel(t *testing.T) {
groupFix := strings.NewReplacer(".supervisor.pinniped.dev", ".supervisor."+env.APIGroupSuffix) groupFix := strings.NewReplacer(".supervisor.pinniped.dev", ".supervisor."+env.APIGroupSuffix)
errFix := strings.NewReplacer(makeErrFix(reallyOld)...) 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) t.Cleanup(cancel)
namespaceClient := adminClient.CoreV1().Namespaces() namespaceClient := adminClient.CoreV1().Namespaces()
@ -516,7 +516,7 @@ func makeErrFix(reallyOld bool) []string {
func TestOIDCClientControllerValidations_Parallel(t *testing.T) { func TestOIDCClientControllerValidations_Parallel(t *testing.T) {
env := testlib.IntegrationEnv(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) t.Cleanup(cancel)
secrets := testlib.NewKubernetesClientset(t).CoreV1().Secrets(env.SupervisorNamespace) secrets := testlib.NewKubernetesClientset(t).CoreV1().Secrets(env.SupervisorNamespace)

6
test/integration/supervisor_oidcclientsecret_test.go
View File

@ -211,7 +211,7 @@ func TestKubectlOIDCClientSecretRequest_Parallel(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
t.Parallel() t.Parallel()
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute) ctx, cancel := context.WithTimeout(context.Background(), 13*time.Minute)
t.Cleanup(cancel) t.Cleanup(cancel)
supervisorClient := testlib.NewSupervisorClientset(t) supervisorClient := testlib.NewSupervisorClientset(t)
@ -877,7 +877,7 @@ func TestCreateOIDCClientSecretRequest_Parallel(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
t.Parallel() t.Parallel()
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute) ctx, cancel := context.WithTimeout(context.Background(), 13*time.Minute)
t.Cleanup(cancel) t.Cleanup(cancel)
kubeClient := testlib.NewKubernetesClientset(t) kubeClient := testlib.NewKubernetesClientset(t)
@ -1020,7 +1020,7 @@ func prependSecret(list []string, newItem string) []string {
func TestOIDCClientSecretRequestUnauthenticated_Parallel(t *testing.T) { func TestOIDCClientSecretRequestUnauthenticated_Parallel(t *testing.T) {
env := testlib.IntegrationEnv(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) t.Cleanup(cancel)
client := testlib.NewAnonymousSupervisorClientset(t) client := testlib.NewAnonymousSupervisorClientset(t)