diff --git a/sign/impl.go b/sign/impl.go index e90d32f..f4bbc59 100644 --- a/sign/impl.go +++ b/sign/impl.go @@ -67,7 +67,9 @@ type impl interface { NewRekorClient(string) (*client.Rekor, error) } -func (*defaultImpl) VerifyFileInternal(ctx context.Context, ko sign.KeyOpts, outputSignature, outputCertificate, path string) error { +func (*defaultImpl) VerifyFileInternal(ctx context.Context, ko sign.KeyOpts, outputSignature, // nolint: gocritic + outputCertificate, path string, +) error { return verify.VerifyBlobCmd(ctx, ko, outputCertificate, "", "", "", outputSignature, path, false) } @@ -175,6 +177,6 @@ func (*defaultImpl) PayloadBytes(blobRef string) (blobBytes []byte, err error) { return blobBytes, nil } -func (*defaultImpl) NewRekorClient(rekorUrl string) (*client.Rekor, error) { - return rekor.NewClient(rekorUrl) +func (*defaultImpl) NewRekorClient(rekorURL string) (*client.Rekor, error) { + return rekor.NewClient(rekorURL) } diff --git a/sign/sign.go b/sign/sign.go index b683398..33f1d5d 100644 --- a/sign/sign.go +++ b/sign/sign.go @@ -342,11 +342,10 @@ func (s *Signer) IsImageSigned(imageRef string) (bool, error) { // IsFileSigned takes an path reference and retrusn true if there is a signature // available for it. It makes no signature verification, only checks to see if // more then one signature is available. -func (s *Signer) IsFileSigned(ctx context.Context, ko sign.KeyOpts, path string) (bool, error) { - +func (s *Signer) IsFileSigned(ctx context.Context, ko sign.KeyOpts, path string) (bool, error) { // nolint: gocritic rClient, err := s.impl.NewRekorClient(ko.RekorURL) if err != nil { - return false, fmt.Errorf("creating rekor client", err) + return false, fmt.Errorf("creating rekor client: %w", err) } blobBytes, err := s.impl.PayloadBytes(path) diff --git a/sign/sign_test.go b/sign/sign_test.go index f642a8a..5001a77 100644 --- a/sign/sign_test.go +++ b/sign/sign_test.go @@ -211,7 +211,7 @@ func TestSignFile(t *testing.T) { }{ { // Success prepare: func(mock *signfakes.FakeImpl) { - mock.VerifyFileInternalReturns(&sign.SignedObject{}, nil) + mock.VerifyFileInternalReturns(nil) }, assert: func(obj *sign.SignedObject, err error) { require.NotNil(t, obj) @@ -222,7 +222,7 @@ func TestSignFile(t *testing.T) { }, { // Failure on Verify prepare: func(mock *signfakes.FakeImpl) { - mock.VerifyFileInternalReturns(nil, errTest) + mock.VerifyFileInternalReturns(errTest) }, assert: func(obj *sign.SignedObject, err error) { require.NotNil(t, err)