updated ext lib

wakeful · wakeful · commit 50b9d711ce20 · 2024-04-27T21:16:49.000+01:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,12 +18,12 @@ jobs:
       - run: git fetch --force --tags
       - uses: actions/setup-go@v3
         with:
-          go-version: '>=1.19.2'
+          go-version: '>=1.22.2'
           cache: true
       - uses: goreleaser/goreleaser-action@v2
         with:
           distribution: goreleaser
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,11 +1,30 @@
 linters:
   enable-all: true
   disable:
-    - forbidigo
-    - funlen
+    - deadcode
+    - exhaustivestruct
+    - exhaustruct
+    - golint
+    - ifshort
+    - interfacer
     - lll
-    - gochecknoglobals
+    - maligned
+    - nosnakecase
     - paralleltest
     - scopelint
+    - structcheck
     - testpackage
-    - varnamelen
+    - varcheck
+issues:
+  exclude-rules:
+    - path: _test.go
+      linters:
+        - funlen
+        - varnamelen
+linters-settings:
+  depguard:
+    rules:
+      main:
+        allow:
+          - $gostd
+          - github.com/wakeful/yaml2json/pkg/parse
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 # todo add to CI
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
+  rev: v4.6.0
   hooks:
   - id: check-case-conflict
   - id: trailing-whitespace
diff --git a/go.mod b/go.mod
@@ -1,5 +1,5 @@
 module github.com/wakeful/yaml2json
 
-go 1.19
+go 1.22
 
-require gopkg.in/yaml.v2 v2.4.0
+require gopkg.in/yaml.v3 v3.0.1
diff --git a/go.sum b/go.sum
@@ -1,4 +1,4 @@
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/pkg/parse/decode.go b/pkg/parse/decode.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 func decode(input interface{}) interface{} {
diff --git a/pkg/parse/decode_test.go b/pkg/parse/decode_test.go
@@ -116,6 +116,7 @@ bar:
 
 				return
 			}
+
 			if got != tt.want {
 				t.Errorf("ByteSliceToJSON() got = %v, want %v", got, tt.want)
 			}
diff --git a/yaml2json.go b/yaml2json.go
@@ -9,12 +9,10 @@ import (
 	"github.com/wakeful/yaml2json/pkg/parse"
 )
 
-var (
-	showVersion = flag.Bool("version", false, "show version and exit")
-	version     = "dev"
-)
+var version = "dev"
 
 func main() {
+	showVersion := flag.Bool("version", false, "show version and exit")
 	flag.Parse()
 
 	const url = "https://github.com/wakeful/yaml2json"

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"encoding/json"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- "gopkg.in/yaml.v2"`
	`7`	`+ "gopkg.in/yaml.v3"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func decode(input interface{}) interface{} {`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ bar:`
`116`	`116`
`117`	`117`	`return`
`118`	`118`	`}`
	`119`	`+`
`119`	`120`	`if got != tt.want {`
`120`	`121`	`t.Errorf("ByteSliceToJSON() got = %v, want %v", got, tt.want)`
`121`	`122`	`}`