azurerm_netapp_volume - support the data_protection_replication block

azurerm/internal/services/netapp/client/client.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp"
+	"github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2020-09-01/netapp"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
 )
 

azurerm/internal/services/netapp/netapp_account_resource.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp"
+	"github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2020-09-01/netapp"
 	"github.com/hashicorp/go-azure-helpers/response"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"

azurerm/internal/services/netapp/netapp_pool_resource.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp"
+	"github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2020-09-01/netapp"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"

azurerm/internal/services/netapp/netapp_snapshot_resource.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp"
+	"github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2020-09-01/netapp"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
@@ -71,6 +71,8 @@ func resourceNetAppSnapshot() *schema.Resource {
 				ValidateFunc: ValidateNetAppVolumeName,
 			},
 
+			// TODO: remove this in a next breaking changes release since tags are
+			// not supported anymore on Snapshots
 			"tags": tags.Schema(),
 		},
 	}
@@ -101,9 +103,14 @@ func resourceNetAppSnapshotCreate(d *schema.ResourceData, meta interface{}) erro
 
 	location := azure.NormalizeLocation(d.Get("location").(string))
 
+	// Snapshot resource in Azure changed its type to proxied resource, therefore
+	// tags are not supported anymore, ignoring any tags.
+	if tags.Expand(d.Get("tags").(map[string]interface{})) != nil {
+		log.Printf("[WARN] Tags are not supported on snaphots anymore, ignoring values.")
+	}
+
 	parameters := netapp.Snapshot{
 		Location: utils.String(location),
-		Tags:     tags.Expand(d.Get("tags").(map[string]interface{})),
 	}
 
 	future, err := client.Create(ctx, parameters, resourceGroup, accountName, poolName, volumeName, name)
@@ -155,33 +162,18 @@ func resourceNetAppSnapshotRead(d *schema.ResourceData, meta interface{}) error
 		d.Set("location", azure.NormalizeLocation(*location))
 	}
 
-	return tags.FlattenAndSet(d, resp.Tags)
+	// Snapshot resource in Azure changed its type to proxied resource, therefore
+	// tags are not supported anymore, returning nil now.
+	// For reference, this method return line was `return tags.FlattenAndSet(d, resp.Tags)`
+
+	return nil
 }
 
 func resourceNetAppSnapshotUpdate(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*clients.Client).NetApp.SnapshotClient
-	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
-	defer cancel()
-
-	id, err := parse.SnapshotID(d.Id())
-	if err != nil {
-		return err
-	}
-
-	parameters := netapp.SnapshotPatch{
-		Tags: tags.Expand(d.Get("tags").(map[string]interface{})),
-	}
-
-	if _, err = client.Update(ctx, parameters, id.ResourceGroup, id.NetAppAccountName, id.CapacityPoolName, id.VolumeName, id.Name); err != nil {
-		return fmt.Errorf("Error updating NetApp Snapshot %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
-	}
-
-	resp, err := client.Get(ctx, id.ResourceGroup, id.NetAppAccountName, id.CapacityPoolName, id.VolumeName, id.Name)
-	if err != nil {
-		return fmt.Errorf("Error retrieving NetApp Snapshot %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
-	}
-	if resp.ID == nil || *resp.ID == "" {
-		return fmt.Errorf("Cannot read NetApp Snapshot %q (Resource Group %q) ID", id.Name, id.ResourceGroup)
+	// Snapshot resource in Azure changed its type to proxied resource, therefore
+	// tags are not supported anymore, ignoring any tags.
+	if tags.Expand(d.Get("tags").(map[string]interface{})) == nil {
+		log.Printf("[WARN] Tags are not supported on snaphots anymore, no update will happen in a snapshot at this time.")
 	}
 
 	return resourceNetAppSnapshotRead(d, meta)

azurerm/internal/services/netapp/netapp_volume_data_source.go

@@ -75,6 +75,32 @@ func dataSourceNetAppVolume() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+
+			"data_protection_replication": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"endpoint_type": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+
+						"remote_volume_location": azure.SchemaLocationForDataSource(),
+
+						"remote_volume_resource_id": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+
+						"replication_schedule": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
 		},
 	}
 }
@@ -107,9 +133,11 @@ func dataSourceNetAppVolumeRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("resource_group_name", resourceGroup)
 	d.Set("account_name", accountName)
 	d.Set("pool_name", poolName)
+
 	if location := resp.Location; location != nil {
 		d.Set("location", azure.NormalizeLocation(*location))
 	}
+
 	if props := resp.VolumeProperties; props != nil {
 		d.Set("volume_path", props.CreationToken)
 		d.Set("service_level", props.ServiceLevel)
@@ -127,6 +155,12 @@ func dataSourceNetAppVolumeRead(d *schema.ResourceData, meta interface{}) error
 		if err := d.Set("mount_ip_addresses", flattenNetAppVolumeMountIPAddresses(props.MountTargets)); err != nil {
 			return fmt.Errorf("setting `mount_ip_addresses`: %+v", err)
 		}
+
+		if props.DataProtection.Replication != nil {
+			if err := d.Set("data_protection_replication", flattenNetAppVolumeDataProtectionReplication(props.DataProtection)); err != nil {
+				return fmt.Errorf("setting `data_protection_replication`: %+v", err)
+			}
+		}
 	}
 
 	return nil