chore: update to go1.22 (#2144)

go-acme · Mar 20, 2024 · 3371145 · 3371145
1 parent 874e3ea
commit 3371145
Show file tree

Hide file tree

Showing 58 changed files with 18 additions and 87 deletions.
diff --git a/.github/workflows/go-cross.yml b/.github/workflows/go-cross.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [ stable, oldstable ]
+        go-version: [ stable ]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v1.56.1
+      GOLANGCI_LINT_VERSION: v1.57.1
       HUGO_VERSION: 0.117.0
       CGO_ENABLED: 0
       LEGO_E2E_TESTS: CI

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,10 +1,10 @@
 run:
   timeout: 10m
-  skip-files: []
 
 linters-settings:
   govet:
-    check-shadowing: true
+    enable:
+      - shadow
   gocyclo:
     min-complexity: 12
   goconst:
@@ -139,6 +139,7 @@ linters:
     - nonamedreturns
     - musttag # false-positive https://github.com/junk1tm/musttag/issues/17
     - gosmopolitan  # not relevant
+    - exportloopref # Useless with go1.22
 
 issues:
   exclude-use-default: false
@@ -148,7 +149,7 @@ issues:
     - 'Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*printf?|os\.(Un)?Setenv). is not checked'
     - 'exported (type|method|function) (.+) should have comment or be unexported'
     - 'ST1000: at least one file in a package should have a package comment'
-    - 'fmt.Sprintf can be replaced with string addition'
+    - 'fmt.Sprintf can be replaced with string'
   exclude-rules:
     - path: (.+)_test.go
       linters:

diff --git a/acme/api/order_test.go b/acme/api/order_test.go
@@ -94,7 +94,6 @@ func TestOrderService_NewWithOptions(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/acme/api/service_test.go b/acme/api/service_test.go
@@ -44,7 +44,6 @@ func Test_getLink(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/certcrypto/crypto_test.go b/certcrypto/crypto_test.go
@@ -86,7 +86,6 @@ func TestGenerateCSR(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/certificate/authorization.go b/certificate/authorization.go
@@ -38,7 +38,7 @@ func (c *Certifier) getAuthorizations(order acme.ExtendedOrder) ([]acme.Authoriz
 	var responses []acme.Authorization
 
 	failures := newObtainError()
-	for i := 0; i < len(order.Authorizations); i++ {
+	for range len(order.Authorizations) {
 		select {
 		case res := <-resc:
 			responses = append(responses, res)

diff --git a/certificate/renewal_test.go b/certificate/renewal_test.go
@@ -112,7 +112,6 @@ func TestCertifier_GetRenewalInfo_errors(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/challenge/dns01/dns_challenge.go b/challenge/dns01/dns_challenge.go
@@ -215,7 +215,7 @@ func getChallengeFQDN(domain string, followCNAME bool) string {
 	}
 
 	// recursion counter so it doesn't spin out of control
-	for limit := 0; limit < 50; limit++ {
+	for range 50 {
 		// Keep following CNAMEs
 		r, err := dnsQuery(fqdn, dns.TypeCNAME, recursiveNameservers, true)
 

diff --git a/challenge/dns01/domain_test.go b/challenge/dns01/domain_test.go
@@ -47,7 +47,6 @@ func TestExtractSubDomain(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -93,7 +92,6 @@ func TestExtractSubDomain_errors(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/challenge/dns01/fqdn_test.go b/challenge/dns01/fqdn_test.go
@@ -25,7 +25,6 @@ func TestToFqdn(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -54,7 +53,6 @@ func TestUnFqdn(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/challenge/dns01/nameserver_test.go b/challenge/dns01/nameserver_test.go
@@ -30,7 +30,6 @@ func TestLookupNameserversOK(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.fqdn, func(t *testing.T) {
 			t.Parallel()
 
@@ -59,7 +58,6 @@ func TestLookupNameserversErr(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -259,7 +257,6 @@ func TestDNSError_Error(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/challenge/dns01/precheck_test.go b/challenge/dns01/precheck_test.go
@@ -28,7 +28,6 @@ func TestCheckDNSPropagation(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 			ClearFqdnCache()
@@ -69,7 +68,6 @@ func TestCheckAuthoritativeNss(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 			ClearFqdnCache()
@@ -104,7 +102,6 @@ func TestCheckAuthoritativeNssErr(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 			ClearFqdnCache()

diff --git a/challenge/http01/domain_matcher_test.go b/challenge/http01/domain_matcher_test.go
@@ -69,7 +69,6 @@ func TestParseForwardedHeader(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/challenge/http01/http_challenge_test.go b/challenge/http01/http_challenge_test.go
@@ -57,7 +57,6 @@ func TestProviderServer_GetAddress(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/challenge/resolver/prober_test.go b/challenge/resolver/prober_test.go
@@ -99,7 +99,6 @@ func TestProber_Solve(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/cmd/cmd_renew_test.go b/cmd/cmd_renew_test.go
@@ -48,7 +48,6 @@ func Test_merge(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -108,7 +107,6 @@ func Test_needRenewal(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			actual := needRenewal(test.x509Cert, "foo.com", test.days)
 

diff --git a/docs/content/installation/_index.md b/docs/content/installation/_index.md
@@ -66,7 +66,7 @@ docker run goacme/lego -h
 
 Requirements:
 
-- go1.17+
+- go1.22+.
 - environment variable: `GO111MODULE=on`
 
 To install the latest version from sources, just run:

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/go-acme/lego/v4
 
-go 1.21
+go 1.22
 
 // github.com/exoscale/egoscale v1.19.0 => It is an error, please don't use it.
 

diff --git a/platform/config/env/env_test.go b/platform/config/env/env_test.go
@@ -93,7 +93,6 @@ func TestGetWithFallback(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -166,7 +165,6 @@ func TestGetOneWithFallback(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/azuredns/private.go b/providers/dns/azuredns/private.go
@@ -76,8 +76,7 @@ func (d *DNSProviderPrivate) Present(domain, _, keyAuth string) error {
 
 	var txtRecords []*armprivatedns.TxtRecord
 	for txt := range uniqRecords {
-		txtRecord := txt
-		txtRecords = append(txtRecords, &armprivatedns.TxtRecord{Value: to.SliceOfPtrs(txtRecord)})
+		txtRecords = append(txtRecords, &armprivatedns.TxtRecord{Value: to.SliceOfPtrs(txt)})
 	}
 
 	rec := armprivatedns.RecordSet{

diff --git a/providers/dns/azuredns/public.go b/providers/dns/azuredns/public.go
@@ -75,8 +75,7 @@ func (d *DNSProviderPublic) Present(domain, _, keyAuth string) error {
 
 	var txtRecords []*armdns.TxtRecord
 	for txt := range uniqRecords {
-		txtRecord := txt
-		txtRecords = append(txtRecords, &armdns.TxtRecord{Value: to.SliceOfPtrs(txtRecord)})
+		txtRecords = append(txtRecords, &armdns.TxtRecord{Value: to.SliceOfPtrs(txt)})
 	}
 
 	rec := armdns.RecordSet{

diff --git a/providers/dns/azuredns/servicediscovery_test.go b/providers/dns/azuredns/servicediscovery_test.go
@@ -119,7 +119,6 @@ resources
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/dreamhost/internal/client_test.go b/providers/dns/dreamhost/internal/client_test.go
@@ -38,7 +38,6 @@ func TestClient_buildQuery(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/duckdns/internal/client_test.go b/providers/dns/duckdns/internal/client_test.go
@@ -55,7 +55,6 @@ func Test_getMainDomain(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/dynu/internal/client_test.go b/providers/dns/dynu/internal/client_test.go
@@ -92,7 +92,6 @@ func TestGetRootDomain(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -181,7 +180,6 @@ func TestGetRecords(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -232,7 +230,6 @@ func TestAddNewRecord(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -290,7 +287,6 @@ func TestDeleteRecord(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/edgedns/edgedns_test.go b/providers/dns/edgedns/edgedns_test.go
@@ -169,7 +169,6 @@ func TestDNSProvider_findZone(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/exoscale/exoscale_test.go b/providers/dns/exoscale/exoscale_test.go
@@ -161,7 +161,6 @@ func TestDNSProvider_FindZoneAndRecordName(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/gcore/gcore_test.go b/providers/dns/gcore/gcore_test.go
@@ -131,7 +131,6 @@ func Test_extractAllZones(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/httpreq/httpreq_test.go b/providers/dns/httpreq/httpreq_test.go
@@ -152,7 +152,6 @@ func TestNewDNSProvider_Present(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -229,7 +228,6 @@ func TestNewDNSProvider_Cleanup(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/hurricane/internal/client_test.go b/providers/dns/hurricane/internal/client_test.go
@@ -46,7 +46,6 @@ func TestClient_UpdateTxtRecord(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.code, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/iij/iij.go b/providers/dns/iij/iij.go
@@ -228,7 +228,7 @@ func splitDomain(domain string, zones []string) (string, string, error) {
 	var owner string
 	var zone string
 
-	for i := 0; i < len(parts)-1; i++ {
+	for i := range len(parts) - 1 {
 		zone = strings.Join(parts[i:], ".")
 		if slices.Contains(zones, zone) {
 			baseOwner := strings.Join(parts[0:i], ".")

diff --git a/providers/dns/iij/iij_test.go b/providers/dns/iij/iij_test.go
@@ -190,7 +190,6 @@ func TestSplitDomain(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/providers/dns/inwx/inwx_test.go b/providers/dns/inwx/inwx_test.go
@@ -171,7 +171,6 @@ func Test_computeSleep(t *testing.T) {
 	require.NoError(t, err)
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()