rename azurerm_graph_account to azurerm_graph_services_account

.github/labeler-issue-triage.yml

@@ -142,7 +142,7 @@ service/frontdoor:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_frontdoor((.|\n)*)###'
 
 service/graph:
-  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_graph_account((.|\n)*)###'
+  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_graph_((.|\n)*)###'
 
 service/hdinsight:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_hdinsight_((.|\n)*)###'
@@ -238,7 +238,10 @@ service/netapp:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_netapp_((.|\n)*)###'
 
 service/network:
-  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(application_gateway\W+|application_security_group\W+|bastion_host|express_route_|ip_group|local_network_gateway|nat_gateway|network_|point_to_site_vpn_gateway|private_endpoint\W+|private_endpoint_application_security_group_association\W+|private_endpoint_connection\W+|private_link_service\W+|private_link_service_endpoint_connections\W+|public_ip|route|subnet|virtual_hub\W+|virtual_hub_bgp_connection\W+|virtual_hub_connection\W+|virtual_hub_ip\W+|virtual_hub_route_table\W+|virtual_hub_route_table_route\W+|virtual_hub_security_partner_provider\W+|virtual_machine_packet_capture\W+|virtual_machine_scale_set_packet_capture\W+|virtual_network\W+|virtual_network_dns_servers\W+|virtual_network_gateway\W+|virtual_network_gateway_connection\W+|virtual_network_gateway_nat_rule\W+|virtual_network_peering\W+|virtual_wan\W+|vpn_|web_application_firewall_policy)((.|\n)*)###'
+  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(application_gateway\W+|application_security_group\W+|bastion_host|express_route_|ip_group|local_network_gateway|nat_gateway|network_connection_monitor\W+|network_ddos_protection_plan\W+|network_interface\W+|network_interface_application_gateway_backend_address_pool_association\W+|network_interface_application_security_group_association\W+|network_interface_backend_address_pool_association\W+|network_interface_nat_rule_association\W+|network_interface_security_group_association\W+|network_manager\W+|network_manager_admin_rule\W+|network_manager_admin_rule_collection\W+|network_manager_connectivity_configuration\W+|network_manager_deployment\W+|network_manager_management_group_connection\W+|network_manager_network_group\W+|network_manager_network_group\W+|network_manager_scope_connection\W+|network_manager_security_admin_configuration\W+|network_manager_static_member\W+|network_manager_subscription_connection\W+|network_packet_capture\W+|network_profile\W+|network_security_group\W+|network_security_rule\W+|network_service_tags\W+|network_watcher\W+|network_watcher_flow_log\W+|point_to_site_vpn_gateway|private_endpoint\W+|private_endpoint_application_security_group_association\W+|private_endpoint_connection\W+|private_link_service\W+|private_link_service_endpoint_connections\W+|public_ip|route|subnet|virtual_hub\W+|virtual_hub_bgp_connection\W+|virtual_hub_connection\W+|virtual_hub_ip\W+|virtual_hub_route_table\W+|virtual_hub_route_table_route\W+|virtual_hub_security_partner_provider\W+|virtual_machine_packet_capture\W+|virtual_machine_scale_set_packet_capture\W+|virtual_network\W+|virtual_network_dns_servers\W+|virtual_network_gateway\W+|virtual_network_gateway_connection\W+|virtual_network_gateway_nat_rule\W+|virtual_network_peering\W+|virtual_wan\W+|vpn_|web_application_firewall_policy)((.|\n)*)###'
+
+service/network-function:
+  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_network_function_azure_traffic_collector((.|\n)*)###'
 
 service/nginx:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_nginx_((.|\n)*)###'

.teamcity/components/generated/services.kt

@@ -52,7 +52,7 @@ var services = mapOf(
         "firewall" to "Firewall",
         "fluidrelay" to "Fluid Relay",
         "frontdoor" to "FrontDoor",
-        "graph" to "Graph",
+        "graph" to "Graph Services",
         "hdinsight" to "HDInsight",
         "hpccache" to "HPC Cache",
         "hsm" to "Hardware Security Module",

internal/clients/client.go

@@ -68,7 +68,7 @@ import (
 	firewall "github.com/hashicorp/terraform-provider-azurerm/internal/services/firewall/client"
 	fluidrelay "github.com/hashicorp/terraform-provider-azurerm/internal/services/fluidrelay/client"
 	frontdoor "github.com/hashicorp/terraform-provider-azurerm/internal/services/frontdoor/client"
-	graph "github.com/hashicorp/terraform-provider-azurerm/internal/services/graph/client"
+	graph "github.com/hashicorp/terraform-provider-azurerm/internal/services/graphservices/client"
 	hdinsight "github.com/hashicorp/terraform-provider-azurerm/internal/services/hdinsight/client"
 	healthcare "github.com/hashicorp/terraform-provider-azurerm/internal/services/healthcare/client"
 	hpccache "github.com/hashicorp/terraform-provider-azurerm/internal/services/hpccache/client"

internal/provider/services.go

@@ -54,7 +54,7 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/firewall"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/fluidrelay"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/frontdoor"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/graph"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/graphservices"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/hdinsight"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/healthcare"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/hpccache"
@@ -157,7 +157,7 @@ func SupportedTypedServices() []sdk.TypedServiceRegistration {
 		domainservices.Registration{},
 		eventhub.Registration{},
 		fluidrelay.Registration{},
-		graph.Registration{},
+		graphservices.Registration{},
 		hybridcompute.Registration{},
 		iothub.Registration{},
 		iotcentral.Registration{},

internal/services/graph/graph_account_resource.go → internal/services/graphservices/graph_account_resource.go

@@ -1,4 +1,4 @@
-package graph
+package graphservices
 
 import (
 	"context"
@@ -16,11 +16,27 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 )
 
+var _ sdk.Resource = ServicesAccountResource{}
+var _ sdk.ResourceWithUpdate = ServicesAccountResource{}
+
+type ServicesAccountResource struct {
+	AccountResource
+}
+
+func (r ServicesAccountResource) ResourceType() string {
+	return "azurerm_graph_services_account"
+}
+
 var _ sdk.Resource = AccountResource{}
 var _ sdk.ResourceWithUpdate = AccountResource{}
+var _ sdk.ResourceWithDeprecationReplacedBy = AccountResource{}
 
 type AccountResource struct{}
 
+func (r AccountResource) DeprecatedInFavourOfResource() string {
+	return "azurerm_graph_services_account"
+}
+
 func (r AccountResource) ModelObject() interface{} {
 	return &AccountResourceSchema{}
 }
@@ -90,7 +106,7 @@ func (r AccountResource) Create() sdk.ResourceFunc {
 				}
 			}
 			if !response.WasNotFound(existing.HttpResponse) {
-				return metadata.ResourceRequiresImport(r.ResourceType(), id)
+				return metadata.ResourceRequiresImport("azurerm_graph_services_account", id)
 			}
 
 			payload := graphservicesprods.AccountResource{

internal/services/graph/graph_account_resource_test.go → internal/services/graphservices/graph_account_resource_test.go

@@ -1,4 +1,4 @@
-package graph_test
+package graphservices_test
 
 import (
 	"context"
@@ -30,7 +30,7 @@ func TestAccGraphAccount(t *testing.T) {
 type AccountTestResource struct{}
 
 func testAccGraphAccount_basic(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_graph_account", "test")
+	data := acceptance.BuildTestData(t, "azurerm_graph_services_account", "test")
 	r := AccountTestResource{}
 
 	data.ResourceSequentialTest(t, r, []acceptance.TestStep{
@@ -45,7 +45,7 @@ func testAccGraphAccount_basic(t *testing.T) {
 }
 
 func testAccGraphAccount_requiresImport(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_graph_account", "test")
+	data := acceptance.BuildTestData(t, "azurerm_graph_services_account", "test")
 
 	r := AccountTestResource{}
 
@@ -61,7 +61,7 @@ func testAccGraphAccount_requiresImport(t *testing.T) {
 }
 
 func testAccGraphAccount_complete(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_graph_account", "test")
+	data := acceptance.BuildTestData(t, "azurerm_graph_services_account", "test")
 	r := AccountTestResource{}
 
 	data.ResourceSequentialTest(t, r, []acceptance.TestStep{
@@ -76,7 +76,7 @@ func testAccGraphAccount_complete(t *testing.T) {
 }
 
 func testAccGraphAccount_update(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_graph_account", "test")
+	data := acceptance.BuildTestData(t, "azurerm_graph_services_account", "test")
 	r := AccountTestResource{}
 
 	data.ResourceSequentialTest(t, r, []acceptance.TestStep{
@@ -120,7 +120,7 @@ func (r AccountTestResource) basic(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %s
 
-resource "azurerm_graph_account" "test" {
+resource "azurerm_graph_services_account" "test" {
   name                = "acctesta-%[2]d"
   application_id      = "%[3]s"
   resource_group_name = azurerm_resource_group.test.name
@@ -132,10 +132,10 @@ func (r AccountTestResource) requiresImport(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %s
 
-resource "azurerm_graph_account" "import" {
-  application_id      = azurerm_graph_account.test.application_id
-  name                = azurerm_graph_account.test.name
-  resource_group_name = azurerm_graph_account.test.resource_group_name
+resource "azurerm_graph_services_account" "import" {
+  application_id      = azurerm_graph_services_account.test.application_id
+  name                = azurerm_graph_services_account.test.name
+  resource_group_name = azurerm_graph_services_account.test.resource_group_name
 }
 `, r.basic(data))
 }
@@ -144,7 +144,7 @@ func (r AccountTestResource) complete(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %s
 
-resource "azurerm_graph_account" "test" {
+resource "azurerm_graph_services_account" "test" {
   name                = "acctesta-%[2]d"
   resource_group_name = azurerm_resource_group.test.name
   application_id      = "%[3]s"

internal/services/graph/registration.go → internal/services/graphservices/registration.go

@@ -1,4 +1,4 @@
-package graph
+package graphservices
 
 import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
@@ -14,12 +14,12 @@ func (r Registration) AssociatedGitHubLabel() string {
 
 // Name is the name of this Service
 func (r Registration) Name() string {
-	return "Graph"
+	return "Graph Services"
 }
 
 // WebsiteCategories returns a list of categories which can be used for the sidebar
 func (r Registration) WebsiteCategories() []string {
-	return []string{"Graph"}
+	return []string{"Graph Services"}
 }
 
 // DataSources returns a list of Data Sources supported by this Service
@@ -31,5 +31,6 @@ func (r Registration) DataSources() []sdk.DataSource {
 func (r Registration) Resources() []sdk.Resource {
 	return []sdk.Resource{
 		AccountResource{},
+		ServicesAccountResource{},
 	}
 }

website/allowed-subcategories

@@ -46,7 +46,7 @@ Digital Twins
 Disks
 Elastic
 Fluid Relay
-Graph
+Graph Services
 HDInsight
 Hardware Security Module
 Healthcare

website/docs/r/graph_account.html.markdown

@@ -1,14 +1,16 @@
 ---
-subcategory: "Graph"
+subcategory: "Graph Services"
 layout: "azurerm"
 page_title: "Azure Resource Manager: azurerm_graph_account"
 description: |-
-  Manages a Account.
+  Manages a Microsoft Graph Services Account.
 ---
 
 # azurerm_graph_account
 
-Manages a Graph Account.
+Manages a Microsoft Graph Services Account.
+
+!> **NOTE:** This resource has been deprecated in version 3.0 of the AzureRM provider and will be removed in version 4.0. Please use [`azurerm_graph_services_account`](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/graph_services_account) resources instead.
 
 ## Example Usage
 

website/docs/r/graph_services_account.html.markdown

@@ -0,0 +1,70 @@
+---
+subcategory: "Graph Services"
+layout: "azurerm"
+page_title: "Azure Resource Manager: azurerm_graph_services_account"
+description: |-
+  Manages a Microsoft Graph Services Account.
+---
+
+# azurerm_graph_services_account
+
+Manages a Microsoft Graph Services Account.
+
+## Example Usage
+
+```hcl
+resource "azuread_application" "example" {
+  display_name = "example-app"
+}
+resource "azurerm_resource_group" "example" {
+  name     = "example-resources"
+  location = "West Europe"
+}
+resource "azurerm_graph_services_account" "example" {
+  name                = "example"
+  resource_group_name = azurerm_resource_group.example.name
+  application_id      = azuread_application.example.application_id
+  tags = {
+    environment = "Production"
+  }
+}
+```
+
+## Arguments Reference
+
+The following arguments are supported:
+
+* `name` - (Required) Specifies the name of this Account. Changing this forces a new Account to be created.
+
+* `resource_group_name` - (Required) Specifies the name of the Resource Group within which this Account should exist. Changing this forces a new Account to be created.
+
+* `application_id` - (Required) Customer owned application ID. Changing this forces a new Account to be created.
+
+* `tags` - (Optional) A mapping of tags which should be assigned to the Account.
+
+## Attributes Reference
+
+In addition to the Arguments listed above - the following Attributes are exported:
+
+* `id` - The ID of the Account.
+
+* `billing_plan_id` - Billing Plan Id.
+
+---
+
+## Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 30 minutes) Used when creating this Account.
+* `delete` - (Defaults to 30 minutes) Used when deleting this Account.
+* `read` - (Defaults to 5 minutes) Used when retrieving this Account.
+* `update` - (Defaults to 30 minutes) Used when updating this Account.
+
+## Import
+
+An existing Account can be imported into Terraform using the `resource id`, e.g.
+
+```shell
+terraform import azurerm_graph_services_account.example /subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/example-resource-group/providers/Microsoft.GraphServices/accounts/account1
+```