From 04c678b099c6c1bbd48dd5de34b7e4dd1e37118d Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Wed, 19 Aug 2020 13:56:41 +0200 Subject: [PATCH] Do not require refresh token to obtain ACR token. Especially this will make the ACR auto-login feature work with Service Principal login, that does not have a refresh token Signed-off-by: Guillaume Tardif --- aci/convert/registry_credentials.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/aci/convert/registry_credentials.go b/aci/convert/registry_credentials.go index a5e468aa..5083e892 100644 --- a/aci/convert/registry_credentials.go +++ b/aci/convert/registry_credentials.go @@ -150,10 +150,9 @@ func (c cliRegistryHelper) autoLoginAcr(registry string) error { } data := url.Values{ - "grant_type": {"access_token_refresh_token"}, + "grant_type": {"access_token"}, "service": {registry}, "tenant": {tenantID}, - "refresh_token": {token.RefreshToken}, "access_token": {token.AccessToken}, } repoAuthURL := fmt.Sprintf("https://%s/oauth2/exchange", registry) @@ -162,7 +161,7 @@ func (c cliRegistryHelper) autoLoginAcr(registry string) error { return err } if res.StatusCode != 200 { - return errors.Errorf("error while renewing access token, status : %s", res.Status) + return errors.Errorf("error while accessing ACR token from Azure login, status : %s", res.Status) } bits, err := ioutil.ReadAll(res.Body) if err != nil {