From 273fd6c98f782764f5b0332c4ecab672cbec5e7b Mon Sep 17 00:00:00 2001 From: GLEF1X Date: Tue, 30 Jul 2024 05:22:45 -0400 Subject: [PATCH] refactor: remove deprecated errors package - Replace errors.Wrap with fmt.Errorf and %w verb --- cli/go.mod | 1 - cli/go.sum | 1 - cli/packages/cmd/export.go | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 3c0a240bb..bcde660ab 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -77,7 +77,6 @@ require ( github.com/muesli/termenv v0.15.2 // indirect github.com/oklog/ulid v1.3.1 // indirect github.com/pelletier/go-toml v1.9.3 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/spf13/afero v1.6.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index 7932bed99..d6f04aed0 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -341,7 +341,6 @@ github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko github.com/petar-dambovaliev/aho-corasick v0.0.0-20211021192214-5ab2d9280aa9 h1:lL+y4Xv20pVlCGyLzNHRC0I0rIHhIL1lTvHizoS/dU8= github.com/petar-dambovaliev/aho-corasick v0.0.0-20211021192214-5ab2d9280aa9/go.mod h1:EHPiTAKtiFmrMldLUNswFwfZ2eJIYBHktdaUTZxYWRw= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/cli/packages/cmd/export.go b/cli/packages/cmd/export.go index 5ae273fdc..f6b028b7a 100644 --- a/cli/packages/cmd/export.go +++ b/cli/packages/cmd/export.go @@ -12,7 +12,6 @@ import ( "github.com/Infisical/infisical-merge/packages/models" "github.com/Infisical/infisical-merge/packages/util" - "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/spf13/cobra" "gopkg.in/yaml.v2" @@ -234,7 +233,7 @@ func formatAsYaml(envs []models.SingleEnvironmentVariable) (string, error) { yamlBytes, err := yaml.Marshal(m) if err != nil { - return "", errors.Wrap(err, "unable to format env variables as yaml") + return "", fmt.Errorf("failed to format environment variables as YAML: %w", err) } return string(yamlBytes), nil