Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmd/app: remove dependency on deprecated github.com/pkg/errors #598

Merged
merged 2 commits into from
May 19, 2022
Merged

cmd/app: remove dependency on deprecated github.com/pkg/errors #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aabd61
cmd/app: remove dependency on deprecated github.com/pkg/errors
zchee May 19, 2022
411ff79
go.mod: go mod tidy
zchee May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/app/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ package app

import (
"context"
"errors"
"fmt"
"net/http"
"strconv"
"strings"
"time"

"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/sigstore/fulcio/pkg/api"
gw "github.com/sigstore/fulcio/pkg/generated/protobuf"
Expand Down
7 changes: 3 additions & 4 deletions cmd/app/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (

ctclient "github.com/google/certificate-transparency-go/client"
"github.com/google/certificate-transparency-go/jsonclient"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
certauth "github.com/sigstore/fulcio/pkg/ca"
Expand Down Expand Up @@ -253,11 +252,11 @@ func runServeCmd(cmd *cobra.Command, args []string) {
func checkServeCmdConfigFile() error {
if serveCmdConfigFilePath != "" {
if _, err := os.Stat(serveCmdConfigFilePath); err != nil {
return errors.Wrap(err, "unable to stat config file provided")
return fmt.Errorf("unable to stat config file provided: %w", err)
}
abspath, err := filepath.Abs(serveCmdConfigFilePath)
if err != nil {
return errors.Wrap(err, "unable to determine absolute path of config file provided")
return fmt.Errorf("unable to determine absolute path of config file provided: %w", err)
}
extWithDot := filepath.Ext(abspath)
ext := strings.TrimPrefix(extWithDot, ".")
Expand All @@ -275,7 +274,7 @@ func checkServeCmdConfigFile() error {
viper.SetConfigType(ext)
viper.AddConfigPath(filepath.Dir(serveCmdConfigFilePath))
if err := viper.ReadInConfig(); err != nil {
return errors.Wrap(err, "unable to parse config file provided")
return fmt.Errorf("unable to parse config file provided: %w", err)
}
}
return nil
Expand Down
3 changes: 1 addition & 2 deletions cmd/app/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package app
import (
"fmt"

"github.com/pkg/errors"
"github.com/sigstore/fulcio/pkg/api"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -50,7 +49,7 @@ func runVersion(opts *versionOptions) error {
if opts.json {
j, err := v.JSONString()
if err != nil {
return errors.Wrap(err, "unable to generate JSON from version info")
return fmt.Errorf("unable to generate JSON from version info: %w", err)
}
res = j
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0
github.com/hashicorp/golang-lru v0.5.4
github.com/magiconair/properties v1.8.6
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.12.2
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.34.0
Expand Down Expand Up @@ -130,6 +129,7 @@ require (
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
Expand Down