Merge pull request #3 from hashicorp/main

Fork Sync: Update from parent repository

internal/services/eventgrid/eventgrid_domain_data_source.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
+	"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2022-06-15/domains"
@@ -138,6 +139,8 @@ func dataSourceEventGridDomain() *pluginsdk.Resource {
 			},
 
 			"tags": commonschema.TagsDataSource(),
+
+			"identity": commonschema.SystemOrUserAssignedIdentityComputed(),
 		},
 	}
 }
@@ -202,6 +205,14 @@ func dataSourceEventGridDomainRead(d *pluginsdk.ResourceData, meta interface{})
 			if err := d.Set("inbound_ip_rule", inboundIPRules); err != nil {
 				return fmt.Errorf("setting `inbound_ip_rule` in %s: %+v", id, err)
 			}
+
+			flattenedIdentity, err := identity.FlattenSystemAndUserAssignedMap(model.Identity)
+			if err != nil {
+				return fmt.Errorf("flattening `identity`: %+v", err)
+			}
+			if err := d.Set("identity", flattenedIdentity); err != nil {
+				return fmt.Errorf("setting `identity`: %+v", err)
+			}
 		}
 
 		if err := tags.FlattenAndSet(d, model.Tags); err != nil {

internal/services/eventgrid/eventgrid_domain_data_source_test.go

@@ -35,6 +35,43 @@ func TestAccEventGridDomainDataSource_basic(t *testing.T) {
 				check.That(data.ResourceName).Key("inbound_ip_rule.1.ip_mask").Exists(),
 				check.That(data.ResourceName).Key("inbound_ip_rule.0.action").Exists(),
 				check.That(data.ResourceName).Key("inbound_ip_rule.1.action").Exists(),
+				check.That(data.ResourceName).Key("identity.#").HasValue("0"),
+			),
+		},
+	})
+}
+
+func TestAccEventGridDomainDataSource_systemAssignedIdentity(t *testing.T) {
+	data := acceptance.BuildTestData(t, "data.azurerm_eventgrid_domain", "test")
+	r := EventGridDomainDataSource{}
+
+	data.DataSourceTest(t, []acceptance.TestStep{
+		{
+			Config: r.basicWithSystemManagedIdentity(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).Key("identity.#").HasValue("1"),
+				check.That(data.ResourceName).Key("identity.0.type").HasValue("SystemAssigned"),
+				check.That(data.ResourceName).Key("identity.0.identity_ids.#").HasValue("0"),
+				check.That(data.ResourceName).Key("identity.0.principal_id").Exists(),
+				check.That(data.ResourceName).Key("identity.0.tenant_id").Exists(),
+			),
+		},
+	})
+}
+
+func TestAccEventGridDomainDataSource_userAssignedIdentity(t *testing.T) {
+	data := acceptance.BuildTestData(t, "data.azurerm_eventgrid_domain", "test")
+	r := EventGridDomainDataSource{}
+
+	data.DataSourceTest(t, []acceptance.TestStep{
+		{
+			Config: r.basicWithUserAssignedManagedIdentity(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).Key("identity.#").HasValue("1"),
+				check.That(data.ResourceName).Key("identity.0.type").HasValue("UserAssigned"),
+				check.That(data.ResourceName).Key("identity.0.identity_ids.#").HasValue("1"),
+				check.That(data.ResourceName).Key("identity.0.principal_id").IsEmpty(),
+				check.That(data.ResourceName).Key("identity.0.tenant_id").IsEmpty(),
 			),
 		},
 	})
@@ -50,3 +87,25 @@ data "azurerm_eventgrid_domain" "test" {
 }
 `, EventGridDomainResource{}.complete(data))
 }
+
+func (EventGridDomainDataSource) basicWithSystemManagedIdentity(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%s
+
+data "azurerm_eventgrid_domain" "test" {
+  name                = azurerm_eventgrid_domain.test.name
+  resource_group_name = azurerm_resource_group.test.name
+}
+`, EventGridDomainResource{}.basicWithSystemManagedIdentity(data))
+}
+
+func (EventGridDomainDataSource) basicWithUserAssignedManagedIdentity(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%s
+
+data "azurerm_eventgrid_domain" "test" {
+  name                = azurerm_eventgrid_domain.test.name
+  resource_group_name = azurerm_resource_group.test.name
+}
+`, EventGridDomainResource{}.basicWithUserAssignedManagedIdentity(data))
+}

internal/services/newrelic/client/client.go

@@ -4,23 +4,35 @@
 package client
 
 import (
+	"fmt"
+
 	"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/monitors"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/tagrules"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
 )
 
 type Client struct {
 	MonitorsClient *monitors.MonitorsClient
+	TagRulesClient *tagrules.TagRulesClient
 }
 
 func NewClient(o *common.ClientOptions) (*Client, error) {
-
 	monitorsClient, err := monitors.NewMonitorsClientWithBaseURI(o.Environment.ResourceManager)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("building Monitors client: %+v", err)
 	}
+
 	o.Configure(monitorsClient.Client, o.Authorizers.ResourceManager)
 
+	tagRulesClient, err := tagrules.NewTagRulesClientWithBaseURI(o.Environment.ResourceManager)
+	if err != nil {
+		return nil, fmt.Errorf("building TagRules client: %+v", err)
+	}
+
+	o.Configure(tagRulesClient.Client, o.Authorizers.ResourceManager)
+
 	return &Client{
 		MonitorsClient: monitorsClient,
+		TagRulesClient: tagRulesClient,
 	}, nil
 }