Merge pull request #4116 from Azure/fix-comparison

openshift-merge-bot[bot] · web-flow · commit 5f7333f316fe · 2026-02-18T05:12:51.000Z
Start apihelpers package
diff --git a/backend/pkg/controllers/controllerutils/service_provider_cluster.go b/backend/pkg/controllers/controllerutils/service_provider_cluster.go
@@ -24,6 +24,7 @@ import (
 	"github.com/Azure/ARO-HCP/internal/api"
 	"github.com/Azure/ARO-HCP/internal/database"
 	"github.com/Azure/ARO-HCP/internal/utils"
+	"github.com/Azure/ARO-HCP/internal/utils/apihelpers"
 )
 
 // newInitialServiceProviderCluster returns a new ServiceProviderCluster with
@@ -46,7 +47,7 @@ func newInitialServiceProviderCluster(clusterResourceID *azcorearm.ResourceID) *
 func GetOrCreateServiceProviderCluster(
 	ctx context.Context, dbClient database.DBClient, clusterResourceID *azcorearm.ResourceID,
 ) (*api.ServiceProviderCluster, error) {
-	if clusterResourceID.ResourceType.String() != api.ClusterResourceType.String() {
+	if !apihelpers.ResourceTypeEqual(clusterResourceID.ResourceType, api.ClusterResourceType) {
 		return nil, utils.TrackError(fmt.Errorf("expected resource type %s, got %s", api.ClusterResourceType, clusterResourceID.ResourceType))
 	}
 
diff --git a/backend/pkg/controllers/controllerutils/service_provider_nodepool.go b/backend/pkg/controllers/controllerutils/service_provider_nodepool.go
@@ -24,6 +24,7 @@ import (
 	"github.com/Azure/ARO-HCP/internal/api"
 	"github.com/Azure/ARO-HCP/internal/database"
 	"github.com/Azure/ARO-HCP/internal/utils"
+	"github.com/Azure/ARO-HCP/internal/utils/apihelpers"
 )
 
 // newInitialServiceProviderNodePool returns a new ServiceProviderNodePool with
@@ -46,7 +47,7 @@ func newInitialServiceProviderNodePool(npResourceID *azcorearm.ResourceID) *api.
 func GetOrCreateServiceProviderNodePool(
 	ctx context.Context, dbClient database.DBClient, nodePoolResourceID *azcorearm.ResourceID,
 ) (*api.ServiceProviderNodePool, error) {
-	if nodePoolResourceID.ResourceType.String() != api.NodePoolResourceType.String() {
+	if !apihelpers.ResourceTypeEqual(nodePoolResourceID.ResourceType, api.NodePoolResourceType) {
 		return nil, utils.TrackError(fmt.Errorf("expected resource type %s, got %s", api.NodePoolResourceType, nodePoolResourceID.ResourceType))
 	}
 
diff --git a/internal/api/arm/error.go b/internal/api/arm/error.go
@@ -22,6 +22,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
+
+	"github.com/Azure/ARO-HCP/internal/utils/apihelpers"
 )
 
 // CloudError codes
@@ -240,13 +242,13 @@ func NewResourceNotFoundError(resourceID *azcorearm.ResourceID) *CloudError {
 	var code string
 	var message string
 
-	switch resourceID.ResourceType.String() {
-	case azcorearm.SubscriptionResourceType.String():
+	switch {
+	case apihelpers.ResourceTypeEqual(resourceID.ResourceType, azcorearm.SubscriptionResourceType):
 		code = CloudErrorCodeSubscriptionNotFound
 		message = fmt.Sprintf(
 			"The subscription '%s' was not found.",
 			resourceID.SubscriptionID)
-	case azcorearm.ResourceGroupResourceType.String():
+	case apihelpers.ResourceTypeEqual(resourceID.ResourceType, azcorearm.ResourceGroupResourceType):
 		code = CloudErrorCodeResourceGroupNotFound
 		message = fmt.Sprintf(
 			"The resource group '%s' under subscription '%s' was not found.",
diff --git a/internal/databasetesting/mock_dbclient_test.go b/internal/databasetesting/mock_dbclient_test.go
@@ -26,6 +26,7 @@ import (
 	"github.com/Azure/ARO-HCP/internal/api"
 	"github.com/Azure/ARO-HCP/internal/api/arm"
 	"github.com/Azure/ARO-HCP/internal/database"
+	"github.com/Azure/ARO-HCP/internal/utils/apihelpers"
 )
 
 func TestMockDBClient_LoadFromDirectory(t *testing.T) {
@@ -61,13 +62,13 @@ func TestMockDBClient_LoadFromDirectory(t *testing.T) {
 		}
 
 		switch {
-		case typedDoc.ResourceType == api.ClusterResourceType.String():
+		case apihelpers.ResourceTypeStringEqual(typedDoc.ResourceType, api.ClusterResourceType):
 			foundCluster = true
-		case typedDoc.ResourceType == api.NodePoolResourceType.String():
+		case apihelpers.ResourceTypeStringEqual(typedDoc.ResourceType, api.NodePoolResourceType):
 			foundNodePool = true
-		case typedDoc.ResourceType == azcorearm.SubscriptionResourceType.String():
+		case apihelpers.ResourceTypeStringEqual(typedDoc.ResourceType, azcorearm.SubscriptionResourceType):
 			foundSubscription = true
-		case typedDoc.ResourceType == api.OperationStatusResourceType.String():
+		case apihelpers.ResourceTypeStringEqual(typedDoc.ResourceType, api.OperationStatusResourceType):
 			foundOperation = true
 		}
 	}
@@ -478,7 +479,7 @@ func TestMockDBClient_UntypedCRUD(t *testing.T) {
 		t.Fatalf("Failed to get cluster via untyped CRUD: %v", err)
 	}
 
-	if retrieved.ResourceType != api.ClusterResourceType.String() {
+	if !apihelpers.ResourceTypeStringEqual(retrieved.ResourceType, api.ClusterResourceType) {
 		t.Errorf("Expected resource type %s, got %s", api.ClusterResourceType.String(), retrieved.ResourceType)
 	}
 }
diff --git a/internal/utils/apihelpers/equalities.go b/internal/utils/apihelpers/equalities.go
@@ -0,0 +1,29 @@
+// Copyright 2026 Microsoft Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package apihelpers
+
+import (
+	"strings"
+
+	azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
+)
+
+func ResourceTypeEqual(lhs, rhs azcorearm.ResourceType) bool {
+	return strings.EqualFold(lhs.String(), rhs.String())
+}
+
+func ResourceTypeStringEqual(s string, rt azcorearm.ResourceType) bool {
+	return strings.EqualFold(s, rt.String())
+}
diff --git a/test-integration/utils/integrationutils/cosmos_testinfo.go b/test-integration/utils/integrationutils/cosmos_testinfo.go
@@ -40,6 +40,7 @@ import (
 	"github.com/Azure/ARO-HCP/internal/api"
 	"github.com/Azure/ARO-HCP/internal/database"
 	"github.com/Azure/ARO-HCP/internal/utils"
+	"github.com/Azure/ARO-HCP/internal/utils/apihelpers"
 )
 
 type CosmosIntegrationTestInfo struct {
@@ -115,17 +116,17 @@ func LoadCosmosContent(ctx context.Context, cosmosContainer *azcosmos.ContainerC
 
 	var err error
 	switch {
-	case strings.EqualFold(contentMap["resourceType"].(string), api.OperationStatusResourceType.String()),
-		strings.EqualFold(contentMap["resourceType"].(string), api.ClusterResourceType.String()),
-		strings.EqualFold(contentMap["resourceType"].(string), api.NodePoolResourceType.String()),
-		strings.EqualFold(contentMap["resourceType"].(string), api.ExternalAuthResourceType.String()),
-		strings.EqualFold(contentMap["resourceType"].(string), api.ClusterControllerResourceType.String()),
-		strings.EqualFold(contentMap["resourceType"].(string), api.NodePoolControllerResourceType.String()),
-		strings.EqualFold(contentMap["resourceType"].(string), api.ExternalAuthControllerResourceType.String()):
+	case apihelpers.ResourceTypeStringEqual(contentMap["resourceType"].(string), api.OperationStatusResourceType),
+		apihelpers.ResourceTypeStringEqual(contentMap["resourceType"].(string), api.ClusterResourceType),
+		apihelpers.ResourceTypeStringEqual(contentMap["resourceType"].(string), api.NodePoolResourceType),
+		apihelpers.ResourceTypeStringEqual(contentMap["resourceType"].(string), api.ExternalAuthResourceType),
+		apihelpers.ResourceTypeStringEqual(contentMap["resourceType"].(string), api.ClusterControllerResourceType),
+		apihelpers.ResourceTypeStringEqual(contentMap["resourceType"].(string), api.NodePoolControllerResourceType),
+		apihelpers.ResourceTypeStringEqual(contentMap["resourceType"].(string), api.ExternalAuthControllerResourceType):
 		partitionKey := azcosmos.NewPartitionKeyString(contentMap["partitionKey"].(string))
 		_, err = cosmosContainer.CreateItem(ctx, partitionKey, content, nil)
 
-	case strings.EqualFold(contentMap["resourceType"].(string), azcorearm.SubscriptionResourceType.String()):
+	case apihelpers.ResourceTypeStringEqual(contentMap["resourceType"].(string), azcorearm.SubscriptionResourceType):
 		partitionKey := azcosmos.NewPartitionKeyString(contentMap["partitionKey"].(string))
 		_, err = cosmosContainer.CreateItem(ctx, partitionKey, content, nil)
 
@@ -280,12 +281,12 @@ func saveContainerContent(ctx context.Context, documentLister DocumentLister, ou
 				armResourceID.Name+".json",
 			)
 
-		case strings.EqualFold(resourceType.(string), azcorearm.SubscriptionResourceType.String()):
+		case apihelpers.ResourceTypeStringEqual(resourceType.(string), azcorearm.SubscriptionResourceType):
 			filename = filepath.Join(
 				"subscriptions",
 				fmt.Sprintf("subscription_%s.json", docMap["id"].(string)))
 
-		case strings.EqualFold(resourceType.(string), api.OperationStatusResourceType.String()):
+		case apihelpers.ResourceTypeStringEqual(resourceType.(string), api.OperationStatusResourceType):
 			externalID := properties["externalId"].(string)
 			if clusterResourceID, _ := azcorearm.ParseResourceID(externalID); clusterResourceID != nil {
 				clusterDir := resourceIDToDir(clusterResourceID)
diff --git a/test-integration/utils/integrationutils/frontend_testinfo.go b/test-integration/utils/integrationutils/frontend_testinfo.go
@@ -30,6 +30,7 @@ import (
 	"github.com/Azure/ARO-HCP/internal/api"
 	"github.com/Azure/ARO-HCP/internal/api/arm"
 	"github.com/Azure/ARO-HCP/internal/database"
+	"github.com/Azure/ARO-HCP/internal/utils/apihelpers"
 	hcpsdk20240610preview "github.com/Azure/ARO-HCP/test/sdk/v20240610preview/resourcemanager/redhatopenshifthcp/armredhatopenshifthcp"
 )
 
@@ -120,7 +121,7 @@ func resourceIDToDir(resourceID *azcorearm.ResourceID) string {
 		)
 
 	default:
-		if resourceID.Parent.ResourceType.String() == "Microsoft.Resources/resourceGroups" {
+		if apihelpers.ResourceTypeEqual(resourceID.Parent.ResourceType, azcorearm.ResourceGroupResourceType) {
 			return filepath.Join(
 				startingDir,
 				resourceID.ResourceType.String(),

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ import (`
`24`	`24`	`"github.com/Azure/ARO-HCP/internal/api"`
`25`	`25`	`"github.com/Azure/ARO-HCP/internal/database"`
`26`	`26`	`"github.com/Azure/ARO-HCP/internal/utils"`
	`27`	`+ "github.com/Azure/ARO-HCP/internal/utils/apihelpers"`
`27`	`28`	`)`
`28`	`29`
`29`	`30`	`// newInitialServiceProviderCluster returns a new ServiceProviderCluster with`
`@@ -46,7 +47,7 @@ func newInitialServiceProviderCluster(clusterResourceID azcorearm.ResourceID) `
`46`	`47`	`func GetOrCreateServiceProviderCluster(`
`47`	`48`	`ctx context.Context, dbClient database.DBClient, clusterResourceID *azcorearm.ResourceID,`
`48`	`49`	`) (*api.ServiceProviderCluster, error) {`
`49`		`- if clusterResourceID.ResourceType.String() != api.ClusterResourceType.String() {`
	`50`	`+ if !apihelpers.ResourceTypeEqual(clusterResourceID.ResourceType, api.ClusterResourceType) {`
`50`	`51`	`return nil, utils.TrackError(fmt.Errorf("expected resource type %s, got %s", api.ClusterResourceType, clusterResourceID.ResourceType))`
`51`	`52`	`}`
`52`	`53`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`"github.com/Azure/ARO-HCP/internal/api"`
`27`	`27`	`"github.com/Azure/ARO-HCP/internal/api/arm"`
`28`	`28`	`"github.com/Azure/ARO-HCP/internal/database"`
	`29`	`+ "github.com/Azure/ARO-HCP/internal/utils/apihelpers"`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	`func TestMockDBClient_LoadFromDirectory(t *testing.T) {`
`@@ -61,13 +62,13 @@ func TestMockDBClient_LoadFromDirectory(t *testing.T) {`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`switch {`
`64`		`- case typedDoc.ResourceType == api.ClusterResourceType.String():`
	`65`	`+ case apihelpers.ResourceTypeStringEqual(typedDoc.ResourceType, api.ClusterResourceType):`
`65`	`66`	`foundCluster = true`
`66`		`- case typedDoc.ResourceType == api.NodePoolResourceType.String():`
	`67`	`+ case apihelpers.ResourceTypeStringEqual(typedDoc.ResourceType, api.NodePoolResourceType):`
`67`	`68`	`foundNodePool = true`
`68`		`- case typedDoc.ResourceType == azcorearm.SubscriptionResourceType.String():`
	`69`	`+ case apihelpers.ResourceTypeStringEqual(typedDoc.ResourceType, azcorearm.SubscriptionResourceType):`
`69`	`70`	`foundSubscription = true`
`70`		`- case typedDoc.ResourceType == api.OperationStatusResourceType.String():`
	`71`	`+ case apihelpers.ResourceTypeStringEqual(typedDoc.ResourceType, api.OperationStatusResourceType):`
`71`	`72`	`foundOperation = true`
`72`	`73`	`}`
`73`	`74`	`}`
`@@ -478,7 +479,7 @@ func TestMockDBClient_UntypedCRUD(t *testing.T) {`
`478`	`479`	`t.Fatalf("Failed to get cluster via untyped CRUD: %v", err)`
`479`	`480`	`}`
`480`	`481`
`481`		`- if retrieved.ResourceType != api.ClusterResourceType.String() {`
	`482`	`+ if !apihelpers.ResourceTypeStringEqual(retrieved.ResourceType, api.ClusterResourceType) {`
`482`	`483`	`t.Errorf("Expected resource type %s, got %s", api.ClusterResourceType.String(), retrieved.ResourceType)`
`483`	`484`	`}`
`484`	`485`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ import (`
`30`	`30`	`"github.com/Azure/ARO-HCP/internal/api"`
`31`	`31`	`"github.com/Azure/ARO-HCP/internal/api/arm"`
`32`	`32`	`"github.com/Azure/ARO-HCP/internal/database"`
	`33`	`+ "github.com/Azure/ARO-HCP/internal/utils/apihelpers"`
`33`	`34`	`hcpsdk20240610preview "github.com/Azure/ARO-HCP/test/sdk/v20240610preview/resourcemanager/redhatopenshifthcp/armredhatopenshifthcp"`
`34`	`35`	`)`
`35`	`36`
`@@ -120,7 +121,7 @@ func resourceIDToDir(resourceID *azcorearm.ResourceID) string {`
`120`	`121`	`)`
`121`	`122`
`122`	`123`	`default:`
`123`		`- if resourceID.Parent.ResourceType.String() == "Microsoft.Resources/resourceGroups" {`
	`124`	`+ if apihelpers.ResourceTypeEqual(resourceID.Parent.ResourceType, azcorearm.ResourceGroupResourceType) {`
`124`	`125`	`return filepath.Join(`
`125`	`126`	`startingDir,`
`126`	`127`	`resourceID.ResourceType.String(),`