support for file system clones

Author: Isabella Maceda

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.16.0 (Unreleased)
+
+### Added
+- Support for File storage file system clones
+
 ## 4.15.0 (February 24, 2021)
 
 ### Added

examples/storage/fss/file_system_clone.tf

@@ -0,0 +1,22 @@
+resource "oci_file_storage_file_system" "my_fs_clone" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+
+  #Optional
+  display_name = var.file_system_clone_display_name
+  source_snapshot_id = oci_file_storage_snapshot.my_snapshot_clone.id
+}
+resource "oci_file_storage_file_system" "my_fs_simple" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+
+  #Optional
+  display_name = var.file_system_simple_display_name
+}
+resource "oci_file_storage_snapshot" "my_snapshot_clone" {
+  #Required
+  file_system_id = oci_file_storage_file_system.my_fs_simple.id
+  name           = var.snapshot_name_clone
+}

examples/storage/fss/variables.tf

@@ -42,6 +42,14 @@ variable "file_system_2_display_name" {
   default = "my_fs_2"
 }
 
+variable "file_system_clone_display_name" {
+	default= "my_fs_clone"
+}
+
+variable "file_system_simple_display_name" {
+	default= "my_fs_simple"
+}
+
 variable "mount_target_1_display_name" {
   default = "my_mount_target_1"
 }
@@ -66,6 +74,10 @@ variable "snapshot_name" {
   default = "20180320_daily"
 }
 
+variable "snapshot_name_clone" {
+  default = "snapshot_clone"
+}
+
 variable "export_set_name_1" {
   default = "export set for mount target 1"
 }

oci/file_storage_file_system_resource.go

@@ -62,12 +62,53 @@ func FileStorageFileSystemResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"source_snapshot_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
 
 			// Computed
+			"is_clone_parent": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"is_hydrated": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"lifecycle_details": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"metered_bytes": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"source_details": {
+				Type:     schema.TypeList,
+				Computed: true,
+				MaxItems: 1,
+				MinItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"parent_file_system_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"source_snapshot_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -183,6 +224,11 @@ func (s *FileStorageFileSystemResourceCrud) Create() error {
 		request.KmsKeyId = &tmp
 	}
 
+	if sourceSnapshotId, ok := s.D.GetOkExists("source_snapshot_id"); ok {
+		tmp := sourceSnapshotId.(string)
+		request.SourceSnapshotId = &tmp
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "file_storage")
 
 	response, err := s.Client.CreateFileSystem(context.Background(), request)
@@ -290,14 +336,32 @@ func (s *FileStorageFileSystemResourceCrud) SetData() error {
 
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
+	if s.Res.IsCloneParent != nil {
+		s.D.Set("is_clone_parent", *s.Res.IsCloneParent)
+	}
+
+	if s.Res.IsHydrated != nil {
+		s.D.Set("is_hydrated", *s.Res.IsHydrated)
+	}
+
 	if s.Res.KmsKeyId != nil {
 		s.D.Set("kms_key_id", *s.Res.KmsKeyId)
 	}
 
+	if s.Res.LifecycleDetails != nil {
+		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
+	}
+
 	if s.Res.MeteredBytes != nil {
 		s.D.Set("metered_bytes", strconv.FormatInt(*s.Res.MeteredBytes, 10))
 	}
 
+	if s.Res.SourceDetails != nil {
+		s.D.Set("source_details", []interface{}{FileSystemSourceDetailsToMap(s.Res.SourceDetails)})
+	} else {
+		s.D.Set("source_details", nil)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.TimeCreated != nil {
@@ -307,6 +371,20 @@ func (s *FileStorageFileSystemResourceCrud) SetData() error {
 	return nil
 }
 
+func FileSystemSourceDetailsToMap(obj *oci_file_storage.SourceDetails) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.ParentFileSystemId != nil {
+		result["parent_file_system_id"] = string(*obj.ParentFileSystemId)
+	}
+
+	if obj.SourceSnapshotId != nil {
+		result["source_snapshot_id"] = string(*obj.SourceSnapshotId)
+	}
+
+	return result
+}
+
 func (s *FileStorageFileSystemResourceCrud) updateCompartment(compartment interface{}) error {
 	changeCompartmentRequest := oci_file_storage.ChangeFileSystemCompartmentRequest{}
 

oci/file_storage_file_system_resource_test.go

@@ -5,6 +5,7 @@ package oci
 
 import (
 	"fmt"
+	"strconv"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -22,6 +23,33 @@ var (
 		"freeform_tags":       Representation{repType: Optional, create: map[string]string{"Department": "Finance"}},
 		"kms_key_id":          Representation{repType: Optional, create: `${var.kms_key_id_for_create}`, update: ``},
 	}
+	snapshotRepresentationNoTags = map[string]interface{}{
+		"file_system_id": Representation{repType: Required, create: `${oci_file_storage_file_system.test_file_system.id}`},
+		"name":           Representation{repType: Required, create: `snapshot-1`},
+		"freeform_tags":  Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
+	}
+	fileSystemRepresentationNoTags = map[string]interface{}{
+		"availability_domain": Representation{repType: Required, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
+		"compartment_id":      Representation{repType: Required, create: `${var.compartment_id}`},
+		"display_name":        Representation{repType: Optional, create: `media-files-1`, update: `displayName2`},
+		"freeform_tags":       Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
+		"source_snapshot_id":  Representation{repType: Optional, create: `${oci_file_storage_snapshot.test_snapshot.id}`},
+	}
+
+	SnapshotResourceDependenciesNoTags = generateResourceFromRepresentationMap("oci_file_storage_file_system", "test_file_system", Required, Create, fileSystemRepresentationNoTags) +
+		AvailabilityDomainConfig
+
+	fileSystemRepresentationClone = map[string]interface{}{
+		"availability_domain": Representation{repType: Required, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
+		"compartment_id":      Representation{repType: Required, create: `${var.compartment_id}`},
+		"display_name":        Representation{repType: Optional, create: `media-files-1`, update: `displayName2`},
+		"freeform_tags":       Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
+		"source_snapshot_id":  Representation{repType: Optional, create: `${oci_file_storage_snapshot.test_snapshot.id}`},
+	}
+
+	FileSystemResourceDependenciesNoTags = generateResourceFromRepresentationMap("oci_file_storage_file_system", "test_file_system", Required, Create, fileSystemRepresentationNoTags) +
+		generateResourceFromRepresentationMap("oci_file_storage_snapshot", "test_snapshot", Required, Create, snapshotRepresentationNoTags) +
+		AvailabilityDomainConfig
 )
 
 func TestFileStorageFileSystemResource_removeKMSKey(t *testing.T) {
@@ -123,3 +151,76 @@ func TestFileStorageFileSystemResource_removeKMSKey(t *testing.T) {
 		},
 	})
 }
+
+func TestFileStorageFileSystemResource_cloneFromSnapshot(t *testing.T) {
+	httpreplay.SetScenario("TestFileStorageFileSystemResource_cloneFromSnapshot")
+	defer httpreplay.SaveScenario()
+
+	provider := testAccProvider
+	config := testProviderConfig()
+
+	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	resourceName := "oci_file_storage_snapshot.test_snapshot"
+	resourceName2 := "oci_file_storage_file_system.test_file_system_clone"
+
+	var resId string
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		Providers: map[string]terraform.ResourceProvider{
+			"oci": provider,
+		},
+		CheckDestroy: testAccCheckFileStorageFileSystemDestroy,
+		Steps: []resource.TestStep{
+			// verify create with optionals
+			{
+				Config: config + compartmentIdVariableStr + SnapshotResourceDependenciesNoTags +
+					generateResourceFromRepresentationMap("oci_file_storage_snapshot", "test_snapshot", Optional, Create, snapshotRepresentationNoTags),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "file_system_id"),
+					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttr(resourceName, "name", "snapshot-1"),
+					resource.TestCheckResourceAttrSet(resourceName, "state"),
+					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+					func(s *terraform.State) (err error) {
+						resId, err = fromInstanceState(s, resourceName, "id")
+						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
+							if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
+								return errExport
+							}
+						}
+						return err
+					},
+				),
+			},
+			// verify create FileSystem via cloning Snapshot
+			{
+				Config: config + compartmentIdVariableStr + FileSystemResourceDependenciesNoTags +
+					generateResourceFromRepresentationMap("oci_file_storage_file_system", "test_file_system_clone", Optional, Create, fileSystemRepresentationClone),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName2, "availability_domain"),
+					resource.TestCheckResourceAttr(resourceName2, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttr(resourceName2, "display_name", "media-files-1"),
+					resource.TestCheckResourceAttr(resourceName2, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttrSet(resourceName2, "id"),
+					resource.TestCheckResourceAttrSet(resourceName2, "metered_bytes"),
+					resource.TestCheckResourceAttrSet(resourceName2, "source_snapshot_id"),
+					resource.TestCheckResourceAttrSet(resourceName2, "state"),
+					resource.TestCheckResourceAttrSet(resourceName2, "time_created"),
+					//verify ids match
+					func(s *terraform.State) (err error) {
+						snapshotId, err := fromInstanceState(s, resourceName2, "source_snapshot_id")
+						if resId != snapshotId {
+							return fmt.Errorf("Resource source snapshot id [%v] was different from expected [%v].", snapshotId, resId)
+						}
+
+						return err
+					},
+				),
+			},
+		},
+	})
+}