Block Storage: Cross-region backups

Author: afedorch

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Added
 - Support for the Instance Pools & Instance Configurations
+- Support for the Block Volume cross-region backups
 
 ## 3.8.0 (November 28, 2018)
 

docs/examples/storage/block/volume_backup/volume_backup.tf

@@ -0,0 +1,107 @@
+variable "tenancy_ocid" {}
+
+variable "compartment_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "source_region" {}
+variable "source_volume_backup_id" {}
+
+variable "availability_domain" {
+  default = "3"
+}
+
+variable "volume_backup_defined_tags_value" {
+  default = "value"
+}
+
+variable "volume_backup_display_name" {
+  default = "displayName"
+}
+
+variable "volume_backup_copy_display_name" {
+  default = "displayNameCopy"
+}
+
+variable "volume_backup_state" {
+  default = "AVAILABLE"
+}
+
+variable "volume_backup_freeform_tags" {
+  type = "map"
+
+  default = {
+    Department = "Finance"
+  }
+}
+
+variable "volume_backup_type" {
+  default = "FULL"
+}
+
+provider "oci" {
+  tenancy_ocid     = "${var.tenancy_ocid}"
+  user_ocid        = "${var.user_ocid}"
+  fingerprint      = "${var.fingerprint}"
+  private_key_path = "${var.private_key_path}"
+  region           = "${var.region}"
+}
+
+resource "oci_core_volume" "test_volume" {
+  availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
+  compartment_id      = "${var.compartment_ocid}"
+  display_name        = "-tf-volume"
+}
+
+resource "oci_core_volume_backup" "test_volume_backup" {
+  #Required
+  volume_id = "${oci_core_volume.test_volume.id}"
+
+  #Optional
+  display_name  = "${var.volume_backup_display_name}"
+  freeform_tags = "${var.volume_backup_freeform_tags}"
+  type          = "${var.volume_backup_type}"
+}
+
+resource "oci_core_volume_backup" "test_volume_backup_cross_region_sourced" {
+  #Required
+  source_details {
+    region           = "${var.source_region}"
+    volume_backup_id = "${var.source_volume_backup_id}"
+  }
+
+  #Optional
+  display_name = "${var.volume_backup_copy_display_name}"
+}
+
+data "oci_identity_availability_domains" "ADs" {
+  compartment_id = "${var.tenancy_ocid}"
+}
+
+data "oci_core_volume_backups" "test_volume_backup" {
+  #Required
+  compartment_id = "${var.compartment_ocid}"
+
+  #Optional
+  display_name = "${var.volume_backup_display_name}"
+  state        = "${var.volume_backup_state}"
+  volume_id    = "${oci_core_volume.test_volume.id}"
+}
+
+data "oci_core_volume_backups" "test_volume_backup_from_source" {
+  #Required
+  compartment_id = "${var.compartment_ocid}"
+
+  #Optional
+  display_name            = "${var.volume_backup_copy_display_name}"
+  source_volume_backup_id = "${var.source_volume_backup_id}"
+}
+
+output "volumeBackup" {
+  value = "${data.oci_core_volume_backups.test_volume_backup.display_name}"
+}
+
+output "volumeBackupIdFromSource" {
+  value = "${data.oci_core_volume_backups.test_volume_backup_from_source.source_volume_backup_id}"
+}

oci/core_volume_backup_resource.go

@@ -4,6 +4,7 @@ package provider
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
@@ -22,37 +23,64 @@ func VolumeBackupResource() *schema.Resource {
 		Update:   updateVolumeBackup,
 		Delete:   deleteVolumeBackup,
 		Schema: map[string]*schema.Schema{
-			// Required
+			// Optional
 			"volume_id": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ForceNew:      true,
+				Computed:      true,
+				ConflictsWith: []string{"source_details"},
+			},
+			"source_details": {
+				Type:          schema.TypeList,
+				Optional:      true,
+				ForceNew:      true,
+				MaxItems:      1,
+				MinItems:      1,
+				ConflictsWith: []string{"volume_id"},
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+						"region": {
+							Type:     schema.TypeString,
+							Required: true,
+							ForceNew: true,
+						},
+						// Required
+						"volume_backup_id": {
+							Type:     schema.TypeString,
+							Required: true,
+							ForceNew: true,
+						},
+					},
+				},
 			},
-
-			// Optional
 			"defined_tags": {
 				Type:             schema.TypeMap,
 				Optional:         true,
 				Computed:         true,
 				DiffSuppressFunc: definedTagsDiffSuppressFunction,
 				Elem:             schema.TypeString,
+				ConflictsWith:    []string{"source_details"},
 			},
 			"display_name": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
 			"freeform_tags": {
-				Type:     schema.TypeMap,
-				Optional: true,
-				Computed: true,
-				Elem:     schema.TypeString,
+				Type:          schema.TypeMap,
+				Optional:      true,
+				Computed:      true,
+				Elem:          schema.TypeString,
+				ConflictsWith: []string{"source_details"},
 			},
 			"type": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
+				Type:          schema.TypeString,
+				Optional:      true,
+				Computed:      true,
+				ForceNew:      true,
+				ConflictsWith: []string{"source_details"},
 			},
 
 			// Computed
@@ -77,6 +105,10 @@ func VolumeBackupResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"source_volume_backup_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -138,6 +170,7 @@ func deleteVolumeBackup(d *schema.ResourceData, m interface{}) error {
 type VolumeBackupResourceCrud struct {
 	BaseCrud
 	Client                 *oci_core.BlockstorageClient
+	SourceRegionClient     *oci_core.BlockstorageClient
 	Res                    *oci_core.VolumeBackup
 	DisableNotFoundRetries bool
 }
@@ -174,6 +207,67 @@ func (s *VolumeBackupResourceCrud) DeletedTarget() []string {
 }
 
 func (s *VolumeBackupResourceCrud) Create() error {
+	if s.isCopyCreate() {
+		return s.createVolumeBackupCopy()
+	}
+
+	return s.CreateVolumeBackup()
+}
+
+func (s *VolumeBackupResourceCrud) isCopyCreate() bool {
+	if sourceDetails, ok := s.D.GetOkExists("source_details"); ok {
+		if tmpList := sourceDetails.([]interface{}); len(tmpList) > 0 {
+			return true
+		}
+	}
+	return false
+}
+
+func (s *VolumeBackupResourceCrud) createVolumeBackupCopy() error {
+	copyVolumeBackupRequest := oci_core.CopyVolumeBackupRequest{}
+
+	configProvider := *s.Client.ConfigurationProvider()
+	if configProvider == nil {
+		return fmt.Errorf("cannot access ConfigurationProvider")
+	}
+	currentRegion, error := configProvider.Region()
+	if error != nil {
+		return fmt.Errorf("cannot access Region for the current ConfigurationProvider")
+	}
+
+	if sourceDetails, ok := s.D.GetOkExists("source_details"); ok && sourceDetails != nil {
+		fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "source_details", 0)
+
+		if region, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "region")); ok {
+			tmp := region.(string)
+			err := s.createBlockStorageSourceRegionClient(tmp)
+			if err != nil {
+				return err
+			}
+		}
+		copyVolumeBackupRequest.DestinationRegion = &currentRegion
+
+		if volumeBackupId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "volume_backup_id")); ok {
+			tmp := volumeBackupId.(string)
+			copyVolumeBackupRequest.VolumeBackupId = &tmp
+		}
+	}
+
+	if displayName, ok := s.D.GetOkExists("display_name"); ok {
+		tmp := displayName.(string)
+		copyVolumeBackupRequest.DisplayName = &tmp
+	}
+
+	response, err := s.SourceRegionClient.CopyVolumeBackup(context.Background(), copyVolumeBackupRequest)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response.VolumeBackup
+	return nil
+}
+
+func (s *VolumeBackupResourceCrud) CreateVolumeBackup() error {
 	request := oci_core.CreateVolumeBackupRequest{}
 
 	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
@@ -305,6 +399,10 @@ func (s *VolumeBackupResourceCrud) SetData() error {
 
 	s.D.Set("source_type", s.Res.SourceType)
 
+	if s.Res.SourceVolumeBackupId != nil {
+		s.D.Set("source_volume_backup_id", *s.Res.SourceVolumeBackupId)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.TimeCreated != nil {