Site recovery support

azurerm/data_source_recovery_services_protection_policy_vm.go

@@ -23,9 +23,10 @@ func dataSourceArmRecoveryServicesProtectionPolicyVm() *schema.Resource {
 			},
 
 			"recovery_vault_name": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: azure.ValidateRecoveryServicesVaultName,
 			},
 
 			"resource_group_name": azure.SchemaResourceGroupNameForDataSource(),

azurerm/helpers/azure/recovery_services_vault.go

@@ -0,0 +1,21 @@
+package azure
+
+import (
+	"regexp"
+	"strings"
+
+	"github.com/hashicorp/terraform/helper/validation"
+)
+
+func ValidateRecoveryServicesVaultName(v interface{}, k string) (warnings []string, errors []error) {
+	regexpValidator := validation.StringMatch(
+		regexp.MustCompile("^[a-zA-Z][-a-zA-Z0-9]{1,49}$"),
+		"Recovery Service Vault name must be 2 - 50 characters long, start with a letter, contain only letters, numbers and hyphens.",
+	)
+	return regexpValidator(v, k)
+}
+
+// This code is a workaround for this bug https://github.com/Azure/azure-sdk-for-go/issues/2824
+func HandleAzureSdkForGoBug2824(id string) string {
+	return strings.Replace(id, "/Subscriptions/", "/subscriptions/", 1)
+}

azurerm/helpers/azure/resource_group_test.go

@@ -61,7 +61,8 @@ func TestValidateResourceGroupName(t *testing.T) {
 		_, errors := validateResourceGroupName(tc.Value, "azurerm_resource_group")
 
 		if len(errors) != tc.ErrCount {
-			t.Fatalf("Expected validateResourceGroupName to trigger '%d' errors for '%s' - got '%d'", tc.ErrCount, tc.Value, len(errors))
+			t.Fatalf("Expected "+
+				"validateResourceGroupName to trigger '%d' errors for '%s' - got '%d'", tc.ErrCount, tc.Value, len(errors))
 		}
 	}
 }

azurerm/internal/services/recoveryservices/client.go

@@ -3,13 +3,20 @@ package recoveryservices
 import (
 	"github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices"
 	"github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2017-07-01/backup"
+	"github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
 )
 
 type Client struct {
-	ProtectedItemsClient     *backup.ProtectedItemsGroupClient
-	ProtectionPoliciesClient *backup.ProtectionPoliciesClient
-	VaultsClient             *recoveryservices.VaultsClient
+	ProtectedItemsClient            *backup.ProtectedItemsGroupClient
+	ProtectionPoliciesClient        *backup.ProtectionPoliciesClient
+	VaultsClient                    *recoveryservices.VaultsClient
+	FabricClient                    func(resourceGroupName string, vaultName string) siterecovery.ReplicationFabricsClient
+	ProtectionContainerClient       func(resourceGroupName string, vaultName string) siterecovery.ReplicationProtectionContainersClient
+	ReplicationPoliciesClient       func(resourceGroupName string, vaultName string) siterecovery.ReplicationPoliciesClient
+	ContainerMappingClient          func(resourceGroupName string, vaultName string) siterecovery.ReplicationProtectionContainerMappingsClient
+	NetworkMappingClient            func(resourceGroupName string, vaultName string) siterecovery.ReplicationNetworkMappingsClient
+	ReplicationMigrationItemsClient func(resourceGroupName string, vaultName string) siterecovery.ReplicationProtectedItemsClient
 }
 
 func BuildClient(o *common.ClientOptions) *Client {
@@ -23,9 +30,51 @@ func BuildClient(o *common.ClientOptions) *Client {
 	ProtectionPoliciesClient := backup.NewProtectionPoliciesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&ProtectionPoliciesClient.Client, o.ResourceManagerAuthorizer)
 
+	FabricClient := func(resourceGroupName string, vaultName string) siterecovery.ReplicationFabricsClient {
+		client := siterecovery.NewReplicationFabricsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId, resourceGroupName, vaultName)
+		o.ConfigureClient(&client.Client, o.ResourceManagerAuthorizer)
+		return client
+	}
+
+	ProtectionContainerClient := func(resourceGroupName string, vaultName string) siterecovery.ReplicationProtectionContainersClient {
+		client := siterecovery.NewReplicationProtectionContainersClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId, resourceGroupName, vaultName)
+		o.ConfigureClient(&client.Client, o.ResourceManagerAuthorizer)
+		return client
+	}
+
+	ReplicationPoliciesClient := func(resourceGroupName string, vaultName string) siterecovery.ReplicationPoliciesClient {
+		client := siterecovery.NewReplicationPoliciesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId, resourceGroupName, vaultName)
+		o.ConfigureClient(&client.Client, o.ResourceManagerAuthorizer)
+		return client
+	}
+
+	ContainerMappingClient := func(resourceGroupName string, vaultName string) siterecovery.ReplicationProtectionContainerMappingsClient {
+		client := siterecovery.NewReplicationProtectionContainerMappingsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId, resourceGroupName, vaultName)
+		o.ConfigureClient(&client.Client, o.ResourceManagerAuthorizer)
+		return client
+	}
+
+	NetworkMappingClient := func(resourceGroupName string, vaultName string) siterecovery.ReplicationNetworkMappingsClient {
+		client := siterecovery.NewReplicationNetworkMappingsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId, resourceGroupName, vaultName)
+		o.ConfigureClient(&client.Client, o.ResourceManagerAuthorizer)
+		return client
+	}
+
+	ReplicationMigrationItemsClient := func(resourceGroupName string, vaultName string) siterecovery.ReplicationProtectedItemsClient {
+		client := siterecovery.NewReplicationProtectedItemsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId, resourceGroupName, vaultName)
+		o.ConfigureClient(&client.Client, o.ResourceManagerAuthorizer)
+		return client
+	}
+
 	return &Client{
-		ProtectedItemsClient:     &ProtectedItemsClient,
-		ProtectionPoliciesClient: &ProtectionPoliciesClient,
-		VaultsClient:             &VaultsClient,
+		ProtectedItemsClient:            &ProtectedItemsClient,
+		ProtectionPoliciesClient:        &ProtectionPoliciesClient,
+		VaultsClient:                    &VaultsClient,
+		FabricClient:                    FabricClient,
+		ProtectionContainerClient:       ProtectionContainerClient,
+		ReplicationPoliciesClient:       ReplicationPoliciesClient,
+		ContainerMappingClient:          ContainerMappingClient,
+		NetworkMappingClient:            NetworkMappingClient,
+		ReplicationMigrationItemsClient: ReplicationMigrationItemsClient,
 	}
 }

azurerm/provider.go

@@ -396,6 +396,12 @@ func Provider() terraform.ResourceProvider {
 		"azurerm_virtual_network_peering":                                                resourceArmVirtualNetworkPeering(),
 		"azurerm_virtual_network":                                                        resourceArmVirtualNetwork(),
 		"azurerm_virtual_wan":                                                            resourceArmVirtualWan(),
+		"azurerm_recovery_services_fabric":                                               resourceArmRecoveryServicesFabric(),
+		"azurerm_recovery_services_protection_container":                                 resourceArmRecoveryServicesProtectionContainer(),
+		"azurerm_recovery_services_replication_policy":                                   resourceArmRecoveryServicesReplicationPolicy(),
+		"azurerm_recovery_services_protection_container_mapping":                         resourceArmRecoveryServicesProtectionContainerMapping(),
+		"azurerm_recovery_network_mapping":                                               resourceArmRecoveryServicesNetworkMapping(),
+		"azurerm_recovery_replicated_vm":                                                 resourceArmRecoveryServicesReplicatedVm(),
 	}
 
 	for _, service := range supportedServices {

azurerm/resource_arm_recovery_services_fabric.go

@@ -0,0 +1,149 @@
+package azurerm
+
+import (
+	"fmt"
+
+	"github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery"
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
+)
+
+func resourceArmRecoveryServicesFabric() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceArmRecoveryServicesFabricCreate,
+		Read:   resourceArmRecoveryServicesFabricRead,
+		Update: nil,
+		Delete: resourceArmRecoveryServicesFabricDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validate.NoEmptyStrings,
+			},
+			"resource_group_name": azure.SchemaResourceGroupName(),
+
+			"recovery_vault_name": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: azure.ValidateRecoveryServicesVaultName,
+			},
+			"location": azure.SchemaLocation(),
+		},
+	}
+}
+
+func resourceArmRecoveryServicesFabricCreate(d *schema.ResourceData, meta interface{}) error {
+	resGroup := d.Get("resource_group_name").(string)
+	vaultName := d.Get("recovery_vault_name").(string)
+	location := azure.NormalizeLocation(d.Get("location").(string))
+	name := d.Get("name").(string)
+
+	client := meta.(*ArmClient).recoveryServices.FabricClient(resGroup, vaultName)
+	ctx := meta.(*ArmClient).StopContext
+
+	if requireResourcesToBeImported && d.IsNewResource() {
+		existing, err := client.Get(ctx, name)
+		if err != nil {
+			if !utils.ResponseWasNotFound(existing.Response) {
+				return fmt.Errorf("Error checking for presence of existing rec	overy services fabric %s (vault %s): %+v", name, vaultName, err)
+			}
+		}
+
+		if existing.ID != nil && *existing.ID != "" {
+			return tf.ImportAsExistsError("azurerm_resource_group", azure.HandleAzureSdkForGoBug2824(*existing.ID))
+		}
+	}
+
+	parameters := siterecovery.FabricCreationInput{
+		Properties: &siterecovery.FabricCreationInputProperties{
+			CustomDetails: siterecovery.AzureFabricCreationInput{
+				InstanceType: "Azure",
+				Location:     &location,
+			},
+		},
+	}
+
+	future, err := client.Create(ctx, name, parameters)
+	if err != nil {
+		return fmt.Errorf("Error creating recovery services fabric %s (vault %s): %+v", name, vaultName, err)
+	}
+	if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
+		return fmt.Errorf("Error creating recovery services fabric %s (vault %s): %+v", name, vaultName, err)
+	}
+
+	resp, err := client.Get(ctx, name)
+	if err != nil {
+		return fmt.Errorf("Error retrieving recovery services fabric %s (vault %s): %+v", name, vaultName, err)
+	}
+
+	d.SetId(azure.HandleAzureSdkForGoBug2824(*resp.ID))
+
+	return resourceArmRecoveryServicesFabricRead(d, meta)
+}
+
+func resourceArmRecoveryServicesFabricRead(d *schema.ResourceData, meta interface{}) error {
+	id, err := parseAzureResourceID(d.Id())
+	if err != nil {
+		return err
+	}
+
+	resGroup := id.ResourceGroup
+	vaultName := id.Path["vaults"]
+	name := id.Path["replicationFabrics"]
+
+	client := meta.(*ArmClient).recoveryServices.FabricClient(resGroup, vaultName)
+	ctx := meta.(*ArmClient).StopContext
+
+	resp, err := client.Get(ctx, name)
+	if err != nil {
+		if utils.ResponseWasNotFound(resp.Response) {
+			d.SetId("")
+			return nil
+		}
+		return fmt.Errorf("Error making Read request on recovery services fabric %s (vault %s): %+v", name, vaultName, err)
+	}
+
+	d.Set("name", resp.Name)
+	d.Set("resource_group_name", resGroup)
+	if props := resp.Properties; props != nil {
+		if azureDetails, isAzureDetails := props.CustomDetails.AsAzureFabricSpecificDetails(); isAzureDetails {
+			d.Set("location", azureDetails.Location)
+		}
+	}
+	d.Set("recovery_vault_name", vaultName)
+	return nil
+}
+
+func resourceArmRecoveryServicesFabricDelete(d *schema.ResourceData, meta interface{}) error {
+	id, err := parseAzureResourceID(d.Id())
+	if err != nil {
+		return err
+	}
+
+	resGroup := id.ResourceGroup
+	vaultName := id.Path["vaults"]
+	name := id.Path["replicationFabrics"]
+
+	client := meta.(*ArmClient).recoveryServices.FabricClient(resGroup, vaultName)
+	ctx := meta.(*ArmClient).StopContext
+
+	future, err := client.Delete(ctx, name)
+	if err != nil {
+		return fmt.Errorf("Error deleting recovery services fabric %s (vault %s): %+v", name, vaultName, err)
+	}
+
+	if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
+		return fmt.Errorf("Error waiting for deletion of recovery services fabric %s (vault %s): %+v", name, vaultName, err)
+	}
+
+	return nil
+}

azurerm/resource_arm_recovery_services_fabric_test.go

@@ -0,0 +1,97 @@
+package azurerm
+
+import (
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
+)
+
+func TestAccAzureRMRecoveryFabric_basic(t *testing.T) {
+	resourceGroupName := "azurerm_resource_group.test"
+	vaultName := "azurerm_recovery_services_vault.test"
+	resourceName := "azurerm_recovery_services_fabric.test"
+	ri := tf.AccRandTimeInt()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMResourceGroupDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAzureRMRecoveryFabric_basic(ri, testLocation()),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMRecoveryFabricExists(resourceGroupName, vaultName, resourceName),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccAzureRMRecoveryFabric_basic(rInt int, location string) string {
+	return fmt.Sprintf(`
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_recovery_services_vault" "test" {
+  name                = "acctest-vault-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  sku                 = "Standard"
+}
+
+resource "azurerm_recovery_services_fabric" "test" {
+  resource_group_name          = "${azurerm_resource_group.test.name}"
+  recovery_vault_name          = "${azurerm_recovery_services_vault.test.name}"
+  name                         = "acctest-fabric-%d"
+  location                     = "${azurerm_resource_group.test.location}"
+}
+`, rInt, location, rInt, rInt)
+}
+
+func testCheckAzureRMRecoveryFabricExists(resourceGroupStateName, vaultStateName string, resourceStateName string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		// Ensure we have enough information in state to look up in API
+		resourceGroupState, ok := s.RootModule().Resources[resourceGroupStateName]
+		if !ok {
+			return fmt.Errorf("Not found: %s", resourceGroupStateName)
+		}
+		vaultState, ok := s.RootModule().Resources[vaultStateName]
+		if !ok {
+			return fmt.Errorf("Not found: %s", vaultStateName)
+		}
+		fabricState, ok := s.RootModule().Resources[resourceStateName]
+		if !ok {
+			return fmt.Errorf("Not found: %s", resourceStateName)
+		}
+
+		resourceGroupName := resourceGroupState.Primary.Attributes["name"]
+		vaultName := vaultState.Primary.Attributes["name"]
+		fabricName := fabricState.Primary.Attributes["name"]
+
+		// Ensure fabric exists in API
+		client := testAccProvider.Meta().(*ArmClient).recoveryServices.FabricClient(resourceGroupName, vaultName)
+		ctx := testAccProvider.Meta().(*ArmClient).StopContext
+
+		resp, err := client.Get(ctx, fabricName)
+		if err != nil {
+			return fmt.Errorf("Bad: Get on fabricClient: %+v", err)
+		}
+
+		if resp.Response.StatusCode == http.StatusNotFound {
+			return fmt.Errorf("Bad: fabric: %q does not exist", fabricName)
+		}
+
+		return nil
+	}
+}