Added - Support for File Storage: Clone detach feature

Author: Terraform Team Automation

examples/storage/fss/file_system_clone.tf

@@ -19,4 +19,27 @@ 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
+}
+resource "oci_file_storage_file_system" "my_fs_clone_with_detach" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+
+  #Optional
+  display_name = var.file_system_clone_with_detach_display_name
+  source_snapshot_id = oci_file_storage_snapshot.my_snapshot_clone_1.id
+  clone_attach_status = var.clone_attach_status_value
+}
+resource "oci_file_storage_file_system" "my_fs_simple_1" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+
+  #Optional
+  display_name = var.file_system_simple_1_display_name
+}
+resource "oci_file_storage_snapshot" "my_snapshot_clone_1" {
+  #Required
+  file_system_id = oci_file_storage_file_system.my_fs_simple_1.id
+  name           = var.snapshot_name_clone_1
 }

examples/storage/fss/variables.tf

@@ -46,10 +46,22 @@ variable "file_system_clone_display_name" {
 	default= "my_fs_clone"
 }
 
+variable "file_system_clone_with_detach_display_name" {
+	default= "my_fs_clone_with_detach"
+}
+
 variable "file_system_simple_display_name" {
 	default= "my_fs_simple"
 }
 
+variable "file_system_simple_1_display_name" {
+	default= "my_fs_simple_1"
+}
+
+variable "clone_attach_status_value" {
+    default= "DETACH"
+}
+
 variable "file_system_with_snapshot_policy_display_name" {
   default = "my_fs_with_snapshot_policy"
 }
@@ -82,6 +94,10 @@ variable "snapshot_name_clone" {
   default = "snapshot_clone"
 }
 
+variable "snapshot_name_clone_1" {
+  default = "snapshot_clone_1"
+}
+
 variable "export_set_name_1" {
   default = "export set for mount target 1"
 }

internal/integrationtest/file_storage_file_system_test.go

@@ -49,12 +49,14 @@ var (
 	FileStorageFileSystemRepresentation = map[string]interface{}{
 		"availability_domain":           acctest.Representation{RepType: acctest.Required, Create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
 		"compartment_id":                acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+		"clone_attach_status":           acctest.Representation{RepType: acctest.Optional, Create: `DETACH`},
 		"defined_tags":                  acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"display_name":                  acctest.Representation{RepType: acctest.Optional, Create: `media-files-1`, Update: `displayName2`},
 		"filesystem_snapshot_policy_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_file_storage_filesystem_snapshot_policy.test_filesystem_snapshot_policy.id}`},
 		"freeform_tags":                 acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
 		"kms_key_id":                    acctest.Representation{RepType: acctest.Optional, Create: `${oci_kms_key.kms_key_id_for_create.id}`, Update: `${oci_kms_key.kms_key_id_for_update.id}`},
 		"source_snapshot_id":            acctest.Representation{RepType: acctest.Optional, Create: `${oci_file_storage_snapshot.test_snapshot.id}`},
+		"detach_clone_trigger":          acctest.Representation{RepType: acctest.Optional, Create: `0`, Update: `0`},
 		"lifecycle":                     acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 
@@ -123,6 +125,7 @@ func TestFileStorageFileSystemResource_basic(t *testing.T) {
 				acctest.GenerateResourceFromRepresentationMap("oci_file_storage_file_system", "test_file_system2", acctest.Optional, acctest.Create, FileStorageFileSystemRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
+				resource.TestCheckResourceAttr(resourceName, "clone_attach_status", "ATTACHED"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(resourceName, "display_name", "media-files-1"),
 				resource.TestCheckResourceAttrSet(resourceName, "filesystem_snapshot_policy_id"),
@@ -156,6 +159,7 @@ func TestFileStorageFileSystemResource_basic(t *testing.T) {
 					})),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
+				resource.TestCheckResourceAttr(resourceName, "clone_attach_status", "DETACHING"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
 				resource.TestCheckResourceAttr(resourceName, "display_name", "media-files-1"),
 				resource.TestCheckResourceAttrSet(resourceName, "filesystem_snapshot_policy_id"),
@@ -214,6 +218,7 @@ func TestFileStorageFileSystemResource_basic(t *testing.T) {
 				acctest.GenerateResourceFromRepresentationMap("oci_file_storage_file_system", "test_file_system2", acctest.Optional, acctest.Update, FileStorageFileSystemRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
+				resource.TestCheckResourceAttr(resourceName, "clone_attach_status", "DETACHING"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
 				resource.TestCheckResourceAttrSet(resourceName, "filesystem_snapshot_policy_id"),
@@ -254,6 +259,7 @@ func TestFileStorageFileSystemResource_basic(t *testing.T) {
 
 				resource.TestCheckResourceAttr(datasourceName, "file_systems.#", "1"),
 				resource.TestCheckResourceAttrSet(datasourceName, "file_systems.0.availability_domain"),
+				resource.TestCheckResourceAttr(datasourceName, "file_systems.0.clone_attach_status", "DETACHING"),
 				resource.TestCheckResourceAttr(datasourceName, "file_systems.0.compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(datasourceName, "file_systems.0.display_name", "displayName2"),
 				resource.TestCheckResourceAttr(datasourceName, "file_systems.0.freeform_tags.%", "1"),
@@ -273,7 +279,7 @@ func TestFileStorageFileSystemResource_basic(t *testing.T) {
 			Config:                  config + FileStorageFileSystem2RequiredOnlyResource,
 			ImportState:             true,
 			ImportStateVerify:       true,
-			ImportStateVerifyIgnore: []string{"source_snapshot_id", "parent_file_system_id"},
+			ImportStateVerifyIgnore: []string{"source_snapshot_id", "parent_file_system_id", "detach_clone_trigger"},
 			ResourceName:            resourceName,
 		},
 	})

internal/service/file_storage/file_storage_file_system_resource.go

@@ -5,6 +5,7 @@ package file_storage
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 
 	"github.com/oracle/terraform-provider-oci/internal/client"
@@ -39,6 +40,12 @@ func FileStorageFileSystemResource() *schema.Resource {
 			},
 
 			// Optional
+			"clone_attach_status": {
+				Type:             schema.TypeString,
+				Optional:         true,
+				Computed:         true,
+				DiffSuppressFunc: tfresource.AttachDiffSuppressFunction,
+			},
 			"defined_tags": {
 				Type:             schema.TypeMap,
 				Optional:         true,
@@ -74,8 +81,16 @@ func FileStorageFileSystemResource() *schema.Resource {
 				Computed: true,
 				ForceNew: true,
 			},
+			"detach_clone_trigger": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
 
 			// Computed
+			"clone_count": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 			"is_clone_parent": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -138,7 +153,18 @@ func createFileStorageFileSystem(d *schema.ResourceData, m interface{}) error {
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).FileStorageClient()
 
-	return tfresource.CreateResource(d, sync)
+	if e := tfresource.CreateResource(d, sync); e != nil {
+		return e
+	}
+
+	if _, ok := sync.D.GetOkExists("detach_clone_trigger"); ok {
+		err := sync.DetachClone()
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+
 }
 
 func readFileStorageFileSystem(d *schema.ResourceData, m interface{}) error {
@@ -154,7 +180,27 @@ func updateFileStorageFileSystem(d *schema.ResourceData, m interface{}) error {
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).FileStorageClient()
 
-	return tfresource.UpdateResource(d, sync)
+	if _, ok := sync.D.GetOkExists("detach_clone_trigger"); ok && sync.D.HasChange("detach_clone_trigger") {
+		oldRaw, newRaw := sync.D.GetChange("detach_clone_trigger")
+		oldValue := oldRaw.(int)
+		newValue := newRaw.(int)
+		if oldValue < newValue {
+			err := sync.DetachClone()
+
+			if err != nil {
+				return err
+			}
+		} else {
+			sync.D.Set("detach_clone_trigger", oldRaw)
+			return fmt.Errorf("new value of trigger should be greater than the old value")
+		}
+	}
+
+	if err := tfresource.UpdateResource(d, sync); err != nil {
+		return err
+	}
+
+	return nil
 }
 
 func deleteFileStorageFileSystem(d *schema.ResourceData, m interface{}) error {
@@ -209,6 +255,10 @@ func (s *FileStorageFileSystemResourceCrud) Create() error {
 		request.AvailabilityDomain = &tmp
 	}
 
+	if cloneAttachStatus, ok := s.D.GetOkExists("clone_attach_status"); ok {
+		request.CloneAttachStatus = oci_file_storage.CreateFileSystemDetailsCloneAttachStatusEnum(cloneAttachStatus.(string))
+	}
+
 	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
 		tmp := compartmentId.(string)
 		request.CompartmentId = &tmp
@@ -334,6 +384,11 @@ func (s *FileStorageFileSystemResourceCrud) Update() error {
 func (s *FileStorageFileSystemResourceCrud) Delete() error {
 	request := oci_file_storage.DeleteFileSystemRequest{}
 
+	if canDetachChildFileSystem, ok := s.D.GetOkExists("can_detach_child_file_system"); ok {
+		tmp := canDetachChildFileSystem.(bool)
+		request.CanDetachChildFileSystem = &tmp
+	}
+
 	tmp := s.D.Id()
 	request.FileSystemId = &tmp
 
@@ -348,6 +403,12 @@ func (s *FileStorageFileSystemResourceCrud) SetData() error {
 		s.D.Set("availability_domain", *s.Res.AvailabilityDomain)
 	}
 
+	s.D.Set("clone_attach_status", s.Res.CloneAttachStatus)
+
+	if s.Res.CloneCount != nil {
+		s.D.Set("clone_count", *s.Res.CloneCount)
+	}
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}
@@ -409,6 +470,29 @@ func (s *FileStorageFileSystemResourceCrud) SetData() error {
 	return nil
 }
 
+func (s *FileStorageFileSystemResourceCrud) DetachClone() error {
+	request := oci_file_storage.DetachCloneRequest{}
+
+	idTmp := s.D.Id()
+	request.FileSystemId = &idTmp
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "file_storage")
+
+	_, err := s.Client.DetachClone(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	if waitErr := tfresource.WaitForUpdatedState(s.D, s); waitErr != nil {
+		return waitErr
+	}
+
+	val := s.D.Get("detach_clone_trigger")
+	s.D.Set("detach_clone_trigger", val)
+
+	return nil
+}
+
 func FileSystemSourceDetailsToMap(obj *oci_file_storage.SourceDetails) map[string]interface{} {
 	result := map[string]interface{}{}
 

internal/service/file_storage/file_storage_file_systems_data_source.go

@@ -157,6 +157,8 @@ func (s *FileStorageFileSystemsDataSourceCrud) SetData() error {
 			"compartment_id":      *r.CompartmentId,
 		}
 
+		fileSystem["clone_attach_status"] = r.CloneAttachStatus
+
 		if r.DefinedTags != nil {
 			fileSystem["defined_tags"] = tfresource.DefinedTagsToMap(r.DefinedTags)
 		}

internal/tfresource/crud_helpers.go

@@ -1231,6 +1231,13 @@ func MonetaryDiffSuppress(key string, old string, new string, d *schema.Resource
 	return fmt.Sprintf("%.2f", oldVal) == fmt.Sprintf("%.2f", newVal)
 }
 
+func AttachDiffSuppressFunction(key string, old string, new string, d *schema.ResourceData) bool {
+	if new == "DETACH" {
+		return true
+	}
+	return false
+}
+
 // Diff suppression function to make sure that any change in ordering of attributes in JSON objects don't result in diffs.
 // For example, the config may have created this:
 //

website/docs/d/file_storage_file_systems.html.markdown

@@ -57,6 +57,8 @@ The following attributes are exported:
 The following attributes are exported:
 
 * `availability_domain` - The availability domain the file system is in. May be unset as a blank or NULL value.  Example: `Uocm:PHX-AD-1` 
+* `clone_attach_status` - Specifies whether the file system is attached to its parent file system.
+* `clone_count` - Specifies the total number of children of a file system.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment that contains the file system.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` 
 * `display_name` - A user-friendly name. It does not have to be unique, and it is changeable. Avoid entering confidential information.  Example: `My file system` 

website/docs/d/file_storage_filesystem_snapshot_policies.html.markdown

@@ -57,10 +57,10 @@ The following attributes are exported:
 * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the file system snapshot policy.
 * `policy_prefix` - The prefix to apply to all snapshots created by this policy.  Example: `acme` 
 * `schedules` - The list of associated snapshot schedules. A maximum of 10 schedules can be associated with a policy. 
-	* `day_of_month` - The day of the month to create a scheduled snapshot. If the day does not exist for the month, snapshot creation will be skipped. Used for MONTHLY and YEARLY snapshot schedules. 
-	* `day_of_week` - The day of the week to create a scheduled snapshot. Used for WEEKLY snapshot schedules. 
-	* `hour_of_day` - The hour of the day to create a DAILY, WEEKLY, MONTHLY, or YEARLY snapshot. If not set, a value will be chosen at creation time. 
-	* `month` - The month to create a scheduled snapshot. Used only for YEARLY snapshot schedules. 
+	* `day_of_month` - The day of the month to create a scheduled snapshot. If the day does not exist for the month, snapshot creation will be skipped. Used for MONTHLY and YEARLY snapshot schedules. If not set, the system chooses a value at creation time. 
+	* `day_of_week` - The day of the week to create a scheduled snapshot. Used for WEEKLY snapshot schedules. If not set, the system chooses a value at creation time. 
+	* `hour_of_day` - The hour of the day to create a DAILY, WEEKLY, MONTHLY, or YEARLY snapshot. If not set, the system chooses a value at creation time. 
+	* `month` - The month to create a scheduled snapshot. Used only for YEARLY snapshot schedules. If not set, the system chooses a value at creation time. 
 	* `period` - The frequency of scheduled snapshots.
 	* `retention_duration_in_seconds` - The number of seconds to retain snapshots created with this schedule. Snapshot expiration time will not be set if this value is empty. 
 	* `schedule_prefix` - A name prefix to be applied to snapshots created by this schedule.  Example: `compliance1` 

website/docs/d/file_storage_filesystem_snapshot_policy.html.markdown

@@ -40,10 +40,10 @@ The following attributes are exported:
 * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the file system snapshot policy.
 * `policy_prefix` - The prefix to apply to all snapshots created by this policy.  Example: `acme` 
 * `schedules` - The list of associated snapshot schedules. A maximum of 10 schedules can be associated with a policy. 
-	* `day_of_month` - The day of the month to create a scheduled snapshot. If the day does not exist for the month, snapshot creation will be skipped. Used for MONTHLY and YEARLY snapshot schedules. 
-	* `day_of_week` - The day of the week to create a scheduled snapshot. Used for WEEKLY snapshot schedules. 
-	* `hour_of_day` - The hour of the day to create a DAILY, WEEKLY, MONTHLY, or YEARLY snapshot. If not set, a value will be chosen at creation time. 
-	* `month` - The month to create a scheduled snapshot. Used only for YEARLY snapshot schedules. 
+	* `day_of_month` - The day of the month to create a scheduled snapshot. If the day does not exist for the month, snapshot creation will be skipped. Used for MONTHLY and YEARLY snapshot schedules. If not set, the system chooses a value at creation time. 
+	* `day_of_week` - The day of the week to create a scheduled snapshot. Used for WEEKLY snapshot schedules. If not set, the system chooses a value at creation time. 
+	* `hour_of_day` - The hour of the day to create a DAILY, WEEKLY, MONTHLY, or YEARLY snapshot. If not set, the system chooses a value at creation time. 
+	* `month` - The month to create a scheduled snapshot. Used only for YEARLY snapshot schedules. If not set, the system chooses a value at creation time. 
 	* `period` - The frequency of scheduled snapshots.
 	* `retention_duration_in_seconds` - The number of seconds to retain snapshots created with this schedule. Snapshot expiration time will not be set if this value is empty. 
 	* `schedule_prefix` - A name prefix to be applied to snapshots created by this schedule.  Example: `compliance1` 

website/docs/r/file_storage_export.html.markdown

@@ -45,9 +45,12 @@ resource "oci_file_storage_export" "test_export" {
 
 The following arguments are supported:
 
-* `export_options` - (Optional) (Updatable) Export options for the new export. If left unspecified, defaults to:
+* `export_options` - (Optional) (Updatable) Export options for the new export. For exports of mount targets with IPv4 address, if client options are left unspecified, client options would default to:
+
 	[ { "source" : "0.0.0.0/0", "requirePrivilegedSourcePort" : false, "access": "READ_WRITE", "identitySquash": "NONE", "anonymousUid": 65534, "anonymousGid": 65534, "isAnonymousAccessAllowed": false, "allowedAuth": ["SYS"] } ]
 
+	For exports of mount targets with IPv6 address, if client options are left unspecified, client options would be an empty array, i.e. export would not be visible to any clients.
+
 	**Note:** Mount targets do not have Internet-routable IP addresses.  Therefore they will not be reachable from the Internet, even if an associated `ClientOptions` item has a source of `0.0.0.0/0`.
 
 	**If set to the empty array then the export will not be visible to any clients.**