Merge pull request #2253 from oracle/release_gh

Releasing version 6.20.0

Author: NagaRajuPasunuri

CHANGELOG.md

@@ -65,6 +65,9 @@ resource "oci_core_instance_configuration" "test_instance_configuration_platform
       platform_config {
         type = var.instance_configuration_platform_config_type
         numa_nodes_per_socket = var.instance_configuration_platform_config_numa_nodes_per_socket
+        is_secure_boot_enabled = true
+        is_trusted_platform_module_enabled = true
+        is_measured_boot_enabled = true
       }
 
       create_vnic_details {

examples/compute/instance_pool/instance_pool_platform_config.tf

@@ -82,8 +82,19 @@ resource "oci_dataflow_pool" "test_pool" {
   freeform_tags = {
     "Department" = "Finance"
   }
-  configurations = [{shape: "VM.Standard2.1", shapeConfig: {ocpus: 1, memoryInGBs: 15}, min: 0, max: 1}]
-  schedules = [{dayOfWeek: "SUNDAY", startTime: 3}]
+  configurations {
+    shape = "VM.Standard2.1"
+    shape_config {
+      ocpus = 1
+      memory_in_gbs = 15
+    }
+    min = 0
+    max = 1
+  }
+  schedules {
+    day_of_week = "SUNDAY"
+    start_time = 3
+  }
 }
 
 resource "oci_dataflow_application" "tf_application" {
@@ -116,6 +127,7 @@ resource "oci_dataflow_application" "tf_application" {
 
   #warehouse_bucket_uri = var.application_warehouse_bucket_uri}"
   metastore_id = var.metastore_id
+  terminate_runs_on_deletion = true
 }
 
 data "oci_dataflow_applications" "tf_applications" {

examples/dataflow/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/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/session_lifecycle_management/main.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 = ""
 }

examples/desktops/desktop_pool/variables.tf

@@ -49,6 +49,8 @@ resource "oci_disaster_recovery_dr_plan" "test_dr_plan" {
   display_name           = var.dr_plan_display_name
   dr_protection_group_id = data.oci_disaster_recovery_dr_protection_groups.test_dr_protection_groups.dr_protection_group_collection.0.items.0.id
   type                   = var.dr_plan_type
+  refresh_trigger        = 0
+  verify_trigger         = 0
 
   lifecycle {
     ignore_changes = [defined_tags]

examples/disaster_recovery/dr_plan/dr_plan.tf

@@ -0,0 +1,45 @@
+
+variable "tenancy_ocid" {
+#   default = ""
+}
+
+variable "ssh_public_key" {
+#   default = ""
+}
+
+variable "region" {
+  default = "us-ashburn-1"
+}
+
+variable "compartment_id" { 
+    # default = "" 
+}
+
+variable "compliance_policy_id" { 
+    # default = "" 
+}
+
+data "oci_fleet_apps_management_compliance_policies" "test_compliance_policies" {
+  compartment_id = "${var.compartment_id}"
+}
+
+resource "oci_fleet_apps_management_compliance_policy_rule" "test_compliance_policy_rule" {
+  compartment_id       = "${var.compartment_id}"
+  compliance_policy_id = "${var.compliance_policy_id}"
+  display_name         = "displayName"
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+  grace_period = "gracePeriod2"
+  patch_selection {
+    days_since_release = "0"
+    patch_level        = "LATEST"
+    selection_type     = "PATCH_LEVEL"
+  }
+  patch_type = ["Security"]
+  product_version {
+    is_applicable_for_all_higher_versions = "false"
+    version                               = "9"
+  }
+  severity = ["LOW"]
+}

examples/fleet_apps_management/compliance_policy_rule/main.tf

@@ -88,8 +88,6 @@ variable "fleet_state" {
   default = "NEEDS_ATTENTION"
 }
 
-
-
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid

examples/fleet_apps_management/fleet/fleet.tf

@@ -0,0 +1,48 @@
+
+variable "tenancy_ocid" {
+#   default = ""
+}
+
+variable "ssh_public_key" {
+#   default = ""
+}
+
+variable "region" {
+  default = "us-ashburn-1"
+}
+
+variable "compartment_id" { 
+    # default = "" 
+}
+
+variable "compatible_product_id" { 
+    # default = "" 
+}
+
+variable "credential_id" { 
+    # default = "" 
+}
+
+variable "patch_type_id" { 
+    # default = "" 
+}
+
+resource "oci_fleet_apps_management_platform_configuration" "test_platform_configuration" {
+  compartment_id = "${var.compartment_id}"
+  config_category_details {
+    compatible_products {
+      id = "${var.compatible_product_id}"
+    }
+    components      = ["components2"]
+    config_category = "PRODUCT"
+    credentials {
+      id = "${var.credential_id}"
+    }
+    patch_types {
+      id = "${var.patch_type_id}"
+    }
+    versions = ["versions2"]
+  }
+  description  = "description2"
+  display_name = "displayName2"
+}