mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-01-07 22:15:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

upgrade linter and fix new lint errors

Browse Source
This commit is contained in:
Ryan Richard
2024-08-19 15:45:32 -07:00
parent bee87395b1
commit 376b83050a
7 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/pinniped/cmd/kubeconfig.go
View File

@@ -745,7 +745,6 @@ func validateKubeconfig(ctx context.Context, flags getKubeconfigParams, kubeconf
func countCACerts(pemData []byte) int {
pool := x509.NewCertPool()
pool.AppendCertsFromPEM(pemData)
//nolint:staticcheck // since we're not using .Subjects() to access the system pool
return len(pool.Subjects())
}

2
hack/lib/lint-version.txt
View File

@@ -1 +1 @@
1.59.1
1.60.1

1
internal/certauthority/certauthority_test.go
View File

@@ -209,7 +209,6 @@ func TestPool(t *testing.T) {
require.NoError(t, err)
pool := ca.Pool()
//nolint:staticcheck // since we're not using .Subjects() to access the system pool
require.Len(t, pool.Subjects(), 1)
}

6
internal/dynamiccert/provider_test.go
View File

@@ -42,7 +42,6 @@ func TestProviderWithDynamicServingCertificateController(t *testing.T) {
cert, err := tls.X509KeyPair(certPEM, keyPEM)
require.NoError(t, err)
//nolint:staticcheck // since we're not using .Subjects() to access the system pool
return pool.Subjects(), []tls.Certificate{cert}
},
},
@@ -71,7 +70,6 @@ func TestProviderWithDynamicServingCertificateController(t *testing.T) {
certKey.UnsetCertKeyContent()
//nolint:staticcheck // since we're not using .Subjects() to access the system pool
return pool.Subjects(), []tls.Certificate{cert}
},
},
@@ -90,7 +88,6 @@ func TestProviderWithDynamicServingCertificateController(t *testing.T) {
cert, err := tls.X509KeyPair(certPEM, keyPEM)
require.NoError(t, err)
//nolint:staticcheck // since we're not using .Subjects() to access the system pool
return newCA.Pool().Subjects(), []tls.Certificate{cert}
},
},
@@ -114,7 +111,6 @@ func TestProviderWithDynamicServingCertificateController(t *testing.T) {
ok := pool.AppendCertsFromPEM(ca.CurrentCABundleContent())
require.True(t, ok, "should have valid non-empty CA bundle")
//nolint:staticcheck // since we're not using .Subjects() to access the system pool
return pool.Subjects(), []tls.Certificate{cert}
},
},
@@ -142,7 +138,6 @@ func TestProviderWithDynamicServingCertificateController(t *testing.T) {
err = ca.SetCertKeyContent(newOtherCA.Bundle(), caKey)
require.NoError(t, err)
//nolint:staticcheck // since we're not using .Subjects() to access the system pool
return newOtherCA.Pool().Subjects(), []tls.Certificate{cert}
},
},
@@ -226,7 +221,6 @@ func poolSubjects(pool *x509.CertPool) [][]byte {
if pool == nil {
return nil
}
//nolint:staticcheck // since we're not using .Subjects() to access the system pool
return pool.Subjects()
}

2
internal/fositestorage/authorizationcode/authorizationcode.go
View File

@@ -189,7 +189,7 @@ type errSerializationFailureWithCause struct {
}
func (e *errSerializationFailureWithCause) Is(err error) bool {
return stderrors.Is(fosite.ErrSerializationFailure, err)
return stderrors.Is(err, fosite.ErrSerializationFailure)
}
func (e *errSerializationFailureWithCause) Unwrap() error {

2
internal/kubeclient/kubeclient_test.go
View File

@@ -949,7 +949,6 @@ func TestUnwrap(t *testing.T) {
server, restConfig := fakekubeapi.Start(t, nil)
//nolint:staticcheck // since we're not using .Subjects() to access the system pool
serverSubjects := server.Client().Transport.(*http.Transport).TLSClientConfig.RootCAs.Subjects()
t.Run("regular client", func(t *testing.T) {
@@ -1148,7 +1147,6 @@ func testUnwrap(t *testing.T, client *Client, serverSubjects [][]byte, tlsConfig
require.Equal(t, ptlsConfig.NextProtos, tlsConfig.NextProtos)
// x509.CertPool has some embedded functions that make it hard to compare so just look at the subjects
//nolint:staticcheck // since we're not using .Subjects() to access the system pool
require.Equal(t, serverSubjects, tlsConfig.RootCAs.Subjects())
})
}

3
internal/registry/clientsecretrequest/rest.go
View File

@@ -7,6 +7,7 @@ package clientsecretrequest
import (
"context"
"encoding/hex"
"errors"
"fmt"
"io"
"slices"
@@ -241,7 +242,7 @@ func (r *REST) validateRequest(
if !ok {
msg := "no namespace information found in request context"
traceValidationFailure(tracer, msg)
return nil, apierrors.NewInternalError(fmt.Errorf(msg))
return nil, apierrors.NewInternalError(errors.New(msg))
}
if err := rest.EnsureObjectNamespaceMatchesRequestNamespace(requestNamespace, clientSecretRequest); err != nil {
traceValidationFailure(tracer, err.Error())