Merge pull request #22673 from hashicorp/refactor/eventgrid-to-go-azu…

…re-sdk

`eventgrid`: refactoring to use `hashicorp/go-azure-sdk`

internal/clients/client.go

@@ -14,6 +14,7 @@ import (
 	azurestackhci_v2023_03_01 "github.com/hashicorp/go-azure-sdk/resource-manager/azurestackhci/2023-03-01"
 	datadog_v2021_03_01 "github.com/hashicorp/go-azure-sdk/resource-manager/datadog/2021-03-01"
 	dns_v2018_05_01 "github.com/hashicorp/go-azure-sdk/resource-manager/dns/2018-05-01"
+	eventgrid_v2022_06_15 "github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2022-06-15"
 	fluidrelay_2022_05_26 "github.com/hashicorp/go-azure-sdk/resource-manager/fluidrelay/2022-05-26"
 	nginx2 "github.com/hashicorp/go-azure-sdk/resource-manager/nginx/2022-08-01"
 	redis_v2023_04_01 "github.com/hashicorp/go-azure-sdk/resource-manager/redis/2023-04-01"
@@ -193,7 +194,7 @@ type Client struct {
 	Dns                   *dns_v2018_05_01.Client
 	DomainServices        *domainservices.Client
 	Elastic               *elastic.Client
-	EventGrid             *eventgrid.Client
+	EventGrid             *eventgrid_v2022_06_15.Client
 	Eventhub              *eventhub.Client
 	Firewall              *firewall.Client
 	FluidRelay            *fluidrelay_2022_05_26.Client
@@ -397,7 +398,9 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
 	if client.Elastic, err = elastic.NewClient(o); err != nil {
 		return fmt.Errorf("building clients for Elastic: %+v", err)
 	}
-	client.EventGrid = eventgrid.NewClient(o)
+	if client.EventGrid, err = eventgrid.NewClient(o); err != nil {
+		return fmt.Errorf("building clients for EventGrid: %+v", err)
+	}
 	if client.Eventhub, err = eventhub.NewClient(o); err != nil {
 		return fmt.Errorf("building clients for Eventhub: %+v", err)
 	}

internal/services/datafactory/data_factory_trigger_custom_event_resource.go

@@ -9,11 +9,11 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/datafactory/mgmt/2018-06-01/datafactory" // nolint: staticcheck
 	"github.com/hashicorp/go-azure-sdk/resource-manager/datafactory/2018-06-01/factories"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2022-06-15/topics"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/datafactory/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/datafactory/validate"
-	eventgridValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventgrid/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
@@ -58,7 +58,7 @@ func resourceDataFactoryTriggerCustomEvent() *pluginsdk.Resource {
 				Type:         pluginsdk.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: eventgridValidate.TopicID,
+				ValidateFunc: topics.ValidateTopicID,
 			},
 
 			"events": {

internal/services/eventgrid/client/client.go

@@ -4,44 +4,19 @@
 package client
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2021-12-01/eventgrid" // nolint: staticcheck
+	"fmt"
+
+	eventgrid_v2022_06_15 "github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2022-06-15"
+	"github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
 )
 
-type Client struct {
-	DomainsClient                       *eventgrid.DomainsClient
-	DomainTopicsClient                  *eventgrid.DomainTopicsClient
-	EventSubscriptionsClient            *eventgrid.EventSubscriptionsClient
-	TopicsClient                        *eventgrid.TopicsClient
-	SystemTopicsClient                  *eventgrid.SystemTopicsClient
-	SystemTopicEventSubscriptionsClient *eventgrid.SystemTopicEventSubscriptionsClient
-}
-
-func NewClient(o *common.ClientOptions) *Client {
-	DomainsClient := eventgrid.NewDomainsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
-	o.ConfigureClient(&DomainsClient.Client, o.ResourceManagerAuthorizer)
-
-	DomainTopicsClient := eventgrid.NewDomainTopicsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
-	o.ConfigureClient(&DomainTopicsClient.Client, o.ResourceManagerAuthorizer)
-
-	EventSubscriptionsClient := eventgrid.NewEventSubscriptionsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
-	o.ConfigureClient(&EventSubscriptionsClient.Client, o.ResourceManagerAuthorizer)
-
-	TopicsClient := eventgrid.NewTopicsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
-	o.ConfigureClient(&TopicsClient.Client, o.ResourceManagerAuthorizer)
-
-	SystemTopicsClient := eventgrid.NewSystemTopicsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
-	o.ConfigureClient(&SystemTopicsClient.Client, o.ResourceManagerAuthorizer)
-
-	SystemTopicEventSubscriptionsClient := eventgrid.NewSystemTopicEventSubscriptionsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
-	o.ConfigureClient(&SystemTopicEventSubscriptionsClient.Client, o.ResourceManagerAuthorizer)
-
-	return &Client{
-		DomainsClient:                       &DomainsClient,
-		EventSubscriptionsClient:            &EventSubscriptionsClient,
-		DomainTopicsClient:                  &DomainTopicsClient,
-		TopicsClient:                        &TopicsClient,
-		SystemTopicsClient:                  &SystemTopicsClient,
-		SystemTopicEventSubscriptionsClient: &SystemTopicEventSubscriptionsClient,
+func NewClient(o *common.ClientOptions) (*eventgrid_v2022_06_15.Client, error) {
+	client, err := eventgrid_v2022_06_15.NewClientWithBaseURI(o.Environment.ResourceManager, func(c *resourcemanager.Client) {
+		o.Configure(c, o.Authorizers.ResourceManager)
+	})
+	if err != nil {
+		return nil, fmt.Errorf("building EventGrid client: %+v", err)
 	}
+	return client, nil
 }