Move FeatureClient to azureclient wrapper and rename files

Author: b-lnimmala

…/frontend/encryptionathost_validation.go pkg/frontend/features_validation.gopkg/frontend/encryptionathost_validation.go renamed to pkg/frontend/features_validation.go pkg/frontend/encryptionathost_validation.go renamed to pkg/frontend/features_validation.go

@@ -8,17 +8,12 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armfeatures"
-
 	"github.com/Azure/ARO-RP/pkg/api"
 	"github.com/Azure/ARO-RP/pkg/env"
 	"github.com/Azure/ARO-RP/pkg/util/azureclient"
+	"github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/armfeatures"
 )
 
-type FeaturesClient interface {
-	Get(ctx context.Context, resourceProviderNamespace string, featureName string, options *armfeatures.ClientGetOptions) (armfeatures.ClientGetResponse, error)
-}
-
 type FeaturesValidator interface {
 	ValidateSubscriptionFeatures(ctx context.Context, azEnv *azureclient.AROEnvironment, environment env.Interface, subscriptionID, tenantID string, oc *api.OpenShiftCluster) error
 }
@@ -39,7 +34,7 @@ func (f featuresValidator) ValidateSubscriptionFeatures(ctx context.Context, azE
 			return err
 		}
 
-		featuresClient, err := armfeatures.NewClient(subscriptionID, fpCred, azEnv.ArmClientOptions())
+		featuresClient, err := armfeatures.NewFeaturesClient(subscriptionID, fpCred, azEnv.ArmClientOptions())
 		if err != nil {
 			return err
 		}
@@ -51,7 +46,7 @@ func (f featuresValidator) ValidateSubscriptionFeatures(ctx context.Context, azE
 
 func validateEncryptionAtHostFeature(
 	ctx context.Context,
-	featuresClient FeaturesClient,
+	featuresClient armfeatures.FeaturesClient,
 	subscriptionID, fieldPath string,
 ) error {
 	resp, err := featuresClient.Get(ctx, "Microsoft.Compute", "EncryptionAtHost", nil)

…tend/encryptionathost_validation_test.go pkg/frontend/features_validation_test.gopkg/frontend/encryptionathost_validation_test.go renamed to pkg/frontend/features_validation_test.go pkg/frontend/encryptionathost_validation_test.go renamed to pkg/frontend/features_validation_test.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armfeatures"
 
-	mock_frontend "github.com/Azure/ARO-RP/pkg/util/mocks/frontend"
+	mock_armfeatures "github.com/Azure/ARO-RP/pkg/util/mocks/azureclient/azuresdk/armfeatures"
 	"github.com/Azure/ARO-RP/pkg/util/pointerutils"
 )
 
@@ -63,7 +63,7 @@ func TestValidateEncryptionAtHostFeature(t *testing.T) {
 			controller := gomock.NewController(t)
 			defer controller.Finish()
 
-			featuresClient := mock_frontend.NewMockFeaturesClient(controller)
+			featuresClient := mock_armfeatures.NewMockFeaturesClient(controller)
 
 			var mockResponse armfeatures.ClientGetResponse
 			if tt.mockPropertiesNil {

pkg/frontend/generate.go

@@ -7,5 +7,5 @@ package frontend
 //go:generate mockgen -source quota_validation.go -destination=../util/mocks/$GOPACKAGE/quota_validation.go github.com/Azure/ARO-RP/pkg/frontend QuotaValidator
 //go:generate mockgen -source providers_validation.go -destination=../util/mocks/$GOPACKAGE/providers_validation.go github.com/Azure/ARO-RP/pkg/frontend ProvidersValidator
 //go:generate mockgen -source sku_validation.go -destination=../util/mocks/$GOPACKAGE/sku_validation.go github.com/Azure/ARO-RP/pkg/frontend SkuValidator
-//go:generate mockgen -source encryptionathost_validation.go -destination=../util/mocks/$GOPACKAGE/encryptionathost_validation.go github.com/Azure/ARO-RP/pkg/frontend FeaturesClient,FeaturesValidator
+//go:generate mockgen -source features_validation.go -destination=../util/mocks/$GOPACKAGE/features_validation.go github.com/Azure/ARO-RP/pkg/frontend FeaturesValidator
 //go:generate mockgen -source adminreplies.go -destination=../util/mocks/$GOPACKAGE/adminreplies.go github.com/Azure/ARO-RP/pkg/frontend StreamResponder

pkg/util/azureclient/azuresdk/armfeatures/client.go

@@ -0,0 +1,47 @@
+package armfeatures
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the Apache License 2.0.
+
+import (
+	"context"
+
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armfeatures"
+
+	"github.com/Azure/ARO-RP/pkg/util/azureclient"
+)
+
+type FeaturesClient interface {
+	Get(ctx context.Context, resourceProviderNamespace string, featureName string, options *armfeatures.ClientGetOptions) (armfeatures.ClientGetResponse, error)
+}
+
+type featuresClient struct {
+	*armfeatures.Client
+}
+
+var _ FeaturesClient = &featuresClient{}
+
+// NewDefaultFeaturesClient creates a new FeaturesClient with default options
+func NewDefaultFeaturesClient(environment *azureclient.AROEnvironment, subscriptionID string, credential azcore.TokenCredential) (FeaturesClient, error) {
+	options := &arm.ClientOptions{
+		ClientOptions: azcore.ClientOptions{
+			Cloud: environment.Cloud,
+		},
+	}
+
+	return NewFeaturesClient(subscriptionID, credential, options)
+}
+
+// NewFeaturesClient creates a new FeaturesClient
+func NewFeaturesClient(subscriptionID string, credential azcore.TokenCredential, options *arm.ClientOptions) (FeaturesClient, error) {
+	client, err := armfeatures.NewClient(subscriptionID, credential, options)
+	if err != nil {
+		return nil, err
+	}
+
+	return &featuresClient{
+		Client: client,
+	}, nil
+}

pkg/util/azureclient/azuresdk/armfeatures/generate.go

@@ -0,0 +1,7 @@
+package armfeatures
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the Apache License 2.0.
+
+//go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
+//go:generate mockgen -destination=../../../../util/mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/$GOPACKAGE FeaturesClient