diff --git a/cmd/rekor-cli/app/log_info.go b/cmd/rekor-cli/app/log_info.go index f0a05a435..9a7f27107 100644 --- a/cmd/rekor-cli/app/log_info.go +++ b/cmd/rekor-cli/app/log_info.go @@ -21,11 +21,11 @@ import ( "crypto/x509" "encoding/hex" "encoding/pem" + "errors" "fmt" "time" "github.com/go-openapi/swag" - "github.com/pkg/errors" rclient "github.com/sigstore/rekor/pkg/generated/client" "github.com/sigstore/rekor/pkg/generated/models" "github.com/spf13/cobra" diff --git a/cmd/rekor-server/app/watch.go b/cmd/rekor-server/app/watch.go index e4efd24fd..563a29e4f 100644 --- a/cmd/rekor-server/app/watch.go +++ b/cmd/rekor-server/app/watch.go @@ -21,6 +21,7 @@ import ( "crypto/x509" "encoding/json" "encoding/pem" + "errors" "flag" "fmt" "os" @@ -29,7 +30,6 @@ import ( _ "gocloud.dev/blob/fileblob" // fileblob _ "gocloud.dev/blob/gcsblob" - "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" "gocloud.dev/blob" diff --git a/pkg/sharding/ranges.go b/pkg/sharding/ranges.go index 8b864cbf9..891806380 100644 --- a/pkg/sharding/ranges.go +++ b/pkg/sharding/ranges.go @@ -18,6 +18,7 @@ package sharding import ( "context" "encoding/base64" + "errors" "fmt" "io/ioutil" "strconv" @@ -26,7 +27,6 @@ import ( "github.com/ghodss/yaml" "github.com/google/trillian" "github.com/google/trillian/types" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/log" ) @@ -55,12 +55,12 @@ func NewLogRanges(ctx context.Context, logClient trillian.TrillianLogClient, pat // otherwise, try to read contents of the sharding config ranges, err := logRangesFromPath(path) if err != nil { - return LogRanges{}, fmt.Errorf("log ranges from path: %w: %w", err) + return LogRanges{}, fmt.Errorf("log ranges from path: %w", err) } for i, r := range ranges { r, err := updateRange(ctx, logClient, r) if err != nil { - return LogRanges{}, fmt.Errorf("updating range for tree id %d: %w: %w", r.TreeID, err) + return LogRanges{}, fmt.Errorf("updating range for tree id %d: %w", r.TreeID, err) } ranges[i] = r } @@ -93,7 +93,7 @@ func updateRange(ctx context.Context, logClient trillian.TrillianLogClient, r Lo if r.TreeLength == 0 { resp, err := logClient.GetLatestSignedLogRoot(ctx, &trillian.GetLatestSignedLogRootRequest{LogId: r.TreeID}) if err != nil { - return LogRange{}, fmt.Errorf("getting signed log root for tree %d: %w: %w", r.TreeID, err) + return LogRange{}, fmt.Errorf("getting signed log root for tree %d: %w", r.TreeID, err) } var root types.LogRootV1 if err := root.UnmarshalBinary(resp.SignedLogRoot.LogRoot); err != nil { diff --git a/pkg/types/alpine/alpine.go b/pkg/types/alpine/alpine.go index 8565efd75..fb18a2e1b 100644 --- a/pkg/types/alpine/alpine.go +++ b/pkg/types/alpine/alpine.go @@ -17,9 +17,9 @@ package alpine import ( "context" + "errors" "fmt" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/generated/models" "github.com/sigstore/rekor/pkg/types" ) diff --git a/pkg/types/alpine/apk.go b/pkg/types/alpine/apk.go index 8aa5cf96f..51e2d61c5 100644 --- a/pkg/types/alpine/apk.go +++ b/pkg/types/alpine/apk.go @@ -25,12 +25,12 @@ import ( "crypto/sha256" "encoding/hex" "encoding/pem" + "errors" "fmt" "hash" "io" "strings" - "github.com/pkg/errors" "github.com/sigstore/sigstore/pkg/signature" "github.com/sigstore/sigstore/pkg/signature/options" "gopkg.in/ini.v1" @@ -178,12 +178,12 @@ func (p *Package) Unmarshal(pkgReader io.Reader) error { if header.Name == ".PKGINFO" { pkginfoContent := make([]byte, header.Size) if _, err = ctlReader.Read(pkginfoContent); err != nil && err != io.EOF { - return fmt.Errorf("reading .PKGINFO: %w: %w", err) + return fmt.Errorf("reading .PKGINFO: %w", err) } pkg.Pkginfo, err = parsePkginfo(pkginfoContent) if err != nil { - return fmt.Errorf("parsing .PKGINFO: %w: %w", err) + return fmt.Errorf("parsing .PKGINFO: %w", err) } pkg.Datahash, err = hex.DecodeString(pkg.Pkginfo["datahash"]) if err != nil { diff --git a/pkg/types/hashedrekord/hashedrekord.go b/pkg/types/hashedrekord/hashedrekord.go index 1d7930c1d..4d27edf57 100644 --- a/pkg/types/hashedrekord/hashedrekord.go +++ b/pkg/types/hashedrekord/hashedrekord.go @@ -17,9 +17,9 @@ package hashedrekord import ( "context" + "errors" "fmt" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/generated/models" "github.com/sigstore/rekor/pkg/types" ) @@ -64,7 +64,7 @@ func (rt *BaseRekordType) CreateProposedEntry(ctx context.Context, version strin } ei, err := rt.VersionedUnmarshal(nil, version) if err != nil { - return nil, fmt.Errorf("fetching hashed Rekord version implementation: %w: %w", err) + return nil, fmt.Errorf("fetching hashed Rekord version implementation: %w", err) } return ei.CreateFromArtifactProperties(ctx, props) diff --git a/pkg/types/hashedrekord/v0.0.1/entry.go b/pkg/types/hashedrekord/v0.0.1/entry.go index 9f802d990..a1b9fc058 100644 --- a/pkg/types/hashedrekord/v0.0.1/entry.go +++ b/pkg/types/hashedrekord/v0.0.1/entry.go @@ -21,6 +21,7 @@ import ( "crypto/sha256" "encoding/hex" "encoding/json" + "errors" "fmt" "io/ioutil" "path/filepath" @@ -29,7 +30,6 @@ import ( "github.com/asaskevich/govalidator" "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/generated/models" "github.com/sigstore/rekor/pkg/log" diff --git a/pkg/types/helm/helm.go b/pkg/types/helm/helm.go index a976f126b..f4e4b3303 100644 --- a/pkg/types/helm/helm.go +++ b/pkg/types/helm/helm.go @@ -17,9 +17,9 @@ package helm import ( "context" + "errors" "fmt" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/generated/models" "github.com/sigstore/rekor/pkg/types" ) diff --git a/pkg/types/helm/provenance.go b/pkg/types/helm/provenance.go index 18c21a0d1..f5a8bc8f3 100644 --- a/pkg/types/helm/provenance.go +++ b/pkg/types/helm/provenance.go @@ -17,12 +17,12 @@ package helm import ( "bytes" + "errors" "fmt" "io" "strings" "github.com/ghodss/yaml" - "github.com/pkg/errors" "golang.org/x/crypto/openpgp/clearsign" ) diff --git a/pkg/types/helm/v0.0.1/entry.go b/pkg/types/helm/v0.0.1/entry.go index 63c5ec828..9b95f8dbc 100644 --- a/pkg/types/helm/v0.0.1/entry.go +++ b/pkg/types/helm/v0.0.1/entry.go @@ -21,6 +21,7 @@ import ( "crypto/sha256" "encoding/hex" "encoding/json" + "errors" "fmt" "io" "io/ioutil" @@ -28,8 +29,6 @@ import ( "path/filepath" "strings" - "github.com/pkg/errors" - "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/sigstore/rekor/pkg/generated/models" diff --git a/pkg/types/intoto/intoto.go b/pkg/types/intoto/intoto.go index 224a8a5f4..f48daacbe 100644 --- a/pkg/types/intoto/intoto.go +++ b/pkg/types/intoto/intoto.go @@ -17,9 +17,9 @@ package intoto import ( "context" + "errors" "fmt" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/generated/models" "github.com/sigstore/rekor/pkg/types" ) diff --git a/pkg/types/intoto/v0.0.1/entry.go b/pkg/types/intoto/v0.0.1/entry.go index 20cc429fa..81498367a 100644 --- a/pkg/types/intoto/v0.0.1/entry.go +++ b/pkg/types/intoto/v0.0.1/entry.go @@ -35,7 +35,7 @@ import ( "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - "github.com/pkg/errors" + "errors" "github.com/sigstore/rekor/pkg/generated/models" "github.com/sigstore/rekor/pkg/log" diff --git a/pkg/types/jar/jar.go b/pkg/types/jar/jar.go index 9f37a0bd2..6883a4138 100644 --- a/pkg/types/jar/jar.go +++ b/pkg/types/jar/jar.go @@ -17,9 +17,9 @@ package jar import ( "context" + "errors" "fmt" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/generated/models" "github.com/sigstore/rekor/pkg/types" ) diff --git a/pkg/types/rekord/rekord.go b/pkg/types/rekord/rekord.go index f5bccc54f..902dbf71e 100644 --- a/pkg/types/rekord/rekord.go +++ b/pkg/types/rekord/rekord.go @@ -17,9 +17,9 @@ package rekord import ( "context" + "errors" "fmt" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/generated/models" "github.com/sigstore/rekor/pkg/types" ) diff --git a/pkg/types/rfc3161/rfc3161.go b/pkg/types/rfc3161/rfc3161.go index e2762d33f..19ba0e5ed 100644 --- a/pkg/types/rfc3161/rfc3161.go +++ b/pkg/types/rfc3161/rfc3161.go @@ -17,9 +17,9 @@ package rfc3161 import ( "context" + "errors" "fmt" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/generated/models" "github.com/sigstore/rekor/pkg/types" ) diff --git a/pkg/types/rpm/rpm.go b/pkg/types/rpm/rpm.go index 80e41d5ed..880970a04 100644 --- a/pkg/types/rpm/rpm.go +++ b/pkg/types/rpm/rpm.go @@ -17,9 +17,9 @@ package rpm import ( "context" + "errors" "fmt" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/generated/models" "github.com/sigstore/rekor/pkg/types" ) diff --git a/pkg/types/tuf/tuf.go b/pkg/types/tuf/tuf.go index d4d3f3ae9..a021ffe61 100644 --- a/pkg/types/tuf/tuf.go +++ b/pkg/types/tuf/tuf.go @@ -17,9 +17,9 @@ package tuf import ( "context" + "errors" "fmt" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/types" "github.com/sigstore/rekor/pkg/generated/models" diff --git a/pkg/util/checkpoint.go b/pkg/util/checkpoint.go index 6a3350289..028cb64c9 100644 --- a/pkg/util/checkpoint.go +++ b/pkg/util/checkpoint.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/pkg/errors" + "errors" ) // heavily borrowed from https://github.com/google/trillian-examples/blob/master/formats/log/checkpoint.go diff --git a/pkg/util/pubkey.go b/pkg/util/pubkey.go index 82d0904b6..06c49ca23 100644 --- a/pkg/util/pubkey.go +++ b/pkg/util/pubkey.go @@ -18,8 +18,8 @@ package util import ( "context" "crypto/ecdsa" + "errors" - "github.com/pkg/errors" "github.com/sigstore/rekor/pkg/generated/client" "github.com/sigstore/rekor/pkg/generated/client/pubkey" "github.com/sigstore/sigstore/pkg/cryptoutils" diff --git a/pkg/util/signed_note.go b/pkg/util/signed_note.go index 5c784b8df..344af188d 100644 --- a/pkg/util/signed_note.go +++ b/pkg/util/signed_note.go @@ -25,10 +25,10 @@ import ( "crypto/x509" "encoding/base64" "encoding/binary" + "errors" "fmt" "strings" - "github.com/pkg/errors" "github.com/sigstore/sigstore/pkg/signature" "github.com/sigstore/sigstore/pkg/signature/options" "golang.org/x/mod/sumdb/note" diff --git a/pkg/util/timestamp_note.go b/pkg/util/timestamp_note.go index da1731e05..89368fb1c 100644 --- a/pkg/util/timestamp_note.go +++ b/pkg/util/timestamp_note.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "errors" ) // Signed note based timestamp responses