diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 3829101..04a2d95 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@v6 + - uses: https://github.com/golangci/golangci-lint-action@v4 tests: runs-on: docker steps: diff --git a/adapters.go b/adapters.go index 4a28b0b..de5bae6 100644 --- a/adapters.go +++ b/adapters.go @@ -14,10 +14,6 @@ import ( "gopkg.in/yaml.v3" ) -func parseError(err error) error { - return fmt.Errorf("cannot parse config file: %w", err) -} - type filetype int const ( @@ -83,7 +79,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 parseError(err) + return fmt.Errorf("cannot parse config file: %w", err) } return nil @@ -103,7 +99,7 @@ func marshalJSON(v any) ([]byte, error) { func unmarshalTOML(data []byte, v any) error { err := toml.Unmarshal(data, v) if err != nil { - return parseError(err) + return fmt.Errorf("cannot parse config file: %w", err) } return nil @@ -129,7 +125,7 @@ func unmarshalHCL(filepath string, data []byte, v any) error { newDiags := hclFilterDiagnostics(diags) if len(newDiags) > 0 { - return parseError(newDiags) + return fmt.Errorf("cannot parse config file: %w", newDiags) } return nil @@ -163,7 +159,7 @@ func hclFilterDiagnostics(diags hcl.Diagnostics) hcl.Diagnostics { func unmarshalYAML(data []byte, v any) error { err := yaml.Unmarshal(data, v) if err != nil { - return parseError(err) + return fmt.Errorf("cannot parse config file: %w", err) } return nil