Merge pull request openshift#925 from jhadvig/OCPBUGS-38549

openshift-merge-bot[bot] · web-flow · commit ea9b76c2936b · 2024-08-19T18:59:44.000Z
OCPBUGS-38549: Get externalOrganizationID instead of the organizationID
diff --git a/pkg/console/telemetry/telemetry.go b/pkg/console/telemetry/telemetry.go
@@ -107,10 +107,14 @@ func GetOrganizationID(telemetryConfig map[string]string, cachedOrganizationID,
 // https://github.com/openshift-online/ocm-sdk-go/blob/main/accountsmgmt/v1/subscription_client.go - everything private
 // https://github.com/openshift-online/ocm-sdk-go/blob/main/accountsmgmt/v1/subscriptions_client.go#L38-L41 - useless client
 type OCMAPIResponse struct {
-	Items []Organization `json:"items"`
+	Items []Subscription `json:"items"`
 }
+type Subscription struct {
+	Organization Organization `json:"organization,omitempty"`
+}
+
 type Organization struct {
-	OrganizationID string `json:"organization_id"`
+	ExternalId string `json:"external_id,omitempty"`
 }
 
 // FetchOrganizationID fetches the organization ID using the cluster ID and access token
@@ -156,7 +160,7 @@ func FetchOrganizationID(clusterID, accessToken string) (string, error) {
 		return "", fmt.Errorf("empty OCM response")
 	}
 
-	return ocmResponse.Items[0].OrganizationID, nil
+	return ocmResponse.Items[0].Organization.ExternalId, nil
 }
 
 // buildURL constructs the URL for the API request

Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,14 @@ func GetOrganizationID(telemetryConfig map[string]string, cachedOrganizationID,`
`107`	`107`	`// https://github.com/openshift-online/ocm-sdk-go/blob/main/accountsmgmt/v1/subscription_client.go - everything private`
`108`	`108`	`// https://github.com/openshift-online/ocm-sdk-go/blob/main/accountsmgmt/v1/subscriptions_client.go#L38-L41 - useless client`
`109`	`109`	`type OCMAPIResponse struct {`
`110`		- Items []Organization `json:"items"`
	`110`	+ Items []Subscription `json:"items"`
`111`	`111`	`}`
	`112`	`+type Subscription struct {`
	`113`	+ Organization Organization `json:"organization,omitempty"`
	`114`	`+}`
	`115`	`+`
`112`	`116`	`type Organization struct {`
`113`		- OrganizationID string `json:"organization_id"`
	`117`	+ ExternalId string `json:"external_id,omitempty"`
`114`	`118`	`}`
`115`	`119`
`116`	`120`	`// FetchOrganizationID fetches the organization ID using the cluster ID and access token`
`@@ -156,7 +160,7 @@ func FetchOrganizationID(clusterID, accessToken string) (string, error) {`
`156`	`160`	`return "", fmt.Errorf("empty OCM response")`
`157`	`161`	`}`
`158`	`162`
`159`		`- return ocmResponse.Items[0].OrganizationID, nil`
	`163`	`+ return ocmResponse.Items[0].Organization.ExternalId, nil`
`160`	`164`	`}`
`161`	`165`
`162`	`166`	`// buildURL constructs the URL for the API request`