Revert the fix in user_credentials.go back

Author: wongni

pkg/cloud/user_credentials.go

@@ -74,8 +74,8 @@ func (c *client) ResolveDomain(domain *Domain) error {
 			tokens = append([]string{rootDomain}, tokens...)
 		} else {
 			tokens[0] = rootDomain
+			domain.Path = strings.Join(tokens, domainDelimiter)
 		}
-		domain.Path = strings.Join(tokens, domainDelimiter)
 	}
 
 	// Set present search/list parameters.
@@ -85,7 +85,7 @@ func (c *client) ResolveDomain(domain *Domain) error {
 	setIfNotEmpty(domain.ID, p.SetId)
 
 	// If path was provided also use level narrow the search for domain.
-	if level := len(tokens); level >= 0 {
+	if level := len(tokens) - 1; level >= 0 {
 		p.SetLevel(level)
 	}
 
@@ -140,9 +140,6 @@ func (c *client) ResolveAccount(account *Account) error {
 	resp, retErr := c.cs.Account.ListAccounts(p)
 	if retErr != nil {
 		return retErr
-	} else if resp.Count == 0 {
-		return errors.Errorf("could not find account %s in domain ID %s",
-			account.Name, account.Domain.ID)
 	} else if resp.Count != 1 {
 		return errors.Errorf("expected 1 Account with account name %s in domain ID %s, but got %d",
 			account.Name, account.Domain.ID, resp.Count)
@@ -154,6 +151,11 @@ func (c *client) ResolveAccount(account *Account) error {
 
 // ResolveUser resolves a user's information.
 func (c *client) ResolveUser(user *User) error {
+	// Resolve account prior to any user resolution activity.
+	if err := c.ResolveAccount(&user.Account); err != nil {
+		return errors.Wrapf(err, "resolving account %s details", user.Account.Name)
+	}
+
 	p := c.cs.User.NewListUsersParams()
 	p.SetAccount(user.Account.Name)
 	p.SetDomainid(user.Domain.ID)
@@ -181,7 +183,7 @@ func (c *client) ResolveUserKeys(user *User) error {
 	p := c.cs.User.NewGetUserKeysParams(user.ID)
 	resp, err := c.cs.User.GetUserKeys(p)
 	if err != nil {
-		return errors.Wrapf(err, "error encountered when resolving user api keys for user %s", user.Name)
+		return errors.Errorf("error encountered when resolving user api keys for user %s", user.Name)
 	}
 	user.APIKey = resp.Apikey
 	user.SecretKey = resp.Secretkey