use standard errors package

Signed-off-by: Matthieu MOREL <[email protected]>

Author: mmorel-35

.golangci.yml

@@ -1,18 +1,20 @@
-run:
-  deadline: 2m
-
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
 linters:
   disable-all: true
   enable:
+  - errorlint
   - gocritic
   - gofmt
   - goimports
-  - revive
+  - gomodguard
   - gosimple
+  - govet
   - ineffassign
   - misspell
   - nakedret
-  - govet
+  - revive
 linters-settings:
   gocritic:
     # Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks.
@@ -25,3 +27,12 @@ linters-settings:
       - paramTypeCombine
       - unnamedResult
       - whyNoLint
+  gomodguard:
+    blocked:
+      modules:
+      - github.com/pkg/errors:
+          recommendations:
+          - errors
+          - fmt
+run:
+  timeout: 2m

cli/options.go

@@ -18,13 +18,13 @@ package cli
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
 	"github.com/compose-spec/compose-go/v2/consts"
@@ -472,7 +472,7 @@ func getConfigPathsFromOptions(options *ProjectOptions) ([]string, error) {
 	if len(options.ConfigPaths) != 0 {
 		return absolutePaths(options.ConfigPaths)
 	}
-	return nil, errors.Wrap(errdefs.ErrNotFound, "no configuration file provided")
+	return nil, fmt.Errorf("no configuration file provided: %w", errdefs.ErrNotFound)
 }
 
 func findFiles(names []string, pwd string) []string {

dotenv/env.go

@@ -18,10 +18,9 @@ package dotenv
 
 import (
 	"bytes"
+	"fmt"
 	"os"
 	"path/filepath"
-
-	"github.com/pkg/errors"
 )
 
 func GetEnvFromFile(currentEnv map[string]string, filenames []string) (map[string]string, error) {
@@ -36,7 +35,7 @@ func GetEnvFromFile(currentEnv map[string]string, filenames []string) (map[strin
 
 		s, err := os.Stat(dotEnvFile)
 		if os.IsNotExist(err) {
-			return envMap, errors.Errorf("Couldn't find env file: %s", dotEnvFile)
+			return envMap, fmt.Errorf("Couldn't find env file: %s", dotEnvFile)
 		}
 		if err != nil {
 			return envMap, err
@@ -46,12 +45,12 @@ func GetEnvFromFile(currentEnv map[string]string, filenames []string) (map[strin
 			if len(filenames) == 0 {
 				return envMap, nil
 			}
-			return envMap, errors.Errorf("%s is a directory", dotEnvFile)
+			return envMap, fmt.Errorf("%s is a directory", dotEnvFile)
 		}
 
 		b, err := os.ReadFile(dotEnvFile)
 		if os.IsNotExist(err) {
-			return nil, errors.Errorf("Couldn't read env file: %s", dotEnvFile)
+			return nil, fmt.Errorf("Couldn't read env file: %s", dotEnvFile)
 		}
 		if err != nil {
 			return envMap, err
@@ -66,7 +65,7 @@ func GetEnvFromFile(currentEnv map[string]string, filenames []string) (map[strin
 			return v, ok
 		})
 		if err != nil {
-			return envMap, errors.Wrapf(err, "failed to read %s", dotEnvFile)
+			return envMap, fmt.Errorf("failed to read %s: %w", dotEnvFile, err)
 		}
 		for k, v := range env {
 			envMap[k] = v

dotenv/godotenv_test.go

@@ -2,6 +2,7 @@ package dotenv
 
 import (
 	"bytes"
+	"errors"
 	"os"
 	"path/filepath"
 	"strings"
@@ -48,7 +49,8 @@ func loadEnvAndCompareValues(t *testing.T, loader func(files ...string) error, e
 
 func TestLoadWithNoArgsLoadsDotEnv(t *testing.T) {
 	err := Load()
-	pathError := err.(*os.PathError)
+	var pathError *os.PathError
+	errors.As(err, &pathError)
 	if pathError == nil || pathError.Op != "open" || pathError.Path != ".env" {
 		t.Errorf("Didn't try and open .env by default")
 	}

format/volume.go

@@ -17,12 +17,13 @@
 package format
 
 import (
+	"errors"
+	"fmt"
 	"strings"
 	"unicode"
 	"unicode/utf8"
 
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/pkg/errors"
 )
 
 const endOfSpec = rune(0)
@@ -48,7 +49,7 @@ func ParseVolume(spec string) (types.ServiceVolumeConfig, error) {
 		case char == ':' || char == endOfSpec:
 			if err := populateFieldFromBuffer(char, buffer, &volume); err != nil {
 				populateType(&volume)
-				return volume, errors.Wrapf(err, "invalid spec: %s", spec)
+				return volume, fmt.Errorf("invalid spec: %s: %w", spec, err)
 			}
 			buffer = nil
 		default:

interpolation/interpolation.go

@@ -17,11 +17,12 @@
 package interpolation
 
 import (
+	"errors"
+	"fmt"
 	"os"
 
 	"github.com/compose-spec/compose-go/v2/template"
 	"github.com/compose-spec/compose-go/v2/tree"
-	"github.com/pkg/errors"
 )
 
 // Options supported by Interpolate
@@ -80,7 +81,10 @@ func recursiveInterpolate(value interface{}, path tree.Path, opts Options) (inte
 			return newValue, nil
 		}
 		casted, err := caster(newValue)
-		return casted, newPathError(path, errors.Wrap(err, "failed to cast to expected type"))
+		if err != nil {
+			return casted, newPathError(path, fmt.Errorf("failed to cast to expected type: %w", err))
+		}
+		return casted, nil
 
 	case map[string]interface{}:
 		out := map[string]interface{}{}
@@ -110,15 +114,16 @@ func recursiveInterpolate(value interface{}, path tree.Path, opts Options) (inte
 }
 
 func newPathError(path tree.Path, err error) error {
-	switch err := err.(type) {
-	case nil:
+	var ite *template.InvalidTemplateError
+	switch {
+	case err == nil:
 		return nil
-	case *template.InvalidTemplateError:
-		return errors.Errorf(
+	case errors.As(err, &ite):
+		return fmt.Errorf(
 			"invalid interpolation format for %s.\nYou may need to escape any $ with another $.\n%s",
-			path, err.Template)
+			path, ite.Template)
 	default:
-		return errors.Wrapf(err, "error while interpolating %s", path)
+		return fmt.Errorf("error while interpolating %s: %w", path, err)
 	}
 }
 

loader/include.go

@@ -27,7 +27,6 @@ import (
 	"github.com/compose-spec/compose-go/v2/dotenv"
 	interp "github.com/compose-spec/compose-go/v2/interpolation"
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/pkg/errors"
 )
 
 // loadIncludeConfig parse the require config from raw yaml
@@ -64,7 +63,7 @@ func ApplyInclude(ctx context.Context, configDetails types.ConfigDetails, model
 		for _, f := range included {
 			if f == mainFile {
 				included = append(included, mainFile)
-				return errors.Errorf("include cycle detected:\n%s\n include %s", included[0], strings.Join(included[1:], "\n include "))
+				return fmt.Errorf("include cycle detected:\n%s\n include %s", included[0], strings.Join(included[1:], "\n include "))
 			}
 		}
 

loader/interpolate.go

@@ -17,12 +17,12 @@
 package loader
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 
 	interp "github.com/compose-spec/compose-go/v2/interpolation"
 	"github.com/compose-spec/compose-go/v2/tree"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
@@ -112,6 +112,6 @@ func toBoolean(value string) (interface{}, error) {
 		logrus.Warnf("%q for boolean is not supported by YAML 1.2, please use `false`", value)
 		return false, nil
 	default:
-		return nil, errors.Errorf("invalid boolean: %s", value)
+		return nil, fmt.Errorf("invalid boolean: %s", value)
 	}
 }

loader/loader.go

@@ -19,6 +19,7 @@ package loader
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -39,7 +40,6 @@ import (
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/compose-spec/compose-go/v2/validation"
 	"github.com/mitchellh/mapstructure"
-	"github.com/pkg/errors"
 	"gopkg.in/yaml.v3"
 )
 
@@ -226,7 +226,7 @@ func parseYAML(decoder *yaml.Decoder) (map[string]interface{}, PostProcessor, er
 	}
 	cfgMap, ok := cfg.(map[interface{}]interface{})
 	if !ok {
-		return nil, nil, errors.Errorf("Top-level object must be a mapping")
+		return nil, nil, errors.New("Top-level object must be a mapping")
 	}
 	converted, err := convertToStringKeysRecursive(cfgMap, "")
 	if err != nil {
@@ -244,7 +244,7 @@ func Load(configDetails types.ConfigDetails, options ...func(*Options)) (*types.
 // LoadWithContext reads a ConfigDetails and returns a fully loaded configuration
 func LoadWithContext(ctx context.Context, configDetails types.ConfigDetails, options ...func(*Options)) (*types.Project, error) {
 	if len(configDetails.ConfigFiles) < 1 {
-		return nil, errors.Errorf("No files specified")
+		return nil, errors.New("No files specified")
 	}
 
 	opts := &Options{
@@ -351,7 +351,7 @@ func loadYamlModel(ctx context.Context, config types.ConfigDetails, opts *Option
 				var raw interface{}
 				processor := &ResetProcessor{target: &raw}
 				err := decoder.Decode(processor)
-				if err == io.EOF {
+				if err != nil && errors.Is(err, io.EOF) {
 					break
 				}
 				if err != nil {
@@ -402,7 +402,7 @@ func load(ctx context.Context, configDetails types.ConfigDetails, opts *Options,
 	for _, f := range loaded {
 		if f == mainFile {
 			loaded = append(loaded, mainFile)
-			return nil, errors.Errorf("include cycle detected:\n%s\n include %s", loaded[0], strings.Join(loaded[1:], "\n include "))
+			return nil, fmt.Errorf("include cycle detected:\n%s\n include %s", loaded[0], strings.Join(loaded[1:], "\n include "))
 		}
 	}
 	loaded = append(loaded, mainFile)
@@ -692,7 +692,7 @@ func formatInvalidKeyError(keyPrefix string, key interface{}) error {
 	} else {
 		location = fmt.Sprintf("in %s", keyPrefix)
 	}
-	return errors.Errorf("Non-string key %s: %#v", location, key)
+	return fmt.Errorf("Non-string key %s: %#v", location, key)
 }
 
 // Windows path, c:\\my\\path\\shiny, need to be changed to be compatible with

loader/normalize.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/compose-spec/compose-go/v2/errdefs"
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
@@ -246,7 +245,7 @@ func relocateLogOpt(s *types.ServiceConfig) error {
 			if _, ok := s.Logging.Options[k]; !ok {
 				s.Logging.Options[k] = v
 			} else {
-				return errors.Wrap(errdefs.ErrInvalid, "can't use both 'log_opt' (deprecated) and 'logging.options'")
+				return fmt.Errorf("can't use both 'log_opt' (deprecated) and 'logging.options': %w", errdefs.ErrInvalid)
 			}
 		}
 	}
@@ -262,7 +261,7 @@ func relocateLogDriver(s *types.ServiceConfig) error {
 		if s.Logging.Driver == "" {
 			s.Logging.Driver = s.LogDriver
 		} else {
-			return errors.Wrap(errdefs.ErrInvalid, "can't use both 'log_driver' (deprecated) and 'logging.driver'")
+			return fmt.Errorf("can't use both 'log_driver' (deprecated) and 'logging.driver': %w", errdefs.ErrInvalid)
 		}
 	}
 	return nil
@@ -277,7 +276,7 @@ func relocateDockerfile(s *types.ServiceConfig) error {
 		if s.Dockerfile == "" {
 			s.Build.Dockerfile = s.Dockerfile
 		} else {
-			return errors.Wrap(errdefs.ErrInvalid, "can't use both 'dockerfile' (deprecated) and 'build.dockerfile'")
+			return fmt.Errorf("can't use both 'dockerfile' (deprecated) and 'build.dockerfile': %w", errdefs.ErrInvalid)
 		}
 	}
 	return nil