azurerm_iothub_digital_twins -> azurerm_digital_twins_instance

azurerm/internal/clients/client.go

@@ -33,6 +33,7 @@ import (
 	desktopvirtualization "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/desktopvirtualization/client"
 	devspace "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/devspace/client"
 	devtestlabs "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/devtestlabs/client"
+	digitaltwins "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/digitaltwins/client"
 	dns "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns/client"
 	eventgrid "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/eventgrid/client"
 	eventhub "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/eventhub/client"
@@ -123,6 +124,7 @@ type Client struct {
 	DesktopVirtualization *desktopvirtualization.Client
 	DevSpace              *devspace.Client
 	DevTestLabs           *devtestlabs.Client
+	DigitalTwins          *digitaltwins.Client
 	Dns                   *dns.Client
 	EventGrid             *eventgrid.Client
 	Eventhub              *eventhub.Client
@@ -214,6 +216,7 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
 	client.DesktopVirtualization = desktopvirtualization.NewClient(o)
 	client.DevSpace = devspace.NewClient(o)
 	client.DevTestLabs = devtestlabs.NewClient(o)
+	client.DigitalTwins = digitaltwins.NewClient(o)
 	client.Dns = dns.NewClient(o)
 	client.EventGrid = eventgrid.NewClient(o)
 	client.Eventhub = eventhub.NewClient(o)

azurerm/internal/provider/services.go

@@ -29,6 +29,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/desktopvirtualization"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/devspace"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/devtestlabs"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/digitaltwins"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/dns"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/eventgrid"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/eventhub"
@@ -116,6 +117,7 @@ func SupportedServices() []common.ServiceRegistration {
 		desktopvirtualization.Registration{},
 		devspace.Registration{},
 		devtestlabs.Registration{},
+		digitaltwins.Registration{},
 		dns.Registration{},
 		eventgrid.Registration{},
 		eventhub.Registration{},

azurerm/internal/services/digitaltwins/client/client.go

@@ -0,0 +1,19 @@
+package client
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-10-31/digitaltwins"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
+)
+
+type Client struct {
+	InstanceClient *digitaltwins.Client
+}
+
+func NewClient(o *common.ClientOptions) *Client {
+	InstanceClient := digitaltwins.NewClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&InstanceClient.Client, o.ResourceManagerAuthorizer)
+
+	return &Client{
+		InstanceClient: &InstanceClient,
+	}
+}

azurerm/internal/services/iothub/iothub_digital_twins_data_source.go → azurerm/internal/services/digitaltwins/digital_twins_instance_data_source.go

@@ -1,4 +1,4 @@
-package iothub
+package digitaltwins
 
 import (
 	"fmt"
@@ -8,15 +8,16 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iothub/validate"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/digitaltwins/parse"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/digitaltwins/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
-func dataSourceDigitalTwins() *schema.Resource {
+func dataSourceDigitalTwinsInstance() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceArmDigitalTwinsRead,
+		Read: dataSourceArmDigitalTwinsInstanceRead,
 
 		Timeouts: &schema.ResourceTimeout{
 			Read: schema.DefaultTimeout(5 * time.Minute),
@@ -26,7 +27,7 @@ func dataSourceDigitalTwins() *schema.Resource {
 			"name": {
 				Type:         schema.TypeString,
 				Required:     true,
-				ValidateFunc: validate.DigitaltwinsName,
+				ValidateFunc: validate.DigitaltwinsInstanceName,
 			},
 
 			"resource_group_name": azure.SchemaResourceGroupNameForDataSource(),
@@ -43,31 +44,33 @@ func dataSourceDigitalTwins() *schema.Resource {
 	}
 }
 
-func dataSourceArmDigitalTwinsRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*clients.Client).IoTHub.DigitalTwinsClient
+func dataSourceArmDigitalTwinsInstanceRead(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*clients.Client).DigitalTwins.InstanceClient
+	subscriptionId := meta.(*clients.Client).Account.SubscriptionId
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
 	name := d.Get("name").(string)
 	resourceGroup := d.Get("resource_group_name").(string)
 
+	id := parse.NewDigitalTwinsInstanceID(subscriptionId, resourceGroup, name).ID("")
+
 	resp, err := client.Get(ctx, resourceGroup, name)
 	if err != nil {
 		if utils.ResponseWasNotFound(resp.Response) {
-			return fmt.Errorf("digital twins %q does not exist", name)
+			return fmt.Errorf("Digital Twins Instance %q (Resource Group %q) does not exist", name, resourceGroup)
 		}
-		return fmt.Errorf("retrieving Digital Twins %q (Resource Group %q): %+v", name, resourceGroup, err)
-	}
-	if resp.ID == nil || *resp.ID == "" {
-		return fmt.Errorf("empty or nil ID returned for Digital Twins %q (Resource Group %q) ID", name, resourceGroup)
+		return fmt.Errorf("retrieving Digital Twins Instance %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}
 
-	d.SetId(*resp.ID)
 	d.Set("name", name)
 	d.Set("resource_group_name", resourceGroup)
 	d.Set("location", location.NormalizeNilable(resp.Location))
 	if props := resp.Properties; props != nil {
 		d.Set("host_name", props.HostName)
 	}
+
+	d.SetId(id)
+
 	return tags.FlattenAndSet(d, resp.Tags)
 }

azurerm/internal/services/iothub/iothub_digital_twins_resource.go → azurerm/internal/services/digitaltwins/digital_twins_instance_resource.go

@@ -1,4 +1,4 @@
-package iothub
+package digitaltwins
 
 import (
 	"fmt"
@@ -11,20 +11,20 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iothub/parse"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/iothub/validate"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/digitaltwins/parse"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/digitaltwins/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags"
 	azSchema "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
-func resourceArmDigitalTwins() *schema.Resource {
+func resourceArmDigitalTwinsInstance() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceArmDigitalTwinsCreate,
-		Read:   resourceArmDigitalTwinsRead,
-		Update: resourceArmDigitalTwinsUpdate,
-		Delete: resourceArmDigitalTwinsDelete,
+		Create: resourceArmDigitalTwinsInstanceCreate,
+		Read:   resourceArmDigitalTwinsInstanceRead,
+		Update: resourceArmDigitalTwinsInstanceUpdate,
+		Delete: resourceArmDigitalTwinsInstanceDelete,
 
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(30 * time.Minute),
@@ -34,7 +34,7 @@ func resourceArmDigitalTwins() *schema.Resource {
 		},
 
 		Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error {
-			_, err := parse.DigitalTwinsID(id)
+			_, err := parse.DigitalTwinsInstanceID(id)
 			return err
 		}),
 
@@ -43,7 +43,7 @@ func resourceArmDigitalTwins() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validate.DigitaltwinsName,
+				ValidateFunc: validate.DigitaltwinsInstanceName,
 			},
 
 			"resource_group_name": azure.SchemaResourceGroupName(),
@@ -59,23 +59,25 @@ func resourceArmDigitalTwins() *schema.Resource {
 		},
 	}
 }
-func resourceArmDigitalTwinsCreate(d *schema.ResourceData, meta interface{}) error {
+func resourceArmDigitalTwinsInstanceCreate(d *schema.ResourceData, meta interface{}) error {
 	subscriptionId := meta.(*clients.Client).Account.SubscriptionId
-	client := meta.(*clients.Client).IoTHub.DigitalTwinsClient
+	client := meta.(*clients.Client).DigitalTwins.InstanceClient
 	ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
 	name := d.Get("name").(string)
 	resourceGroup := d.Get("resource_group_name").(string)
 
+	id := parse.NewDigitalTwinsInstanceID(subscriptionId, resourceGroup, name).ID("")
+
 	existing, err := client.Get(ctx, resourceGroup, name)
 	if err != nil {
 		if !utils.ResponseWasNotFound(existing.Response) {
-			return fmt.Errorf("checking for present of existing Digital Twins %q (Resource Group %q): %+v", name, resourceGroup, err)
+			return fmt.Errorf("checking for existing Digital Twins Instance %q (Resource Group %q): %+v", name, resourceGroup, err)
 		}
 	}
-	if existing.ID != nil && *existing.ID != "" {
-		return tf.ImportAsExistsError("azurerm_iothub_digital_twins", *existing.ID)
+	if !utils.ResponseWasNotFound(existing.Response) {
+		return tf.ImportAsExistsError("azurerm_digital_twins_instance", id)
 	}
 
 	properties := digitaltwins.Description{
@@ -85,99 +87,94 @@ func resourceArmDigitalTwinsCreate(d *schema.ResourceData, meta interface{}) err
 
 	future, err := client.CreateOrUpdate(ctx, resourceGroup, name, properties)
 	if err != nil {
-		return fmt.Errorf("creating Digital Twins %q (Resource Group %q): %+v", name, resourceGroup, err)
+		return fmt.Errorf("creating Digital Twins Instance %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}
 
 	if err := future.WaitForCompletionRef(ctx, client.Client); err != nil {
-		return fmt.Errorf("waiting on creating future for Digital Twins %q (Resource Group %q): %+v", name, resourceGroup, err)
+		return fmt.Errorf("waiting for creation of the Digital Twins Instance %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}
 
-	resp, err := client.Get(ctx, resourceGroup, name)
+	_, err = client.Get(ctx, resourceGroup, name)
 	if err != nil {
-		return fmt.Errorf("retrieving Digital Twins %q (Resource Group %q): %+v", name, resourceGroup, err)
+		return fmt.Errorf("retrieving Digital Twins Instance %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}
 
-	if resp.ID == nil || *resp.ID == "" {
-		return fmt.Errorf("empty or nil ID returned for Digital Twins %q (Resource Group %q) ID", name, resourceGroup)
-	}
+	d.SetId(id)
 
-	id, err := parse.DigitalTwinsID(*resp.ID)
-	if err != nil {
-		return err
-	}
-	d.SetId(id.ID(subscriptionId))
-
-	return resourceArmDigitalTwinsRead(d, meta)
+	return resourceArmDigitalTwinsInstanceRead(d, meta)
 }
 
-func resourceArmDigitalTwinsRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*clients.Client).IoTHub.DigitalTwinsClient
+func resourceArmDigitalTwinsInstanceRead(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*clients.Client).DigitalTwins.InstanceClient
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := parse.DigitalTwinsID(d.Id())
+	id, err := parse.DigitalTwinsInstanceID(d.Id())
 	if err != nil {
 		return err
 	}
 
 	resp, err := client.Get(ctx, id.ResourceGroup, id.Name)
 	if err != nil {
 		if utils.ResponseWasNotFound(resp.Response) {
-			log.Printf("[INFO] digitaltwins %q does not exist - removing from state", d.Id())
+			log.Printf("[INFO] Digital Twins Instance %q does not exist - removing from state", d.Id())
 			d.SetId("")
 			return nil
 		}
-		return fmt.Errorf("retrieving Digital Twins %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
+		return fmt.Errorf("retrieving Digital Twins Instance %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
 	}
+
 	d.Set("name", id.Name)
 	d.Set("resource_group_name", id.ResourceGroup)
 	d.Set("location", location.NormalizeNilable(resp.Location))
 	if props := resp.Properties; props != nil {
 		d.Set("host_name", props.HostName)
 	}
+
 	return tags.FlattenAndSet(d, resp.Tags)
 }
 
-func resourceArmDigitalTwinsUpdate(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*clients.Client).IoTHub.DigitalTwinsClient
+func resourceArmDigitalTwinsInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*clients.Client).DigitalTwins.InstanceClient
 	ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := parse.DigitalTwinsID(d.Id())
+	id, err := parse.DigitalTwinsInstanceID(d.Id())
 	if err != nil {
 		return err
 	}
 
-	properties := digitaltwins.PatchDescription{}
+	props := digitaltwins.PatchDescription{}
 
 	if d.HasChange("tags") {
-		properties.Tags = tags.Expand(d.Get("tags").(map[string]interface{}))
+		props.Tags = tags.Expand(d.Get("tags").(map[string]interface{}))
 	}
 
-	if _, err := client.Update(ctx, id.ResourceGroup, id.Name, properties); err != nil {
-		return fmt.Errorf("updating Digital Twins %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
+	if _, err := client.Update(ctx, id.ResourceGroup, id.Name, props); err != nil {
+		return fmt.Errorf("updating Digital Twins Instance %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
 	}
 
-	return resourceArmDigitalTwinsRead(d, meta)
+	return resourceArmDigitalTwinsInstanceRead(d, meta)
 }
 
-func resourceArmDigitalTwinsDelete(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*clients.Client).IoTHub.DigitalTwinsClient
+func resourceArmDigitalTwinsInstanceDelete(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*clients.Client).DigitalTwins.InstanceClient
 	ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := parse.DigitalTwinsID(d.Id())
+	id, err := parse.DigitalTwinsInstanceID(d.Id())
 	if err != nil {
 		return err
 	}
 
 	future, err := client.Delete(ctx, id.ResourceGroup, id.Name)
 	if err != nil {
-		return fmt.Errorf("deleting Digital Twins %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
+		return fmt.Errorf("deleting Digital Twins Instance %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
 	}
 
 	if err := future.WaitForCompletionRef(ctx, client.Client); err != nil {
-		return fmt.Errorf("waiting on deleting future for Digital Twins %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
+		return fmt.Errorf("waiting for deletion of the Digital Twins Instance %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
 	}
+
 	return nil
 }

azurerm/internal/services/digitaltwins/parse/digital_twins_instance.go

@@ -0,0 +1,48 @@
+package parse
+
+import (
+	"fmt"
+
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
+)
+
+type DigitalTwinsInstanceId struct {
+	SubscriptionId string
+	ResourceGroup  string
+	Name           string
+}
+
+func NewDigitalTwinsInstanceID(subscriptionId, resourceGroup, name string) DigitalTwinsInstanceId {
+	return DigitalTwinsInstanceId{
+		SubscriptionId: subscriptionId,
+		ResourceGroup:  resourceGroup,
+		Name:           name,
+	}
+}
+
+func (id DigitalTwinsInstanceId) ID(_ string) string {
+	fmtString := "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.DigitalTwins/digitalTwinsInstances/%s"
+	return fmt.Sprintf(fmtString, id.SubscriptionId, id.ResourceGroup, id.Name)
+}
+
+func DigitalTwinsInstanceID(input string) (*DigitalTwinsInstanceId, error) {
+	id, err := azure.ParseAzureResourceID(input)
+	if err != nil {
+		return nil, fmt.Errorf("parsing DigitalTwins ID %q: %+v", input, err)
+	}
+
+	digitalTwinsInstance := DigitalTwinsInstanceId{
+		SubscriptionId: id.SubscriptionID,
+		ResourceGroup:  id.ResourceGroup,
+	}
+
+	if digitalTwinsInstance.Name, err = id.PopSegment("digitalTwinsInstances"); err != nil {
+		return nil, err
+	}
+
+	if err := id.ValidateNoEmptySegments(input); err != nil {
+		return nil, err
+	}
+
+	return &digitalTwinsInstance, nil
+}