Skip to content

Fix the filemap for IAM endpoint type from endpoints file #6524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2025
Merged

Fix the filemap for IAM endpoint type from endpoints file #6524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 32 additions & 20 deletions ibm/conns/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ func (sess clientSession) GlobalCatalogV1API() (*globalcatalogv1.GlobalCatalogV1

// ClientSession configures and returns a fully initialized ClientSession
func (c *Config) ClientSession() (interface{}, error) {
sess, err := newSession(c)
sess, fileMap, err := newSession(c)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1488,22 +1488,7 @@ func (c *Config) ClientSession() (interface{}, error) {
session.functionClient, session.functionConfigErr = FunctionClient(sess.BluemixSession.Config)

BluemixRegion = sess.BluemixSession.Config.Region
var fileMap map[string]interface{}
if f := EnvFallBack([]string{"IBMCLOUD_ENDPOINTS_FILE_PATH", "IC_ENDPOINTS_FILE_PATH"}, c.EndpointsFile); f != "" {
jsonFile, err := os.Open(f)
if err != nil {
log.Fatalf("Unable to open Endpoints File %s", err)
}
defer jsonFile.Close()
bytes, err := ioutil.ReadAll(jsonFile)
if err != nil {
log.Fatalf("Unable to read Endpoints File %s", err)
}
err = json.Unmarshal([]byte(bytes), &fileMap)
if err != nil {
log.Fatalf("Unable to unmarshal Endpoints File %s", err)
}
}

accv1API, err := accountv1.New(sess.BluemixSession)
if err != nil {
session.accountV1ConfigErr = fmt.Errorf("[ERROR] Error occured while configuring Bluemix Accountv1 Service: %q", err)
Expand Down Expand Up @@ -3756,7 +3741,7 @@ func CreateVersionDate() *string {
return &version
}

func newSession(c *Config) (*Session, error) {
func newSession(c *Config) (*Session, map[string]interface{}, error) {
ibmSession := &Session{}

softlayerSession := &slsession.Session{
Expand Down Expand Up @@ -3784,7 +3769,34 @@ func newSession(c *Config) (*Session, error) {

var authenticator core.Authenticator
var err error
var fileMap map[string]interface{}
if f := EnvFallBack([]string{"IBMCLOUD_ENDPOINTS_FILE_PATH", "IC_ENDPOINTS_FILE_PATH"}, c.EndpointsFile); f != "" {
jsonFile, err := os.Open(f)
if err != nil {
log.Fatalf("Unable to open Endpoints File %s", err)
}
defer jsonFile.Close()
bytes, err := ioutil.ReadAll(jsonFile)
if err != nil {
log.Fatalf("Unable to read Endpoints File %s", err)
}
err = json.Unmarshal([]byte(bytes), &fileMap)
if err != nil {
log.Fatalf("Unable to unmarshal Endpoints File %s", err)
}
}
iamURL := EnvFallBack([]string{"IBMCLOUD_IAM_API_ENDPOINT"}, IAMURL)

if c.Visibility == "private" || c.Visibility == "public-and-private" {
if c.Region == "us-south" || c.Region == "us-east" {
iamURL = ContructEndpoint(fmt.Sprintf("private.%s.iam", c.Region), cloudEndpoint)
} else {
iamURL = ContructEndpoint("private.iam", cloudEndpoint)
}
}
if fileMap != nil && c.Visibility != "public-and-private" {
iamURL = fileFallBack(fileMap, c.Visibility, "IBMCLOUD_IAM_API_ENDPOINT", c.Region, iamURL)
}
if (c.BluemixAPIKey != "") && (c.IAMTrustedProfileID != "" || c.IAMTrustedProfileName != "") {
if c.IAMTrustedProfileID != "" {
log.Println("Configuring Session with Trusted Profile ID")
Expand Down Expand Up @@ -3859,11 +3871,11 @@ func newSession(c *Config) (*Session, error) {
}
sess, err = bxsession.New(bmxConfig)
if err != nil {
return nil, err
return nil, fileMap, err
}
ibmSession.BluemixSession = sess

return ibmSession, nil
return ibmSession, fileMap, err
}

/*func authenticateAPIKey(sess *bxsession.Session) error {
Expand Down
Loading