tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Explicit message telling the user they are not logged in and need `docker login azure` first

This commit is contained in:
Guillaume Tardif 2020-06-19 10:59:39 +02:00
parent 8eb380a5a4
commit 82171eec19
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
azure/login/login.go
View File

@ -181,13 +181,17 @@ func toOAuthToken(token azureToken) oauth2.Token {
// NewAuthorizerFromLogin creates an authorizer based on login access token // NewAuthorizerFromLogin creates an authorizer based on login access token
func NewAuthorizerFromLogin() (autorest.Authorizer, error) { func NewAuthorizerFromLogin() (autorest.Authorizer, error) {
login, err := NewAzureLoginService() return newAuthorizerFromLoginStorePath(getTokenStorePath())
}
func newAuthorizerFromLoginStorePath(storeTokenPath string) (autorest.Authorizer, error) {
login, err := newAzureLoginServiceFromPath(storeTokenPath, azureAPIHelper{})
if err != nil { if err != nil {
return nil, err return nil, err
} }
oauthToken, err := login.GetValidToken() oauthToken, err := login.GetValidToken()
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "not logged in to azure, you need to run \"docker login azure\" first")
} }
token := adal.Token{ token := adal.Token{

5
azure/login/login_test.go
View File

@ -91,6 +91,11 @@ func (suite *LoginSuite) TestRefreshInValidToken() {
Expect(storedToken.Token.Expiry).To(BeTemporally(">", time.Now().Add(3500*time.Second))) Expect(storedToken.Token.Expiry).To(BeTemporally(">", time.Now().Add(3500*time.Second)))
} }
func (suite *LoginSuite) TestClearErrorMessageIfNotAlreadyLoggedIn() {
_, err := newAuthorizerFromLoginStorePath(filepath.Join(suite.dir, tokenStoreFilename))
Expect(err.Error()).To(ContainSubstring("not logged in to azure, you need to run \"docker login azure\" first"))
}
func (suite *LoginSuite) TestDoesNotRefreshValidToken() { func (suite *LoginSuite) TestDoesNotRefreshValidToken() {
expiryDate := time.Now().Add(1 * time.Hour) expiryDate := time.Now().Add(1 * time.Hour)
err := suite.azureLogin.tokenStore.writeLoginInfo(TokenInfo{ err := suite.azureLogin.tokenStore.writeLoginInfo(TokenInfo{