Bug Fix - Support for Wwether the volumes are preserved when a desktop pool is deleted

Author: Marcel Casado

examples/desktops/desktop_pool/main.tf

@@ -52,6 +52,8 @@ resource "oci_desktops_desktop_pool" "test_desktop_pool" {
   storage_backup_policy_id = var.desktop_pool_backup_policy_id
   storage_size_in_gbs      = var.desktop_pool_storage_size_in_gbs
 
+  are_volumes_preserved = var.desktop_pool_are_volumes_preserved
+
   shape_name   = var.desktop_pool_shape_name
   standby_size = var.desktop_pool_standby_size
   maximum_size = var.desktop_pool_maximum_size

examples/desktops/desktop_pool/session_lifecycle_management/main.tf

@@ -37,6 +37,7 @@ resource "oci_desktops_desktop_pool" "test_desktop_pool" {
   # Important: Availability policy can not be set when DISCONNECT Session Lifecycle Action is being set but
   # "availability_policy" element without start nor stop schedules needs to be present
   availability_policy {
+
   }
 
   is_storage_enabled       = var.desktop_pool_is_storage_enabled

examples/desktops/desktop_pool/variables.tf

@@ -103,6 +103,11 @@ variable "desktop_pool_storage_size_in_gbs" {
   default = 50
 }
 
+variable "desktop_pool_are_volumes_preserved" {
+  description = "Indicates whether the volumes are preserved when a desktop pool is deleted"
+  default = false
+}
+
 variable "desktop_pool_vcn_id" {
   description = ""
 }

internal/integrationtest/desktops_desktop_pool_test.go

@@ -63,6 +63,7 @@ var (
 		"standby_size":              acctest.Representation{RepType: acctest.Required, Create: `2`, Update: `3`},
 		"storage_backup_policy_id":  acctest.Representation{RepType: acctest.Required, Create: `${var.test_storage_backup_policy_id}`},
 		"storage_size_in_gbs":       acctest.Representation{RepType: acctest.Required, Create: `50`},
+		"are_volumes_preserved":     acctest.Representation{RepType: acctest.Optional, Create: `true`, Update: `false`},
 		"description":               acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"freeform_tags":             acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
 		"nsg_ids":                   acctest.Representation{RepType: acctest.Optional, Create: []string{`${var.test_nsg_id}`}},
@@ -392,6 +393,7 @@ func TestDesktopsDesktopPoolResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "standby_size", "2"),
 				resource.TestCheckResourceAttrSet(resourceName, "state"),
 				resource.TestCheckResourceAttrSet(resourceName, "storage_backup_policy_id"),
+				resource.TestCheckResourceAttrSet(resourceName, "are_volumes_preserved"),
 				resource.TestCheckResourceAttr(resourceName, "storage_size_in_gbs", "50"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 				resource.TestCheckResourceAttrSet(resourceName, "use_dedicated_vm_host"),
@@ -526,6 +528,7 @@ func TestDesktopsDesktopPoolResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(resourceName, "state"),
 				resource.TestCheckResourceAttrSet(resourceName, "storage_backup_policy_id"),
 				resource.TestCheckResourceAttr(resourceName, "storage_size_in_gbs", "50"),
+				resource.TestCheckResourceAttrSet(resourceName, "are_volumes_preserved"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 				resource.TestCheckResourceAttrSet(resourceName, "use_dedicated_vm_host"),
 

internal/service/desktops/desktops_desktop_pool_resource.go

@@ -247,6 +247,11 @@ func DesktopsDesktopPoolResource() *schema.Resource {
 				ForceNew: true,
 			},
 
+			"are_volumes_preserved": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+
 			// Optional
 			"defined_tags": {
 				Type:             schema.TypeMap,

website/docs/r/desktops_desktop_pool.html.markdown

@@ -67,6 +67,7 @@ resource "oci_desktops_desktop_pool" "test_desktop_pool" {
 	storage_size_in_gbs = var.desktop_pool_storage_size_in_gbs
 
 	#Optional
+	are_volumes_preserved = var.desktop_pool_are_volumes_preserved
 	defined_tags = {"Operations.CostCenter"= "42"}
 	description = var.desktop_pool_description
 	freeform_tags = {"Department"= "Finance"}
@@ -116,7 +117,7 @@ The following arguments are supported:
 
 * `are_privileged_users` - (Required) Indicates whether desktop pool users have administrative privileges on their desktop.
 * `availability_domain` - (Required) The availability domain of the desktop pool.
-* `availability_policy` - (Required) (Updatable) Provides the start and stop schedule information for desktop availability of the desktop pool.
+* `availability_policy` - (Required) (Updatable) Provides the start and stop schedule information for desktop availability of the desktop pool. Use `availability_policy { }` to not set a schedule.
 	* `start_schedule` - (Optional) (Updatable) Provides the schedule information for a desktop.
 		* `cron_expression` - (Required) (Updatable) A cron expression describing the desktop's schedule.
 		* `timezone` - (Required) (Updatable) The timezone of the desktop's schedule.
@@ -159,11 +160,11 @@ The following arguments are supported:
 	* `private_ip` - (Optional) The IPv4 address from the provided Oracle Cloud Infrastructure subnet which needs to be assigned to the VNIC. If not provided, it will be auto-assigned with an available IPv4 address from the subnet. 
 	* `subnet_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the private subnet in the customer VCN where the connectivity will be established.
 * `session_lifecycle_actions` - (Optional) The details of action to be triggered in case of inactivity or disconnect
-	* `disconnect` - (Optional) (Updatable) Action and grace period for disconnect
-		* `action` - (Required) (Updatable) a disconnect action to be triggered
+	* `disconnect` - (Optional) (Updatable) Action and grace period for disconnect. Session disconnect can not be used together with an `availability_policy` schedule. 
+		* `action` - (Required) (Updatable) a disconnect action to be triggered. Could be set to NONE or STOP
 		* `grace_period_in_minutes` - (Optional) (Updatable) The period of time (in minutes) after disconnect before any action occurs. If the value is not provided, a default value is used. 
 	* `inactivity` - (Optional) (Updatable) Action and grace period for inactivity
-		* `action` - (Required) (Updatable) an inactivity action to be triggered
+		* `action` - (Required) (Updatable) an inactivity action to be triggered. Could be set to NONE or DISCONNECT.
 		* `grace_period_in_minutes` - (Optional) (Updatable) The period of time (in minutes) during which the session must remain inactive before any action occurs. If the value is not provided, a default value is used.
 * `shape_name` - (Required) The shape of the desktop pool.
 * `standby_size` - (Required) (Updatable) The maximum number of standby desktops available in the desktop pool.
@@ -172,6 +173,7 @@ The following arguments are supported:
 * `time_start_scheduled` - (Optional) (Updatable) The start time of the desktop pool.
 * `time_stop_scheduled` - (Optional) (Updatable) The stop time of the desktop pool.
 * `use_dedicated_vm_host` - (Optional) Indicates whether the desktop pool uses dedicated virtual machine hosts.
+* `are_volumes_preserved` - (Optional) (Updatable) Indicates whether the volumes are preserved when a desktop pool is deleted. Default value is false.
 
 
 ** IMPORTANT **