Added - Support for FSS Resource Locking

Author: Max Gao

examples/storage/fss/export.tf

@@ -20,6 +20,14 @@ resource "oci_file_storage_export" "my_export_fs1_mt1" {
     identity_squash                = "ALL"
     require_privileged_source_port = true
   }
+  locks {
+    #Required
+    type = var.locks_type
+
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }
 
 resource "oci_file_storage_export" "my_export_fs1_mt2" {
@@ -34,6 +42,13 @@ resource "oci_file_storage_export" "my_export_fs2_mt1" {
   export_set_id  = oci_file_storage_export_set.my_export_set_1.id
   file_system_id = oci_file_storage_file_system.my_fs_2.id
   path           = var.export_path_fs2_mt1
+  locks {
+    #Required
+    type = var.locks_type
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }
 
 resource "oci_file_storage_export" "my_krb_export_krbfs_krbmt" {

examples/storage/fss/file_system.tf

@@ -15,6 +15,14 @@ resource "oci_file_storage_file_system" "my_fs_1" {
   freeform_tags = {
     "Department" = "Finance"
   }
+
+  locks {
+    #Required
+    type = var.locks_type
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }
 
 resource "oci_file_storage_file_system" "my_fs_2" {
@@ -31,6 +39,14 @@ resource "oci_file_storage_file_system" "my_fs_2" {
   freeform_tags = {
     "Department" = "Accounting"
   }
+
+  locks {
+    #Required
+    type = var.locks_type
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }
 
 resource "oci_file_storage_file_system" "my_file_system_with_fs_snapshot_policy" {
@@ -48,6 +64,14 @@ resource "oci_file_storage_file_system" "my_file_system_with_fs_snapshot_policy"
   freeform_tags = {
     "Department" = "Accounting"
   }
+
+  locks {
+    #Required
+    type = var.locks_type
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }
 
 resource "oci_file_storage_file_system" "my_krb_file_system" {

examples/storage/fss/file_system_clone.tf

@@ -6,6 +6,14 @@ resource "oci_file_storage_file_system" "my_fs_clone" {
   #Optional
   display_name = var.file_system_clone_display_name
   source_snapshot_id = oci_file_storage_snapshot.my_snapshot_clone.id
+  locks {
+    #Required
+    type = var.locks_type
+
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }
 resource "oci_file_storage_file_system" "my_fs_simple" {
   #Required
@@ -29,6 +37,14 @@ resource "oci_file_storage_file_system" "my_fs_clone_with_detach" {
   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
+
+  locks {
+    #Required
+    type = var.locks_type
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }
 resource "oci_file_storage_file_system" "my_fs_simple_1" {
   #Required
@@ -37,9 +53,25 @@ resource "oci_file_storage_file_system" "my_fs_simple_1" {
 
   #Optional
   display_name = var.file_system_simple_1_display_name
+
+  locks {
+    #Required
+    type = var.locks_type
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }
 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
+
+  locks {
+    #Required
+    type = var.locks_type
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }

examples/storage/fss/filesystem_snapshot_policy.tf

@@ -24,4 +24,12 @@ resource "oci_file_storage_filesystem_snapshot_policy" "my_filesystem_snapshot_p
     # Commented out time_schedule_start as the date given should be a time in the future
     # time_schedule_start           = "2096-01-02T15:04:05Z"
   }
+  locks {
+    #Required
+    type = var.locks_type
+
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }

examples/storage/fss/mount_target.tf

@@ -19,6 +19,15 @@ resource "oci_file_storage_mount_target" "my_mount_target_1" {
   requested_throughput = "1"
 
   nsg_ids = [oci_core_network_security_group.test_network_security_group.id]
+
+  locks {
+    #Required
+    type = var.locks_type
+
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }
 
 resource "oci_file_storage_mount_target" "my_mount_target_2" {

examples/storage/fss/outbound_connector.tf

@@ -12,6 +12,14 @@ resource "oci_file_storage_outbound_connector" "my_ldap_outbound_connector" {
     hostname = var.ldap_outbound_connector_endpoints_hostname
     port     = var.ldap_outbound_connector_endpoints_port
   }
+ locks {
+    #Required
+    type = var.locks_type
+
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
   #Optional
   #defined_tags           = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.outbound_connector_defined_tags_value)
   display_name            = var.ldap_outbound_connector_display_name

examples/storage/fss/snapshot.tf

@@ -15,5 +15,15 @@ resource "oci_file_storage_snapshot" "my_snapshot" {
   }
   # Commented out expiration_time as the date given should be a time in the future
   # expiration_time = "2096-01-02T15:04:05Z"
+
+
+  locks {
+    #Required
+    type = var.locks_type
+
+    #Optional
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
 }
 

examples/storage/fss/variables.tf

@@ -303,3 +303,15 @@ variable "krb_export_export_options_is_anonymous_access_allowed" {
 variable "krb_export_is_idmap_groups_for_sys_auth" {
   default = "false"
 }
+
+variable "locks_type" {
+  default = "FULL"
+}
+
+variable "locks_message" {
+  default = "message"
+}
+
+variable "is_lock_override" {
+  default = true
+}

internal/integrationtest/file_storage_export_test.go

@@ -48,6 +48,24 @@ var (
 		"export_options":               acctest.RepresentationGroup{RepType: acctest.Optional, Group: FileStorageExportExportOptionsRepresentation},
 		"is_idmap_groups_for_sys_auth": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
 	}
+	FileStorageExportRepresentationWithFullLock = map[string]interface{}{
+		"export_set_id":                acctest.Representation{RepType: acctest.Required, Create: `${oci_file_storage_export_set.test_export_set.id}`},
+		"file_system_id":               acctest.Representation{RepType: acctest.Required, Create: `${oci_file_storage_file_system.test_file_system.id}`},
+		"path":                         acctest.Representation{RepType: acctest.Required, Create: `/files-5`},
+		"export_options":               acctest.RepresentationGroup{RepType: acctest.Optional, Group: FileStorageExportExportOptionsRepresentation},
+		"is_idmap_groups_for_sys_auth": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
+		"locks":                        acctest.RepresentationGroup{RepType: acctest.Optional, Group: FileStorageExportFullLockRepresentation},
+		"is_lock_override":             acctest.Representation{RepType: acctest.Required, Create: `true`, Update: `true`},
+	}
+	FileStorageExportRepresentationWithDeleteLock = map[string]interface{}{
+		"export_set_id":                acctest.Representation{RepType: acctest.Required, Create: `${oci_file_storage_export_set.test_export_set.id}`},
+		"file_system_id":               acctest.Representation{RepType: acctest.Required, Create: `${oci_file_storage_file_system.test_file_system.id}`},
+		"path":                         acctest.Representation{RepType: acctest.Required, Create: `/files-5`},
+		"export_options":               acctest.RepresentationGroup{RepType: acctest.Optional, Group: FileStorageExportExportOptionsRepresentation},
+		"is_idmap_groups_for_sys_auth": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
+		"locks":                        acctest.RepresentationGroup{RepType: acctest.Optional, Group: FileStorageExportDeleteLockRepresentation},
+		"is_lock_override":             acctest.Representation{RepType: acctest.Required, Create: `true`, Update: `true`},
+	}
 	FileStorageExportExportOptionsRepresentation = map[string]interface{}{
 		"source":                         acctest.Representation{RepType: acctest.Required, Create: `0.0.0.0/0`},
 		"access":                         acctest.Representation{RepType: acctest.Optional, Create: `READ_WRITE`, Update: `READ_ONLY`},
@@ -58,6 +76,14 @@ var (
 		"is_anonymous_access_allowed":    acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
 		"require_privileged_source_port": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
 	}
+	FileStorageExportFullLockRepresentation = map[string]interface{}{
+		"type":    acctest.Representation{RepType: acctest.Required, Create: `FULL`},
+		"message": acctest.Representation{RepType: acctest.Optional, Create: `message`},
+	}
+	FileStorageExportDeleteLockRepresentation = map[string]interface{}{
+		"type":    acctest.Representation{RepType: acctest.Required, Create: `DELETE`},
+		"message": acctest.Representation{RepType: acctest.Optional, Create: `message`},
+	}
 
 	FileStorageExportResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_file_storage_export_set", "test_export_set", acctest.Required, acctest.Create, FileStorageExportSetRepresentation) +
 		acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) +
@@ -106,10 +132,10 @@ func TestFileStorageExportResource_basic(t *testing.T) {
 		{
 			Config: config + compartmentIdVariableStr + FileStorageExportResourceDependencies,
 		},
-		// verify Create with optionals
+		// verify Create with optionals and DELETE lock
 		{
 			Config: config + compartmentIdVariableStr + FileStorageExportResourceDependencies +
-				acctest.GenerateResourceFromRepresentationMap("oci_file_storage_export", "test_export", acctest.Optional, acctest.Create, FileStorageExportRepresentation),
+				acctest.GenerateResourceFromRepresentationMap("oci_file_storage_export", "test_export", acctest.Optional, acctest.Create, FileStorageExportRepresentationWithDeleteLock),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "export_options.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "export_options.0.access", "READ_WRITE"),
@@ -125,6 +151,10 @@ func TestFileStorageExportResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(resourceName, "file_system_id"),
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
 				resource.TestCheckResourceAttr(resourceName, "is_idmap_groups_for_sys_auth", "false"),
+				resource.TestCheckResourceAttr(resourceName, "locks.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "locks.0.message", "message"),
+				resource.TestCheckResourceAttrSet(resourceName, "locks.0.time_created"),
+				resource.TestCheckResourceAttr(resourceName, "locks.0.type", "DELETE"),
 				resource.TestCheckResourceAttr(resourceName, "path", "/files-5"),
 				resource.TestCheckResourceAttrSet(resourceName, "state"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -192,12 +222,41 @@ func TestFileStorageExportResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(datasourceName, "exports.0.time_created"),
 			),
 		},
+		// delete before next Create
+		{
+			Config: config + compartmentIdVariableStr + FileStorageExportResourceDependencies,
+		},
+		// verify Create with FULL Lock
+		{
+			Config: config + compartmentIdVariableStr + FileStorageExportResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_file_storage_export", "test_export", acctest.Optional, acctest.Create, FileStorageExportRepresentationWithFullLock),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttrSet(resourceName, "export_set_id"),
+				resource.TestCheckResourceAttrSet(resourceName, "file_system_id"),
+				resource.TestCheckResourceAttrSet(resourceName, "id"),
+				resource.TestCheckResourceAttr(resourceName, "is_idmap_groups_for_sys_auth", "false"),
+				resource.TestCheckResourceAttr(resourceName, "locks.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "locks.0.message", "message"),
+				resource.TestCheckResourceAttrSet(resourceName, "locks.0.time_created"),
+				resource.TestCheckResourceAttr(resourceName, "locks.0.type", "FULL"),
+
+				func(s *terraform.State) (err error) {
+					resId, err = acctest.FromInstanceState(s, resourceName, "id")
+					if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
+						if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
+							return errExport
+						}
+					}
+					return err
+				},
+			),
+		},
 		// verify resource import
 		{
 			Config:                  config + FileStorageExportRequiredOnlyResource,
 			ImportState:             true,
 			ImportStateVerify:       true,
-			ImportStateVerifyIgnore: []string{},
+			ImportStateVerifyIgnore: []string{"is_lock_override"},
 			ResourceName:            resourceName,
 		},
 	})