Merge branch 'Gertner-test' of https://github.com/deepaksibm/terraform-provider-ibm into Gertner-test

Author: deepakibms

ibm/config.go

@@ -902,7 +902,7 @@ func (c *Config) ClientSession() (interface{}, error) {
 	if sess.BluemixSession.Config.BluemixAPIKey != "" {
 		err = authenticateAPIKey(sess.BluemixSession)
 		if err != nil {
-			session.bmxUserFetchErr = fmt.Errorf("Error occured while fetching account user details: %q", err)
+			session.bmxUserFetchErr = fmt.Errorf("Error occured while fetching auth key for account user details: %q", err)
 			session.functionConfigErr = fmt.Errorf("Error occured while fetching auth key for function: %q", err)
 			session.powerConfigErr = fmt.Errorf("Error occured while fetching the auth key for power iaas: %q", err)
 			session.ibmpiConfigErr = fmt.Errorf("Error occured while fetching the auth key for power iaas: %q", err)
@@ -920,7 +920,7 @@ func (c *Config) ClientSession() (interface{}, error) {
 		}
 
 	}
-	userConfig, err := fetchUserDetails(sess.BluemixSession, c.Generation)
+	userConfig, err := fetchUserDetails(sess.BluemixSession, c.Generation, c.RetryCount)
 	if err != nil {
 		session.bmxUserFetchErr = fmt.Errorf("Error occured while fetching account user details: %q", err)
 	}
@@ -1681,7 +1681,7 @@ func authenticateCF(sess *bxsession.Session) error {
 	return tokenRefresher.AuthenticateAPIKey(config.BluemixAPIKey)
 }
 
-func fetchUserDetails(sess *bxsession.Session, generation int) (*UserConfig, error) {
+func fetchUserDetails(sess *bxsession.Session, generation, retries int) (*UserConfig, error) {
 	config := sess.Config
 	user := UserConfig{}
 	var bluemixToken string
@@ -1697,6 +1697,12 @@ func fetchUserDetails(sess *bxsession.Session, generation int) (*UserConfig, err
 	})
 	//TODO validate with key
 	if err != nil && !strings.Contains(err.Error(), "key is of invalid type") {
+		if retries > 0 {
+			if config.BluemixAPIKey != "" {
+				_ = authenticateAPIKey(sess)
+				return fetchUserDetails(sess, generation, retries-1)
+			}
+		}
 		return &user, err
 	}
 	claims := token.Claims.(jwt.MapClaims)