Update to Go 1.18; use any

mholt · mholt · commit 56c70f38087f · 2022-08-08T10:45:24.000-06:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        go: [ '1.17' ]
+        go: [ '1.18' ]
 
     runs-on: ${{ matrix.os }}
 
diff --git a/certmagic.go b/certmagic.go
@@ -405,7 +405,7 @@ type IssuedCertificate struct {
 
 	// Any extra information to serialize alongside the
 	// certificate in storage.
-	Metadata interface{}
+	Metadata any
 }
 
 // CertificateResource associates a certificate with its private
@@ -425,7 +425,7 @@ type CertificateResource struct {
 
 	// Any extra information associated with the certificate,
 	// usually provided by the issuer implementation.
-	IssuerData interface{} `json:"issuer_data,omitempty"`
+	IssuerData any `json:"issuer_data,omitempty"`
 
 	// The unique string identifying the issuer of the
 	// certificate; internally useful for storage access.
diff --git a/config.go b/config.go
@@ -56,7 +56,7 @@ type Config struct {
 	// to subscribe to certain things happening
 	// internally by this config; invocations are
 	// synchronous, so make them return quickly!
-	OnEvent func(event string, data interface{})
+	OnEvent func(event string, data any)
 
 	// DefaultServerName specifies a server name
 	// to use when choosing a certificate if the
@@ -1070,7 +1070,7 @@ func (cfg *Config) managedCertNeedsRenewal(certRes CertificateResource) (time.Du
 	return remaining, needsRenew
 }
 
-func (cfg *Config) emit(eventName string, data interface{}) {
+func (cfg *Config) emit(eventName string, data any) {
 	if cfg.OnEvent == nil {
 		return
 	}
diff --git a/config_test.go b/config_test.go
@@ -62,8 +62,8 @@ func TestSaveCertResource(t *testing.T) {
 	}
 
 	// the result of our test will be a map, since we have
-	// no choice but to decode it into an interface
-	cert.IssuerData = map[string]interface{}{
+	// no choice but to decode it into an 'any' interface
+	cert.IssuerData = map[string]any{
 		"url": "https://example.com/cert",
 	}
 
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/caddyserver/certmagic
 
-go 1.17
+go 1.18
 
 require (
 	github.com/klauspost/cpuid/v2 v2.0.11
diff --git a/go.sum b/go.sum
@@ -43,7 +43,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220630215102-69896b714898 h1:K7wO6V1IrczY9QOQ2WkVpw4JQSwCd52UsxVEirZUfiw=
 golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff --git a/solvers.go b/solvers.go
@@ -690,7 +690,7 @@ var (
 // data that can make it easier or more efficient to solve.
 type Challenge struct {
 	acme.Challenge
-	data interface{}
+	data any
 }
 
 // challengeKey returns the map key for a given challenge; it is the identifier

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ func TestSaveCertResource(t *testing.T) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// the result of our test will be a map, since we have`
`65`		`- // no choice but to decode it into an interface`
`66`		`- cert.IssuerData = map[string]interface{}{`
	`65`	`+ // no choice but to decode it into an 'any' interface`
	`66`	`+ cert.IssuerData = map[string]any{`
`67`	`67`	`"url": "https://example.com/cert",`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,7 @@ var (`
`690`	`690`	`// data that can make it easier or more efficient to solve.`
`691`	`691`	`type Challenge struct {`
`692`	`692`	`acme.Challenge`
`693`		`- data interface{}`
	`693`	`+ data any`
`694`	`694`	`}`
`695`	`695`
`696`	`696`	`// challengeKey returns the map key for a given challenge; it is the identifier`