From 1beb83c8f73fff2cdd6a5efa9e80fbd8aae761bf Mon Sep 17 00:00:00 2001 From: Bruno Carlin Date: Wed, 15 Jan 2025 15:10:55 +0100 Subject: [PATCH 1/2] chore: upgrade golangci-lint-action to v6 --- .forgejo/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 04a2d95..3829101 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: stable - - uses: https://github.com/golangci/golangci-lint-action@v4 + - uses: https://github.com/golangci/golangci-lint-action@v6 tests: runs-on: docker steps: From d24334964092dcd01b9da361a1db2dc8461a27db Mon Sep 17 00:00:00 2001 From: Bruno Carlin Date: Wed, 15 Jan 2025 15:13:29 +0100 Subject: [PATCH 2/2] chore: fix linting error --- adapters.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/adapters.go b/adapters.go index de5bae6..4a28b0b 100644 --- a/adapters.go +++ b/adapters.go @@ -14,6 +14,10 @@ import ( "gopkg.in/yaml.v3" ) +func parseError(err error) error { + return fmt.Errorf("cannot parse config file: %w", err) +} + type filetype int const ( @@ -79,7 +83,7 @@ func marshal(ft filetype, v any) ([]byte, error) { func unmarshalJSON(data []byte, v any) error { err := json.Unmarshal(data, v) if err != nil { - return fmt.Errorf("cannot parse config file: %w", err) + return parseError(err) } return nil @@ -99,7 +103,7 @@ func marshalJSON(v any) ([]byte, error) { func unmarshalTOML(data []byte, v any) error { err := toml.Unmarshal(data, v) if err != nil { - return fmt.Errorf("cannot parse config file: %w", err) + return parseError(err) } return nil @@ -125,7 +129,7 @@ func unmarshalHCL(filepath string, data []byte, v any) error { newDiags := hclFilterDiagnostics(diags) if len(newDiags) > 0 { - return fmt.Errorf("cannot parse config file: %w", newDiags) + return parseError(newDiags) } return nil @@ -159,7 +163,7 @@ func hclFilterDiagnostics(diags hcl.Diagnostics) hcl.Diagnostics { func unmarshalYAML(data []byte, v any) error { err := yaml.Unmarshal(data, v) if err != nil { - return fmt.Errorf("cannot parse config file: %w", err) + return parseError(err) } return nil