chore(deps): update go to v1.23.5 + dependencies (Vonage#68)

* chore(deps): update dependency go to v1.23.5 * Update all dependencies --------- Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: nicolaasuni-vonage <[email protected]>
tecnickcom · Jan 21, 2025 · d6adb08 · d6adb08
1 parent 8a2eb22
commit d6adb08
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 28 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.6.24
+1.6.25
diff --git a/c/doc/Doxyfile b/c/doc/Doxyfile
@@ -32,7 +32,7 @@ PROJECT_NAME           = "NumKey"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 1.6.24
+PROJECT_NUMBER = 1.6.25
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer

diff --git a/cgo/.golangci.yml b/cgo/.golangci.yml
@@ -5,7 +5,6 @@ run:
   issues-exit-code: 1
   tests: true
   timeout: 5m
-  skip-dirs-use-default: true
 
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
@@ -48,6 +47,7 @@ linters-settings:
       - G115
 
 issues:
+  exclude-dirs-use-default: true
   exclude-dirs:
     - .github
     - .githook
@@ -61,15 +61,15 @@ issues:
 linters:
   enable-all: true
   disable:
-    - depguard    # Go linter that checks if package imports are in a list of acceptable packages [fast: true, auto-fix: false]
-    - exhaustruct    # Checks if all structure fields are initialized [fast: false, auto-fix: false]
-    - err113    # Go linter to check the errors handling expressions [fast: false, auto-fix: false]
-    - ireturn    # Accept Interfaces, Return Concrete Types [fast: false, auto-fix: false]
-    - lll    # Reports long lines [fast: true, auto-fix: false]
-    - mnd   # An analyzer to detect magic numbers. [fast: true, auto-fix: false]
-    - musttag    # enforce field tags in (un)marshaled structs [fast: false, auto-fix: false]
-    - nlreturn    # Accept Nil, Return Non-Nil [fast: false, auto-fix: false]
-    - tagliatelle    # Checks the struct tags. [fast: true, auto-fix: false]
-    - testpackage    # linter that makes you use a separate _test package [fast: true, auto-fix: false]
-    - varnamelen    # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false]
+    - depguard # Go linter that checks if package imports are in a list of acceptable packages [fast: true, auto-fix: false]
+    - exhaustruct # Checks if all structure fields are initialized [fast: false, auto-fix: false]
+    - err113 # Go linter to check the errors handling expressions [fast: false, auto-fix: false]
+    - ireturn # Accept Interfaces, Return Concrete Types [fast: false, auto-fix: false]
+    - lll # Reports long lines [fast: true, auto-fix: false]
+    - mnd # An analyzer to detect magic numbers. [fast: true, auto-fix: false]
+    - musttag # enforce field tags in (un)marshaled structs [fast: false, auto-fix: false]
+    - nlreturn # Accept Nil, Return Non-Nil [fast: false, auto-fix: false]
+    - tagliatelle # Checks the struct tags. [fast: true, auto-fix: false]
+    - testpackage # linter that makes you use a separate _test package [fast: true, auto-fix: false]
+    - varnamelen # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false]
     - exportloopref # deprecated
diff --git a/cgo/Makefile b/cgo/Makefile
@@ -50,7 +50,7 @@ GOFMT=$(shell which gofmt)
 GOTEST=GOPATH=$(GOPATH) $(shell which gotest)
 GODOC=GOPATH=$(GOPATH) $(shell which godoc)
 GOLANGCILINT=$(BINUTIL)/golangci-lint
-GOLANGCILINTVERSION=v1.62.2
+GOLANGCILINTVERSION=v1.63.4
 
 # Directory containing the source code
 SRCDIR=./src

diff --git a/cgo/src/countrykey_test.go b/cgo/src/countrykey_test.go
@@ -735,7 +735,7 @@ func TestCountryKey(t *testing.T) {
 func BenchmarkCountryKey(b *testing.B) {
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		CountryKey("ZZ")
 	}
 }
@@ -758,7 +758,7 @@ func TestDecodeCountryKey(t *testing.T) {
 func BenchmarkDecodeCountryKey(b *testing.B) {
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		DecodeCountryKey(23130)
 	}
 }
diff --git a/cgo/src/numkey.go b/cgo/src/numkey.go
@@ -19,7 +19,7 @@ package numkey
 import "C"
 import "unsafe"
 
-// TNumKey contains the number components
+// TNumKey contains the number components.
 type TNumKey struct {
 	Country string `json:"country"`
 	Number  string `json:"number"`
@@ -37,21 +37,25 @@ func castCNumKey(nk C.numkey_t) TNumKey {
 func StringToNTBytesN(s string, size int) []byte {
 	b := make([]byte, size)
 	copy(b, s)
+
 	return b
 }
 
-// NumKey returns an encoded COUNTRY + NUMBER
-// If the country or number are invalid this function returns 0
+// NumKey returns an encoded COUNTRY + NUMBER.
+// If the country or number are invalid this function returns 0.
 func NumKey(country, number string) uint64 {
 	countrysize := len(country)
 	numsize := len(number)
+
 	if countrysize != 2 || numsize < 1 {
 		return 0
 	}
+
 	bcountry := StringToNTBytesN(country, countrysize+1)
 	bnumber := StringToNTBytesN(number, numsize+1)
 	pcountry := unsafe.Pointer(&bcountry[0]) // #nosec
 	pnumber := unsafe.Pointer(&bnumber[0])   // #nosec
+
 	return uint64(C.numkey((*C.char)(pcountry), (*C.char)(pnumber), C.size_t(numsize)))
 }
 
@@ -60,8 +64,11 @@ func DecodeNumKey(nk uint64) TNumKey {
 	if nk == 0 {
 		return TNumKey{}
 	}
+
 	var data C.numkey_t
+
 	C.decode_numkey(C.uint64_t(nk), &data)
+
 	return castCNumKey(data)
 }
 
@@ -73,15 +80,19 @@ func CompareNumKeyCountry(nka, nkb uint64) int {
 // Hex provides a 16 digits hexadecimal string representation of a 64bit unsigned number.
 func Hex(v uint64) string {
 	cstr := C.malloc(17)
+
 	defer C.free(cstr)
+
 	C.numkey_hex(C.uint64_t(v), (*C.char)(cstr))
+
 	return C.GoStringN((*C.char)(cstr), C.int(16))
 }
 
 // ParseHex parses a 16 digit HEX string and returns the 64 bit unsigned number.
 func ParseHex(s string) uint64 {
 	b := StringToNTBytesN(s, len(s)+1)
 	p := unsafe.Pointer(&b[0]) // #nosec
+
 	return uint64(C.parse_numkey_hex((*C.char)(p)))
 }
 
@@ -92,6 +103,7 @@ func PrefixKey(number string) uint64 {
 	numsize := len(number)
 	bnumber := StringToNTBytesN(number, numsize+1)
 	pnumber := unsafe.Pointer(&bnumber[0]) // #nosec
+
 	return uint64(C.prefixkey((*C.char)(pnumber), C.size_t(numsize)))
 }
 
@@ -101,15 +113,20 @@ func CountryKey(country string) uint16 {
 	if countrysize != 2 {
 		return 0
 	}
+
 	bcountry := StringToNTBytesN(country, countrysize+1)
 	pcountry := unsafe.Pointer(&bcountry[0]) // #nosec
+
 	return uint16(C.countrykey((*C.char)(pcountry)))
 }
 
 // DecodeCountryKey decodes countrykey into ISO 3166 alpha-2 country code.
 func DecodeCountryKey(ck uint16) string {
 	cstr := C.malloc(3)
+
 	defer C.free(cstr)
+
 	C.decode_countrykey(C.uint16_t(ck), (*C.char)(cstr))
+
 	return C.GoStringN((*C.char)(cstr), C.int(2))
 }
diff --git a/cgo/src/numkey_test.go b/cgo/src/numkey_test.go
@@ -748,7 +748,7 @@ func TestNumKeyLong(t *testing.T) {
 func BenchmarkNumKey(b *testing.B) {
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		NumKey("ZZ", "601469829912013")
 	}
 }
@@ -801,7 +801,7 @@ func TestDecodeNumKeyLong(t *testing.T) {
 func BenchmarkDecodeNumKey(b *testing.B) {
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		DecodeNumKey(0xd6a23089b8e15cdf)
 	}
 }
@@ -836,7 +836,7 @@ func TestCompareNumKeyCountry(t *testing.T) {
 func BenchmarkCompareNumKeyCountry(b *testing.B) {
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		CompareNumKeyCountry(0xd6a23089b8e15cdf, 0xd6a2300000000000)
 	}
 }
@@ -859,7 +859,7 @@ func TestHex(t *testing.T) {
 func BenchmarkHex(b *testing.B) {
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		_ = Hex(0xa852662880400000)
 	}
 }
@@ -884,7 +884,7 @@ func BenchmarkParseHex(b *testing.B) {
 
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		ParseHex(bs)
 	}
 }
diff --git a/cgo/src/prefixkey_test.go b/cgo/src/prefixkey_test.go
@@ -51,7 +51,7 @@ func TestPrefixKey(t *testing.T) {
 func BenchmarkPrefixKey(b *testing.B) {
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		PrefixKey("123456789012345")
 	}
 }
diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/Vonage/numkey
 
 go 1.23
 
-toolchain go1.23.4
+toolchain go1.23.5
 
 require (
 	github.com/jstemmer/go-junit-report/v2 v2.1.0

diff --git a/python/setup.py b/python/setup.py
@@ -30,7 +30,7 @@ def run(self):
 
 setup(
     name="numkey",
-    version="1.6.24.1",
+    version="1.6.25.1",
     keywords=("numkey E.164 shortcode lvn did encoding"),
     description="NumKey Bindings for Python",
     long_description=read("../README.md"),