Merge pull request #462 from Mhodesty/SREP-652

openshift-merge-bot[bot] · web-flow · commit 385d3b448e9a · 2025-05-30T14:49:05.000Z
Fix bug SREP-652: User's incorrectly reporting as not banned.
diff --git a/pkg/ocm/ocm.go b/pkg/ocm/ocm.go
@@ -344,7 +344,12 @@ func GetCreatorFromCluster(ocmConn *sdk.Connection, cluster *cmv1.Cluster) (*amv
 		return nil, fmt.Errorf("expecting status 'Active' found %v", status)
 	}
 
-	creator, ok := subscription.GetCreator()
+	accountResponse, err := ocmConn.AccountsMgmt().V1().Accounts().Account(subscription.Creator().ID()).Get().Send()
+	if err != nil {
+		return nil, err
+	}
+
+	creator, ok := accountResponse.GetBody()
 	if !ok {
 		return nil, errors.New("failed to get creator from subscription")
 	}
diff --git a/test/generate_incident.sh b/test/generate_incident.sh
@@ -11,6 +11,7 @@ declare -A alert_mapping=(
     ["MachineHealthCheckUnterminatedShortCircuitSRE"]="MachineHealthCheckUnterminatedShortCircuitSRE CRITICAL (1)"
     ["ApiErrorBudgetBurn"]="api-ErrorBudgetBurn k8sgpt test CRITICAL (1)"
     ["CannotRetrieveUpdatesSRE"]="CannotRetrieveUpdatesSRE"
+    ["UpgradeConfigSyncFailureOver4HrSRE"]="UpgradeConfigSyncFailureOver4HrSRE Critical (1)"
 )
 
 # Function to print help message

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,12 @@ func GetCreatorFromCluster(ocmConn sdk.Connection, cluster cmv1.Cluster) (*amv`
`344`	`344`	`return nil, fmt.Errorf("expecting status 'Active' found %v", status)`
`345`	`345`	`}`
`346`	`346`
`347`		`- creator, ok := subscription.GetCreator()`
	`347`	`+ accountResponse, err := ocmConn.AccountsMgmt().V1().Accounts().Account(subscription.Creator().ID()).Get().Send()`
	`348`	`+ if err != nil {`
	`349`	`+ return nil, err`
	`350`	`+ }`
	`351`	`+`
	`352`	`+ creator, ok := accountResponse.GetBody()`
`348`	`353`	`if !ok {`
`349`	`354`	`return nil, errors.New("failed to get creator from subscription")`
`350`	`355`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ declare -A alert_mapping=(`
`11`	`11`	`["MachineHealthCheckUnterminatedShortCircuitSRE"]="MachineHealthCheckUnterminatedShortCircuitSRE CRITICAL (1)"`
`12`	`12`	`["ApiErrorBudgetBurn"]="api-ErrorBudgetBurn k8sgpt test CRITICAL (1)"`
`13`	`13`	`["CannotRetrieveUpdatesSRE"]="CannotRetrieveUpdatesSRE"`
	`14`	`+ ["UpgradeConfigSyncFailureOver4HrSRE"]="UpgradeConfigSyncFailureOver4HrSRE Critical (1)"`
`14`	`15`	`)`
`15`	`16`
`16`	`17`	`# Function to print help message`