Remove named returns and fix linting woes

milosgajdos · milosgajdos · commit 53c382641c92 · 2025-02-05T21:26:23.000-08:00
Signed-off-by: Milos Gajdos &lt;milosthegajdos@gmail.com&gt;
diff --git a/registry/auth/token/token.go b/registry/auth/token/token.go
@@ -212,9 +212,8 @@ func verifyCertChain(header jose.Header, roots *x509.CertPool) (signingKey crypt
 	return
 }
 
-func verifyJWK(header jose.Header, verifyOpts VerifyOptions) (signingKey crypto.PublicKey, err error) {
+func verifyJWK(header jose.Header, verifyOpts VerifyOptions) (crypto.PublicKey, error) {
 	jwk := header.JSONWebKey
-	signingKey = jwk.Key
 
 	// Check to see if the key includes a certificate chain.
 	if len(jwk.Certificates) == 0 {
@@ -246,9 +245,8 @@ func verifyJWK(header jose.Header, verifyOpts VerifyOptions) (signingKey crypto.
 	if err != nil {
 		return nil, err
 	}
-	signingKey = getCertPubKey(chains)
 
-	return
+	return getCertPubKey(chains), nil
 }
 
 func getCertPubKey(chains [][]*x509.Certificate) crypto.PublicKey {

Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,8 @@ func verifyCertChain(header jose.Header, roots *x509.CertPool) (signingKey crypt`
`212`	`212`	`return`
`213`	`213`	`}`
`214`	`214`
`215`		`-func verifyJWK(header jose.Header, verifyOpts VerifyOptions) (signingKey crypto.PublicKey, err error) {`
	`215`	`+func verifyJWK(header jose.Header, verifyOpts VerifyOptions) (crypto.PublicKey, error) {`
`216`	`216`	`jwk := header.JSONWebKey`
`217`		`- signingKey = jwk.Key`
`218`	`217`
`219`	`218`	`// Check to see if the key includes a certificate chain.`
`220`	`219`	`if len(jwk.Certificates) == 0 {`
`@@ -246,9 +245,8 @@ func verifyJWK(header jose.Header, verifyOpts VerifyOptions) (signingKey crypto.`
`246`	`245`	`if err != nil {`
`247`	`246`	`return nil, err`
`248`	`247`	`}`
`249`		`- signingKey = getCertPubKey(chains)`
`250`	`248`
`251`		`- return`
	`249`	`+ return getCertPubKey(chains), nil`
`252`	`250`	`}`
`253`	`251`
`254`	`252`	`func getCertPubKey(chains [][]*x509.Certificate) crypto.PublicKey {`