Merge pull request #89 from ramisback/dependency_upgrade

dgoldstein0 · web-flow · commit f7f5a2f9f5bc · 2025-03-26T08:54:20.000-07:00
deps: upgraded dependency
diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/ua-parser/uap-go
 
+go 1.22.11
+
 require (
-	github.com/hashicorp/golang-lru v0.5.4
-	gopkg.in/yaml.v2 v2.2.1
+	github.com/hashicorp/golang-lru v1.0.2
+	gopkg.in/yaml.v3 v3.0.1
 )
diff --git a/go.sum b/go.sum
@@ -1,6 +1,6 @@
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
+github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 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.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+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/uaparser/parser.go b/uaparser/parser.go
@@ -2,14 +2,14 @@ package uaparser
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"regexp"
 	"sort"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 type RegexesDefinitions struct {
@@ -190,7 +190,7 @@ func defaultParserConfig() *parserConfig {
 }
 
 func NewWithOptions(regexFile string, mode, treshold, topCnt int, useSort, debugMode bool, cacheSize int) (*Parser, error) {
-	data, err := ioutil.ReadFile(regexFile)
+	data, err := os.ReadFile(regexFile)
 	if nil != err {
 		return nil, err
 	}
@@ -222,7 +222,7 @@ func NewWithOptions(regexFile string, mode, treshold, topCnt int, useSort, debug
 }
 
 func New(regexFile string) (*Parser, error) {
-	data, err := ioutil.ReadFile(regexFile)
+	data, err := os.ReadFile(regexFile)
 	if nil != err {
 		return nil, err
 	}
@@ -292,7 +292,7 @@ func (parser *Parser) Parse(line string) *Client {
 		}()
 	}
 	wg.Wait()
-	if parser.config.UseSort == true {
+	if parser.config.UseSort {
 		checkAndSort(parser)
 	}
 	return cli
diff --git a/uaparser/parsing_test.go b/uaparser/parsing_test.go
@@ -1,11 +1,11 @@
 package uaparser
 
 import (
-	"io/ioutil"
 	"log"
+	"os"
 	"testing"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var testParser *Parser
@@ -107,7 +107,7 @@ func TestGenericParseMethodConcurrency(t *testing.T) { // go test -race -run=Con
 }
 
 func unmarshalResourceTestFile(filepath string, v interface{}) {
-	file, err := ioutil.ReadFile(filepath)
+	file, err := os.ReadFile(filepath)
 	if nil != err {
 		log.Fatal(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@ package uaparser`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "io/ioutil"`
	`5`	`+ "os"`
`6`	`6`	`"regexp"`
`7`	`7`	`"sort"`
`8`	`8`	`"sync"`
`9`	`9`	`"sync/atomic"`
`10`	`10`	`"time"`
`11`	`11`
`12`		`- "gopkg.in/yaml.v2"`
	`12`	`+ "gopkg.in/yaml.v3"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`type RegexesDefinitions struct {`
`@@ -190,7 +190,7 @@ func defaultParserConfig() *parserConfig {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`func NewWithOptions(regexFile string, mode, treshold, topCnt int, useSort, debugMode bool, cacheSize int) (*Parser, error) {`
`193`		`- data, err := ioutil.ReadFile(regexFile)`
	`193`	`+ data, err := os.ReadFile(regexFile)`
`194`	`194`	`if nil != err {`
`195`	`195`	`return nil, err`
`196`	`196`	`}`
`@@ -222,7 +222,7 @@ func NewWithOptions(regexFile string, mode, treshold, topCnt int, useSort, debug`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`func New(regexFile string) (*Parser, error) {`
`225`		`- data, err := ioutil.ReadFile(regexFile)`
	`225`	`+ data, err := os.ReadFile(regexFile)`
`226`	`226`	`if nil != err {`
`227`	`227`	`return nil, err`
`228`	`228`	`}`
`@@ -292,7 +292,7 @@ func (parser Parser) Parse(line string) Client {`
`292`	`292`	`}()`
`293`	`293`	`}`
`294`	`294`	`wg.Wait()`
`295`		`- if parser.config.UseSort == true {`
	`295`	`+ if parser.config.UseSort {`
`296`	`296`	`checkAndSort(parser)`
`297`	`297`	`}`
`298`	`298`	`return cli`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`package uaparser`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "io/ioutil"`
`5`	`4`	`"log"`
	`5`	`+ "os"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "gopkg.in/yaml.v2"`
	`8`	`+ "gopkg.in/yaml.v3"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var testParser *Parser`
`@@ -107,7 +107,7 @@ func TestGenericParseMethodConcurrency(t *testing.T) { // go test -race -run=Con`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`func unmarshalResourceTestFile(filepath string, v interface{}) {`
`110`		`- file, err := ioutil.ReadFile(filepath)`
	`110`	`+ file, err := os.ReadFile(filepath)`
`111`	`111`	`if nil != err {`
`112`	`112`	`log.Fatal(err)`
`113`	`113`	`}`