registry: loginV2: move variables closer to where they're used

Also rename a variable that shadowed a package type. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
vvoland · Dec 10, 2024 · 5021591 · 5021591
1 parent c1ef39e
commit 5021591
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/registry/auth.go b/registry/auth.go
@@ -66,23 +66,23 @@ func (scs staticCredentialStore) SetRefreshToken(*url.URL, string, string) {
 // loginV2 tries to login to the v2 registry server. The given registry
 // endpoint will be pinged to get authorization challenges. These challenges
 // will be used to authenticate against the registry to validate credentials.
-func loginV2(authConfig *registry.AuthConfig, endpoint APIEndpoint, userAgent string) (string, string, error) {
-	var (
-		endpointStr          = strings.TrimRight(endpoint.URL.String(), "/") + "/v2/"
-		modifiers            = Headers(userAgent, nil)
-		authTransport        = transport.NewTransport(newTransport(endpoint.TLSConfig), modifiers...)
-		credentialAuthConfig = *authConfig
-		creds                = loginCredentialStore{authConfig: &credentialAuthConfig}
-	)
-
+func loginV2(authConfig *registry.AuthConfig, endpoint APIEndpoint, userAgent string) (status string, token string, _ error) {
+	endpointStr := strings.TrimRight(endpoint.URL.String(), "/") + "/v2/"
 	log.G(context.TODO()).Debugf("attempting v2 login to registry endpoint %s", endpointStr)
 
 	req, err := http.NewRequest(http.MethodGet, endpointStr, nil)
 	if err != nil {
 		return "", "", err
 	}
 
-	loginClient, err := v2AuthHTTPClient(endpoint.URL, authTransport, modifiers, creds, nil)
+	var (
+		modifiers            = Headers(userAgent, nil)
+		authTrans            = transport.NewTransport(newTransport(endpoint.TLSConfig), modifiers...)
+		credentialAuthConfig = *authConfig
+		creds                = loginCredentialStore{authConfig: &credentialAuthConfig}
+	)
+
+	loginClient, err := v2AuthHTTPClient(endpoint.URL, authTrans, modifiers, creds, nil)
 	if err != nil {
 		return "", "", err
 	}