Merge pull request openshift#8033 from mjturek/fix-service-instance-list

openshift-merge-bot[bot] · web-flow · commit 2a3d54ec8048 · 2024-02-16T15:17:44.000Z
OCPBUGS-29587: Power VS: Fix service instance list
diff --git a/pkg/asset/installconfig/powervs/client.go b/pkg/asset/installconfig/powervs/client.go
@@ -663,7 +663,7 @@ func (c *Client) ListServiceInstances(ctx context.Context) ([]string, error) {
 				continue
 			}
 
-			if resourceInstance.Type != nil && *resourceInstance.Type == "service_instance" {
+			if resourceInstance.Type != nil && (*resourceInstance.Type == "service_instance" || *resourceInstance.Type == "composite_instance") {
 				serviceInstances = append(serviceInstances, fmt.Sprintf("%s %s", *resource.Name, *resource.GUID))
 			}
 		}
@@ -738,7 +738,7 @@ func (c *Client) ServiceInstanceGUIDToName(ctx context.Context, id string) (stri
 				continue
 			}
 
-			if resourceInstance.Type != nil && *resourceInstance.Type == "service_instance" {
+			if resourceInstance.Type != nil && (*resourceInstance.Type == "service_instance" || *resourceInstance.Type == "composite_instance") {
 				if resourceInstance.GUID != nil && *resourceInstance.GUID == id {
 					if resourceInstance.Name == nil {
 						return "", nil

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ func (c *Client) ListServiceInstances(ctx context.Context) ([]string, error) {`
`663`	`663`	`continue`
`664`	`664`	`}`
`665`	`665`
`666`		`- if resourceInstance.Type != nil && *resourceInstance.Type == "service_instance" {`
	`666`	`+ if resourceInstance.Type != nil && (resourceInstance.Type == "service_instance" \|\| resourceInstance.Type == "composite_instance") {`
`667`	`667`	`serviceInstances = append(serviceInstances, fmt.Sprintf("%s %s", resource.Name, resource.GUID))`
`668`	`668`	`}`
`669`	`669`	`}`
`@@ -738,7 +738,7 @@ func (c *Client) ServiceInstanceGUIDToName(ctx context.Context, id string) (stri`
`738`	`738`	`continue`
`739`	`739`	`}`
`740`	`740`
`741`		`- if resourceInstance.Type != nil && *resourceInstance.Type == "service_instance" {`
	`741`	`+ if resourceInstance.Type != nil && (resourceInstance.Type == "service_instance" \|\| resourceInstance.Type == "composite_instance") {`
`742`	`742`	`if resourceInstance.GUID != nil && *resourceInstance.GUID == id {`
`743`	`743`	`if resourceInstance.Name == nil {`
`744`	`744`	`return "", nil`