Merge pull request #2165 from oracle/release_gh

Releasing OCI Provider Version v.6.5.0

Author: vsin12

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.5.0 (July 30, 2024)
+
+### Added
+- Support for Instance maintenance events api
+- Support for Fleet Patching Service for ExaCS and ExaCC
+- Support for Implicit JIT and Group Membership Support in OIDC Flow
+-Support for OCI Cache -Lua Support on Redis 7.0.15
+- Support for Stack Monitoring: Baseline / Anomalies Enhancements
+- Support for Tunnel inspection rules in network firewall policy
+- Support for Data Safe - Custom Alert Policy for Audit - Examples
+- Support for [Expose Logical CPG ID] Terraform Support in Prod Region ADB-S: Adding an attribute to the autonomous database summary object
+- Support for Goldengate Suspend Phase / Parameter File Update Support
+### Bug Fix
+- Fixing tvarious CC test cases
+- Db_Node id setting causing an issue with backward compatability
+- Take shape as input for add node
+- Excluding basemodels in the stack in resource discovery
+
 ## 6.4.0 (July 24, 2024)
 
 ### Added

examples/README.md

@@ -97,6 +97,8 @@ This directory contains Terraform configuration files showing how to create spec
     [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/events.zip)
 - fast_connect  
     [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/fast_connect.zip)
+- fleetsoftwareupdate  
+    [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/fleetsoftwareupdate.zip)
 - functions  
     [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/functions.zip)
 - fusionapps  

examples/big_data_service/main.tf

@@ -4,6 +4,10 @@
 variable "tenancy_ocid" {
 }
 
+variable "cluster_profile" {
+default = "HADOOP"
+}
+
 variable "user_ocid" {
 }
 
@@ -29,8 +33,6 @@ variable "bds_instance_cluster_admin_password" {
 variable "kms_key_id" {
 }
 
-variable "cluster_profile" {
-}
 
 variable "bds_instance_cluster_public_key" {
   default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpUa4zUZKyU3AkW9yoJTBDO550wpWZOXdHswfRq75gbJ2ZYlMtifvwiO3qUL/RIZSC6e1wA5OL2LQ97UaHrLLPXgjvKGVIDRHqPkzTOayjJ4ZA7NPNhcu6f/OxhKkCYF3TAQObhMJmUSMrWSUeufaRIujDz1HHqazxOgFk09fj4i2dcGnfPcm32t8a9MzlsHSmgexYCUwxGisuuWTsnMgxbqsj6DaY51l+SEPi5tf10iFmUWqziF0eKDDQ/jHkwLJ8wgBJef9FSOmwJReHcBY+NviwFTatGj7Cwtnks6CVomsFD+rAMJ9uzM8SCv5agYunx07hnEXbR9r/TXqgXGfN [email protected]"
@@ -67,7 +69,7 @@ variable "bds_instance_network_config_cidr_block" {
 }
 
 variable "bds_instance_network_config_is_nat_gateway_required" {
-  default = false
+  default = true
 }
 
 variable "bds_instance_nodes_block_volume_size_in_gbs" {
@@ -83,7 +85,7 @@ variable "bds_instance_nodes_shape" {
 }
 
 variable "bds_instance_worker_node_shape" {
-  default = "VM.DenseIO.E4.Flex"
+  default = "VM.Standard.Generic"
 }
 
 variable "bds_instance_compute_only_worker_node_shape" {
@@ -135,64 +137,6 @@ provider "oci" {
   region           = var.region
 }
 
-#Uncomment this when running in home region (PHX)
-#resource "oci_identity_tag_namespace" "tag-namespace1" {
-#  #Required
-#  compartment_id = var.tenancy_ocid
-#  description    = var.tag_namespace_description
-#  name           = var.tag_namespace_name
-#}
-
-#Uncomment this when running in home region (PHX)
-#resource "oci_identity_tag" "tag1" {
-#  #Required
-#  description      = "tf example tag"
-#  name             = "tf-example-tag"
-#  tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
-#}
-
-resource "oci_core_vcn" "vcn_bds" {
-  cidr_block     = "111.111.0.0/16"
-  compartment_id = var.compartment_id
-  display_name   = "BDS_VCN"
-  dns_label      = "bdsvcn"
-}
-
-resource "oci_core_service_gateway" "export_sgw" {
-  compartment_id = var.compartment_id
-  display_name   = "sgw"
-
-  services {
-    service_id = data.oci_core_services.test_bds_services.services[0]["id"]
-  }
-
-  vcn_id = oci_core_vcn.vcn_bds.id
-}
-
-resource "oci_core_route_table" "private_rt" {
-  compartment_id = var.compartment_id
-  display_name   = "private-rt"
-
-  route_rules {
-    destination       = data.oci_core_services.test_bds_services.services[0]["cidr_block"]
-    destination_type  = "SERVICE_CIDR_BLOCK"
-    network_entity_id = oci_core_service_gateway.export_sgw.id
-  }
-
-  vcn_id = oci_core_vcn.vcn_bds.id
-}
-
-resource "oci_core_subnet" "regional_subnet_bds" {
-  cidr_block        = "111.111.0.0/24"
-  display_name      = "regionalSubnetBds"
-  dns_label         = "regionalbds"
-  compartment_id    = var.compartment_id
-  vcn_id            = oci_core_vcn.vcn_bds.id
-  security_list_ids = [oci_core_vcn.vcn_bds.default_security_list_id]
-  route_table_id    = oci_core_vcn.vcn_bds.default_route_table_id
-  dhcp_options_id   = oci_core_vcn.vcn_bds.default_dhcp_options_id
-}
-
 resource "oci_bds_bds_instance" "test_bds_instance" {
   #Required
   cluster_admin_password = var.bds_instance_cluster_admin_password
@@ -204,72 +148,73 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
   is_secure              = var.bds_instance_is_secure
   kms_key_id             = var.kms_key_id
   cluster_profile        = var.cluster_profile
-  bootstrap_script_url = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/1hWiiE-2GVzGiKhaBX1zyXVa_jTIu_cU5kDdKTyYS74Wk5xmEA2WKht9NTA2y935/n/oraclebigdatadb/b/bootstrap-script-sdk-test/o/bootstrapScriptTemplate1bootstrapScript1.sh"
+  bootstrap_script_url = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/Lk5JT9tnUIOG4yLm6S21QVR7m3Rm2uj1RAS2Olx5v14onLU2Y-b0lIc_N0RuUIge/n/idpbwtq1b3ta/b/bucket-20230214-1316/o/execute_bootstrap_script.sh"
 
   master_node {
     #Required
-    shape = var.bds_instance_nodes_shape
+    shape = "VM.Standard.E4.Flex"
 
     subnet_id                = var.subnet_id
     block_volume_size_in_gbs = var.bds_instance_nodes_block_volume_size_in_gbs
     number_of_nodes          = 1
+    shape_config {
+            memory_in_gbs = 120
+           ocpus         = 8
+        }
   }
 
   util_node {
     #Required
-    shape = var.bds_instance_nodes_shape
+    shape = "VM.Standard.E4.Flex"
 
     subnet_id                = var.subnet_id
     block_volume_size_in_gbs = var.bds_instance_nodes_block_volume_size_in_gbs
     number_of_nodes          = 1
+    shape_config {
+            memory_in_gbs = 120
+            ocpus         = 8
+        }
   }
 
   worker_node {
     #Required
     shape = var.bds_instance_worker_node_shape
-
-    subnet_id                = var.subnet_id
-    number_of_nodes          = 4
-     shape_config {
-          memory_in_gbs = 128
-          ocpus         = 8
-          nvmes         = 1
-     }
-  }
-
-  edge_node {
-    #Required
-    shape = var.bds_instance_edge_node_shape
-
-    subnet_id                = var.subnet_id
-    block_volume_size_in_gbs = var.bds_instance_worker_nodes_block_volume_size_in_gbs
-    number_of_nodes          = 1
-    shape_config {
-      memory_in_gbs = var.bds_instance_edge_memory_per_node
-      ocpus         = var.bds_instance_edge_ocpu_per_node
-    }
-  }
-
-  compute_only_worker_node {
-    #Required
-    shape = var.bds_instance_compute_only_worker_node_shape
-
+    block_volume_size_in_gbs = var.bds_instance_nodes_block_volume_size_in_gbs
     subnet_id                = var.subnet_id
-    block_volume_size_in_gbs = var.bds_instance_worker_nodes_block_volume_size_in_gbs
-    number_of_nodes          = 1
-    shape_config {
-      memory_in_gbs = var.bds_instance_compute_only_worker_memory_per_node
-      ocpus         = var.bds_instance_compute_only_worker_ocpu_per_node
+    number_of_nodes          = 3
+       shape_config {
+              memory_in_gbs = 120
+              ocpus         = 8
+         }
+      }
+
+      edge_node {
+        #Required
+        shape = var.bds_instance_edge_node_shape
+
+        subnet_id                = var.subnet_id
+        block_volume_size_in_gbs = var.bds_instance_worker_nodes_block_volume_size_in_gbs
+        number_of_nodes          = 1
+        shape_config {
+          memory_in_gbs = var.bds_instance_edge_memory_per_node
+          ocpus         = var.bds_instance_edge_ocpu_per_node
+        }
+      }
+
+      compute_only_worker_node {
+        #Required
+        shape = var.bds_instance_compute_only_worker_node_shape
+
+        subnet_id                = var.subnet_id
+        block_volume_size_in_gbs = var.bds_instance_worker_nodes_block_volume_size_in_gbs
+        number_of_nodes          = 1
+        shape_config {
+          memory_in_gbs = var.bds_instance_compute_only_worker_memory_per_node
+          ocpus         = var.bds_instance_compute_only_worker_ocpu_per_node
     }
   }
 
-
-
-
-  #   cloud_sql_details {
-  #     shape                    = "VM.Standard2.4"
-  #     block_volume_size_in_gbs = 1000
-  #   }
+ ignore_existing_nodes_shape = ["worker", "master", "utility"]
 
   is_cloud_sql_configured = false
 

examples/compute/instance_maintenance_event/instance_maintenance_event.tf

@@ -0,0 +1,53 @@
+
+	# Need to have this block even though it's empty; for import testing
+	provider "oci" {
+	}
+
+	variable "tenancy_ocid" {
+	}
+
+	variable "compartment_id" {
+    }
+
+    variable "instance_id" {
+    }
+
+    variable "instance_maintenance_event_id" {
+    }
+
+	variable "ssh_public_key" {
+	}
+
+	variable "region" {
+		default = "us-ashburn-1"
+	}
+
+
+data "oci_core_instance_maintenance_events" "test_instance_maintenance_event" {
+  compartment_id = var.compartment_id
+  filter {
+    name = "id"
+    values = [oci_core_instance_maintenance_event.test_instance_maintenance_event.id]
+  }
+  instance_action = "REBOOT_MIGRATION"
+  instance_id = var.instance_id
+  state = "SCHEDULED"
+}
+
+		// Gets a list of all Oracle Linux 7.5 images that support a given Instance shape
+		data "oci_core_images" "supported_shape_images" {
+			compartment_id   = var.tenancy_ocid
+			shape            = "VM.Standard2.1"
+			operating_system = "Oracle Linux"
+		}
+
+
+resource "oci_core_instance_maintenance_event" "test_instance_maintenance_event" {
+  can_delete_local_storage = "true"
+  display_name = "displayName2"
+  freeform_tags = {
+    "Department" = "Accounting"
+  }
+  instance_maintenance_event_id = var.instance_maintenance_event_id
+  time_window_start = "2025-01-12T15:04:05Z"
+}

examples/database/adb/autonomous_database.tf

@@ -166,13 +166,48 @@ resource "oci_database_autonomous_database" "test_autonomous_database_db_tools"
   license_model                        = "LICENSE_INCLUDED"
   is_free_tier                         = "false"
   db_tools_details {
-      #Required
-      name = "ORDS"
-
-      #Optional
-      is_enabled = true
-   }
-}
+              name = "APEX"
+                is_enabled = true
+                compute_count = 0
+                max_idle_time_in_minutes = 0
+              }
+              db_tools_details {
+                name = "DATA_TRANSFORMS"
+                is_enabled = true
+                compute_count = 0
+                max_idle_time_in_minutes = 0
+              }
+              db_tools_details {
+                name = "DATABASE_ACTIONS"
+                is_enabled = true
+                compute_count = 0
+                max_idle_time_in_minutes = 0
+              }
+              db_tools_details {
+                name = "GRAPH_STUDIO"
+                is_enabled = false
+                compute_count = 0
+                max_idle_time_in_minutes = 0
+              }
+              db_tools_details {
+                name = "MONGODB_API"
+                is_enabled = true
+                compute_count = 0
+                max_idle_time_in_minutes = 0
+              }
+              db_tools_details {
+                name = "OML"
+                is_enabled = true
+                compute_count = 0
+                max_idle_time_in_minutes = 0
+              }
+              db_tools_details {
+                name = "ORDS"
+                is_enabled = true
+                compute_count = 0
+                max_idle_time_in_minutes = 0
+              }
+    }
 
 resource "oci_database_autonomous_database" "test_autonomous_database_actions" {
   admin_password           = random_string.autonomous_database_admin_password.result
@@ -187,11 +222,6 @@ resource "oci_database_autonomous_database" "test_autonomous_database_actions" {
   state                    = "STOPPED"
 }
 
-resource "oci_database_autonomous_database_backup" "autonomous_database_backup" {
-  #Required
-  autonomous_database_id = oci_database_autonomous_database.autonomous_database.id
-  display_name           = var.autonomous_database_backup_display_name
-}
 
 resource "oci_database_autonomous_database" "autonomous_database_oneway_tls_connection" {
   admin_password              = random_string.autonomous_database_admin_password.result
@@ -243,6 +273,7 @@ resource "oci_database_autonomous_database" "autonomous_database_from_backup_tim
 }
 */
 
+/*
 resource "oci_database_autonomous_database" "autonomous_database_from_backup_latest" {
   #Required
   admin_password           = random_string.autonomous_database_admin_password.result
@@ -257,7 +288,7 @@ resource "oci_database_autonomous_database" "autonomous_database_from_backup_lat
   use_latest_available_backup_time_stamp              = "true"
   whitelisted_ips             = ["1.1.1.1/28"]
 }
-
+*/
 resource "oci_core_vcn" "test_vcn" {
   cidr_block = "10.0.0.0/16"
   compartment_id = var.compartment_ocid