From 19d605d1ad04a0e82a9c6213ad9254d0a48e4a71 Mon Sep 17 00:00:00 2001 From: "hkantare@in.ibm.com" Date: Tue, 5 Nov 2019 15:54:42 +0530 Subject: [PATCH] Fix issue #837 --- ibm/config.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ibm/config.go b/ibm/config.go index 3b8f8e7f97..ce0007877f 100644 --- a/ibm/config.go +++ b/ibm/config.go @@ -361,6 +361,14 @@ func (c *Config) ClientSession() (interface{}, error) { 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) } + err = authenticateCF(sess.BluemixSession) + if err != nil { + session.bmxUserFetchErr = fmt.Errorf("Error occured while fetching account user details: %q", err) + session.functionConfigErr = fmt.Errorf("Error occured while fetching auth key for function: %q", err) + session.isConfigErr = fmt.Errorf("Error occured while fetching auth key for vpc: %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) + } } if sess.BluemixSession.Config.IAMAccessToken != "" && sess.BluemixSession.Config.BluemixAPIKey == "" { @@ -578,6 +586,19 @@ func authenticateAPIKey(sess *bxsession.Session) error { return tokenRefresher.AuthenticateAPIKey(config.BluemixAPIKey) } +func authenticateCF(sess *bxsession.Session) error { + config := sess.Config + tokenRefresher, err := authentication.NewUAARepository(config, &rest.Client{ + DefaultHeader: gohttp.Header{ + "User-Agent": []string{http.UserAgent()}, + }, + }) + if err != nil { + return err + } + return tokenRefresher.AuthenticateAPIKey(config.BluemixAPIKey) +} + func fetchUserDetails(sess *bxsession.Session) (*UserConfig, error) { config := sess.Config user := UserConfig{}