Migrate error wrapping to use go native logic

Signed-off-by: Marco Franssen <marco.franssen@philips.com>

cmd/slsa-provenance/cli/generate.go

@@ -3,6 +3,7 @@ package cli
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -11,7 +12,6 @@ import (
 	"strings"
 
 	"github.com/peterbourgon/ff/v3/ffcli"
-	"github.com/pkg/errors"
 
 	"github.com/philips-labs/slsa-provenance-action/lib/github"
 	"github.com/philips-labs/slsa-provenance-action/lib/intoto"
@@ -66,12 +66,12 @@ func Generate(w io.Writer) *ffcli.Command {
 
 			var gh github.Context
 			if err := json.Unmarshal([]byte(*githubContext), &gh); err != nil {
-				return errors.Wrap(err, "failed to unmarshal github context json")
+				return fmt.Errorf("failed to unmarshal github context json: %w", err)
 			}
 
 			var runner github.RunnerContext
 			if err := json.Unmarshal([]byte(*runnerContext), &runner); err != nil {
-				return errors.Wrap(err, "failed to unmarshal runner context json")
+				return fmt.Errorf("failed to unmarshal runner context json: %w", err)
 			}
 
 			var env intoto.Provenancer
@@ -92,24 +92,24 @@ func Generate(w io.Writer) *ffcli.Command {
 
 			stmt, err := env.GenerateProvenanceStatement(ctx, *artifactPath)
 			if err != nil {
-				return errors.Wrap(err, "failed to generate provenance")
+				return fmt.Errorf("failed to generate provenance: %w", err)
 			}
 
 			for _, extra := range extraMaterials {
 				content, err := ioutil.ReadFile(extra)
 				if err != nil {
-					return errors.Wrapf(err, "Could not load extra materials from %s", extra)
+					return fmt.Errorf("could not load extra materials from %s: %w", extra, err)
 				}
 				var materials []intoto.Item
 				if err = json.Unmarshal(content, &materials); err != nil {
-					return errors.Wrapf(err, "Invalid JSON in extra materials file %s", extra)
+					return fmt.Errorf("invalid JSON in extra materials file %s: %w", extra, err)
 				}
 				for _, material := range materials {
 					if material.URI == "" {
-						return errors.Errorf("Empty or missing \"uri\" field in %s", extra)
+						return fmt.Errorf("empty or missing \"uri\" field in %s", extra)
 					}
 					if len(material.Digest) == 0 {
-						return errors.Errorf("Empty or missing \"digest\" in %s", extra)
+						return fmt.Errorf("empty or missing \"digest\" in %s", extra)
 					}
 				}
 				stmt.Predicate.Materials = append(stmt.Predicate.Materials, materials...)

cmd/slsa-provenance/cli/generate_test.go

@@ -344,7 +344,7 @@ func TestGenerateCliOptions(t *testing.T) {
 		},
 		{
 			name: "With broken extra materials",
-			err:  fmt.Errorf("Invalid JSON in extra materials file %s: unexpected end of JSON input", path.Join(rootDir, "test-data/materials-broken.not-json")),
+			err:  fmt.Errorf("invalid JSON in extra materials file %s: unexpected end of JSON input", path.Join(rootDir, "test-data/materials-broken.not-json")),
 			arguments: []string{
 				"-artifact_path",
 				path.Join(rootDir, "bin/slsa-provenance"),
@@ -360,7 +360,7 @@ func TestGenerateCliOptions(t *testing.T) {
 		},
 		{
 			name: "With non-existent extra materials",
-			err:  fmt.Errorf("Could not load extra materials from non-existing-folder/unknown-file: open non-existing-folder/unknown-file: no such file or directory"),
+			err:  fmt.Errorf("could not load extra materials from non-existing-folder/unknown-file: open non-existing-folder/unknown-file: no such file or directory"),
 			arguments: []string{
 				"-artifact_path",
 				path.Join(rootDir, "bin/slsa-provenance"),
@@ -376,7 +376,7 @@ func TestGenerateCliOptions(t *testing.T) {
 		},
 		{
 			name: "With broken extra materials (no uri)",
-			err:  fmt.Errorf("Empty or missing \"uri\" field in %s", path.Join(rootDir, "test-data/materials-no-uri.json")),
+			err:  fmt.Errorf("empty or missing \"uri\" field in %s", path.Join(rootDir, "test-data/materials-no-uri.json")),
 			arguments: []string{
 				"-artifact_path",
 				path.Join(rootDir, "bin/slsa-provenance"),
@@ -392,7 +392,7 @@ func TestGenerateCliOptions(t *testing.T) {
 		},
 		{
 			name: "With broken extra materials (no digest)",
-			err:  fmt.Errorf("Empty or missing \"digest\" in %s", path.Join(rootDir, "test-data/materials-no-digest.json")),
+			err:  fmt.Errorf("empty or missing \"digest\" in %s", path.Join(rootDir, "test-data/materials-no-digest.json")),
 			arguments: []string{
 				"-artifact_path",
 				path.Join(rootDir, "bin/slsa-provenance"),

cmd/slsa-provenance/cli/version.go

@@ -11,7 +11,6 @@ import (
 	"text/tabwriter"
 
 	"github.com/peterbourgon/ff/v3/ffcli"
-	"github.com/pkg/errors"
 )
 
 // Base version information.
@@ -50,7 +49,7 @@ func Version(w io.Writer) *ffcli.Command {
 			if *outJSON {
 				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
 			}

go.mod

@@ -5,7 +5,6 @@ go 1.17
 require (
 	github.com/google/go-github/v39 v39.2.0
 	github.com/peterbourgon/ff/v3 v3.1.2
-	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
 )

go.sum

@@ -123,8 +123,6 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
 github.com/peterbourgon/ff/v3 v3.1.2 h1:0GNhbRhO9yHA4CC27ymskOsuRpmX0YQxwxM9UPiP6JM=
 github.com/peterbourgon/ff/v3 v3.1.2/go.mod h1:XNJLY8EIl6MjMVjBS4F0+G0LYoAqs0DTa4rmHHukKDE=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

lib/github/provenance.go

@@ -3,13 +3,12 @@ package github
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"os"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"github.com/philips-labs/slsa-provenance-action/lib/intoto"
 )
 
@@ -28,7 +27,7 @@ func (e *Environment) GenerateProvenanceStatement(ctx context.Context, artifactP
 
 	event := AnyEvent{}
 	if err := json.Unmarshal(e.Context.Event, &event); err != nil {
-		return nil, errors.Wrap(err, "failed to unmarshal github context event json")
+		return nil, fmt.Errorf("failed to unmarshal github context event json: %w", err)
 	}
 
 	stmt := intoto.SLSAProvenanceStatement(