From c1e38252aaf5bc06a3917f9d52f4bcb8a4f3353d Mon Sep 17 00:00:00 2001 From: Ompushkaradeep Motilal Date: Fri, 27 Feb 2026 21:32:06 +0000 Subject: [PATCH] (fix): Fix necessary linter issues from gosec,errcheck and static check (#4726) Signed-off-by: ompushkara --- cmd/conformance/main.go | 2 +- cmd/cosign/cli/generate/generate.go | 4 ++-- go.mod | 4 ++-- go.sum | 4 ++-- pkg/cosign/tlog.go | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/conformance/main.go b/cmd/conformance/main.go index 6415341135d..72484fce97c 100644 --- a/cmd/conformance/main.go +++ b/cmd/conformance/main.go @@ -106,7 +106,7 @@ func main() { } default: - log.Fatalf("Unsupported command %s", os.Args[1]) + log.Fatalf("Unsupported command %q", os.Args[1]) } if bundlePath != nil { diff --git a/cmd/cosign/cli/generate/generate.go b/cmd/cosign/cli/generate/generate.go index 21d333945cb..0e29d82f47f 100644 --- a/cmd/cosign/cli/generate/generate.go +++ b/cmd/cosign/cli/generate/generate.go @@ -48,6 +48,6 @@ func GenerateCmd(ctx context.Context, regOpts options.RegistryOptions, imageRef if err != nil { return err } - w.Write(json) - return nil + _, err = w.Write(json) + return err } diff --git a/go.mod b/go.mod index 6df66ecd19c..6304de28ec6 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,6 @@ require ( github.com/go-jose/go-jose/v4 v4.1.3 github.com/go-openapi/runtime v0.29.2 github.com/go-openapi/strfmt v0.25.0 - github.com/go-openapi/swag v0.25.4 github.com/go-openapi/swag/conv v0.25.4 github.com/go-piv/piv-go/v2 v2.4.0 github.com/google/certificate-transparency-go v1.3.2 @@ -163,7 +162,8 @@ require ( github.com/go-openapi/jsonpointer v0.22.4 // indirect github.com/go-openapi/jsonreference v0.21.4 // indirect github.com/go-openapi/loads v0.23.2 // indirect - github.com/go-openapi/spec v0.22.2 // indirect + github.com/go-openapi/spec v0.22.3 // indirect + github.com/go-openapi/swag v0.25.4 // indirect github.com/go-openapi/swag/cmdutils v0.25.4 // indirect github.com/go-openapi/swag/fileutils v0.25.4 // indirect github.com/go-openapi/swag/jsonname v0.25.4 // indirect diff --git a/go.sum b/go.sum index dee86f067ab..622179d0b14 100644 --- a/go.sum +++ b/go.sum @@ -309,8 +309,8 @@ github.com/go-openapi/loads v0.23.2 h1:rJXAcP7g1+lWyBHC7iTY+WAF0rprtM+pm8Jxv1uQJ github.com/go-openapi/loads v0.23.2/go.mod h1:IEVw1GfRt/P2Pplkelxzj9BYFajiWOtY2nHZNj4UnWY= github.com/go-openapi/runtime v0.29.2 h1:UmwSGWNmWQqKm1c2MGgXVpC2FTGwPDQeUsBMufc5Yj0= github.com/go-openapi/runtime v0.29.2/go.mod h1:biq5kJXRJKBJxTDJXAa00DOTa/anflQPhT0/wmjuy+0= -github.com/go-openapi/spec v0.22.2 h1:KEU4Fb+Lp1qg0V4MxrSCPv403ZjBl8Lx1a83gIPU8Qc= -github.com/go-openapi/spec v0.22.2/go.mod h1:iIImLODL2loCh3Vnox8TY2YWYJZjMAKYyLH2Mu8lOZs= +github.com/go-openapi/spec v0.22.3 h1:qRSmj6Smz2rEBxMnLRBMeBWxbbOvuOoElvSvObIgwQc= +github.com/go-openapi/spec v0.22.3/go.mod h1:iIImLODL2loCh3Vnox8TY2YWYJZjMAKYyLH2Mu8lOZs= github.com/go-openapi/strfmt v0.25.0 h1:7R0RX7mbKLa9EYCTHRcCuIPcaqlyQiWNPTXwClK0saQ= github.com/go-openapi/strfmt v0.25.0/go.mod h1:nNXct7OzbwrMY9+5tLX4I21pzcmE6ccMGXl3jFdPfn8= github.com/go-openapi/swag v0.25.4 h1:OyUPUFYDPDBMkqyxOTkqDYFnrhuhi9NR6QVUvIochMU= diff --git a/pkg/cosign/tlog.go b/pkg/cosign/tlog.go index 875dc2a3975..0bb43975b9b 100644 --- a/pkg/cosign/tlog.go +++ b/pkg/cosign/tlog.go @@ -31,7 +31,7 @@ import ( "strings" "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" + "github.com/go-openapi/swag/conv" "github.com/sigstore/cosign/v3/internal/ui" "github.com/sigstore/cosign/v3/pkg/cosign/bundle" "github.com/sigstore/cosign/v3/pkg/cosign/env" @@ -211,7 +211,7 @@ func TLogUpload(ctx context.Context, rekorClient *client.Rekor, signature []byte func TLogUploadWithCustomHash(ctx context.Context, rekorClient *client.Rekor, signature []byte, checksum NamedHash, pemBytes []byte) (*models.LogEntryAnon, error) { re := rekorEntry(checksum, signature, pemBytes) returnVal := models.Hashedrekord{ - APIVersion: swag.String(re.APIVersion()), + APIVersion: conv.Pointer(re.APIVersion()), Spec: re.HashedRekordObj, } return doUpload(ctx, rekorClient, &returnVal) @@ -286,8 +286,8 @@ func rekorEntry(checksum NamedHash, signature, pubKey []byte) hashedrekord_v001. HashedRekordObj: models.HashedrekordV001Schema{ Data: &models.HashedrekordV001SchemaData{ Hash: &models.HashedrekordV001SchemaDataHash{ - Algorithm: swag.String(rekorEntryHashAlgorithm(checksum)), - Value: swag.String(hex.EncodeToString(checksum.Sum(nil))), + Algorithm: conv.Pointer(rekorEntryHashAlgorithm(checksum)), + Value: conv.Pointer(hex.EncodeToString(checksum.Sum(nil))), }, }, Signature: &models.HashedrekordV001SchemaSignature{ @@ -446,7 +446,7 @@ func proposedEntries(b64Sig string, payload, pubKey []byte) ([]models.ProposedEn } re := rekorEntry(sha256CheckSum, signature, pubKey) entry := &models.Hashedrekord{ - APIVersion: swag.String(re.APIVersion()), + APIVersion: conv.Pointer(re.APIVersion()), Spec: re.HashedRekordObj, } proposedEntry = []models.ProposedEntry{entry}