Merge pull request #2181 from oracle/release_gh

Releasing version 6.9.0

Author: jiaqchenO

CHANGELOG.md

@@ -1,3 +1,29 @@
+## 6.9.0 (August 27, 2024)
+
+### Added
+- Support for Delegated Access Control for Exadata Cloud Services
+- Support for MySQL HeatWave Service: Customer email notification
+- Support for ADB-S: NewDev - Developer Databases
+- Support for Database Management: Support advanced DBM features for ADB
+- 08/06 Support for Sqlwatch integration Added:- 08/06 Support for Sqlwatch integration
+- Load Balancer and Waf support for Request Ids (WAF Incident ID support)
+- Support for Create Terraform provider for Secure Desktops Desktop as a Service
+- Support for Replacing hard-coded list of items on dropdowns on the Console with response from an internal API call
+- Support for ADB-S: Provide Availability Domain Details in CP
+- Support for KMS Cross Region Replication for Virtual Vaults
+- Support subscriptionId attribute for Autonomous Recovery Service (ZRCV)
+- Support for High Performance Mount Targets (HPMT)
+- Support for VMware Major and Minor Version Upgrade
+- Support for Adding domain parameter in DG API
+force_delete for ID Users and Groups, groups.members has type of TypeSet
+- Support for Use custom diff Suppress for List of Maps in Vm Cluster Resource
+- Create _management resource for Unset baseline for Security Assessment and User Assessment in Data Safe
+- artifact publish changes for releash_gh branch
+trigger for dev branches
+### Bug Fix
+- Reverted back the changes in Preview SDK
+- BDS instance create
+
 ## 6.8.0 (August 21, 2024)
 
 ### Added

examples/README.md

@@ -81,8 +81,12 @@ 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/datasafe.zip)
 - datascience  
     [![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/datascience.zip)
+- delegation_management  
+    [![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/delegation_management.zip)
 - demand_signal  
     [![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/demand_signal.zip)
+- desktops  
+    [![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/desktops.zip)
 - devops  
     [![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/devops.zip)
 - disaster_recovery  

examples/database/dataguard/vm_shape/dataguard.tf

@@ -34,17 +34,66 @@ data "oci_identity_availability_domain" "ad" {
   ad_number      = 1
 }
 
-resource "oci_core_vcn" "vcn1" {
+data "oci_core_services" "test_services" {
+  filter {
+    name   = "name"
+    values = [".*Oracle.*Services.*Network"]
+    regex  = true
+  }
+}
+
+data "oci_identity_availability_domains" "test_availability_domains" {
+  compartment_id = var.tenancy_ocid
+}
+
+resource "oci_core_vcn" "test_vcn" {
   cidr_block     = "10.0.0.0/16"
   compartment_id = var.compartment_ocid
   display_name   = "TFExampleVCN"
   dns_label      = "tfexamplevcn"
 }
 
+resource "oci_core_service_gateway" "test_service_gateway" {
+  compartment_id = var.compartment_ocid
+  display_name   = "test_service_gateway"
+  vcn_id         = oci_core_vcn.test_vcn.id
+
+  services {
+    service_id = data.oci_core_services.test_services.services.0.id
+  }
+
+}
+
+resource "oci_core_default_route_table" "test_vcn__default_route_table" {
+  manage_default_resource_id = oci_core_vcn.test_vcn.default_route_table_id
+
+  route_rules {
+    network_entity_id = oci_core_service_gateway.test_service_gateway.id
+
+    description 	  = "Internal traffic for OCI Services"
+    destination       = data.oci_core_services.test_services.services[0].cidr_block
+    destination_type  = "SERVICE_CIDR_BLOCK"
+  }
+}
+
+resource "oci_core_route_table" "test_route_table" {
+  compartment_id = var.compartment_ocid
+  display_name   = "test_subnet_rt"
+  vcn_id         = oci_core_vcn.test_vcn.id
+
+  route_rules {
+    network_entity_id = oci_core_service_gateway.test_service_gateway.id
+
+    description 	  = "Internal traffic for OCI Services"
+    destination       = data.oci_core_services.test_services.services[0].cidr_block
+    destination_type  = "SERVICE_CIDR_BLOCK"
+  }
+}
+
 resource "oci_core_security_list" "test_security_list" {
   compartment_id = var.compartment_ocid
-  vcn_id         = oci_core_vcn.vcn1.id
-  display_name   = "TFExampleSecurityList"
+  vcn_id         = oci_core_vcn.test_vcn.id
+  display_name   = "test_security_list"
 
   // allow outbound tcp traffic on all ports
   egress_security_rules {
@@ -58,21 +107,21 @@ resource "oci_core_security_list" "test_security_list" {
   }
 }
 
-// An AD based subnet will supply an Availability Domain
 resource "oci_core_subnet" "test_subnet" {
-  availability_domain = data.oci_identity_availability_domain.ad.name
-  cidr_block          = "10.0.2.0/24"
-  display_name        = "TFADSubnet"
-  dns_label           = "adsubnet"
-  compartment_id      = var.compartment_ocid
-  vcn_id              = oci_core_vcn.vcn1.id
-  security_list_ids   = [oci_core_security_list.test_security_list.id]
-  route_table_id      = oci_core_vcn.vcn1.default_route_table_id
-  dhcp_options_id     = oci_core_vcn.vcn1.default_dhcp_options_id
+  cidr_block          	   = "10.0.2.0/24"
+  compartment_id      	   = var.compartment_ocid
+  vcn_id              	   = oci_core_vcn.test_vcn.id
+  display_name        	   = "test_subnet"
+  security_list_ids   	   = [oci_core_security_list.test_security_list.id]
+  route_table_id      	   = oci_core_route_table.test_route_table.id
+  dhcp_options_id     	   = oci_core_vcn.test_vcn.default_dhcp_options_id
+  dns_label           	   = "tftestsubnet"
+  prohibit_public_ip_on_vnic = "true"
 }
 
+
 resource "oci_database_db_system" "test_db_system" {
-  availability_domain     = oci_core_subnet.test_subnet.availability_domain
+  availability_domain     = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
   compartment_id          = var.compartment_ocid
   subnet_id               = oci_core_subnet.test_subnet.id
   database_edition        = "ENTERPRISE_EDITION"
@@ -125,12 +174,12 @@ resource "oci_database_data_guard_association" "test_data_guard_association" {
   display_name              = "TFExampleDataGuardAssociationVM"
   shape                     = "VM.Standard2.1"
   subnet_id                 = oci_core_subnet.test_subnet.id
-  availability_domain       = oci_core_subnet.test_subnet.availability_domain
+  availability_domain       = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
   nsg_ids                   = [oci_core_network_security_group.test_network_security_group.id]
   hostname                  = "ocidb"
-  db_system_defined_tags    = "${map("example-tag-namespace-all.example-tag", "dbSystemDefinedTags1")}"
+  db_system_defined_tags    = map("example-tag-namespace-all.example-tag", "dbSystemDefinedTags1")
   db_system_freeform_tags   = {"dbSystemFreeformTagsK" = "dbSystemFreeformTagsV"}
-  database_defined_tags     = "${map("example-tag-namespace-all.example-tag", "databaseDefinedTags1")}"
+  database_defined_tags     = map("example-tag-namespace-all.example-tag", "databaseDefinedTags1")
   database_freeform_tags    = {"databaseFreeformTagsK" = "databaseFreeformTagsV"}
   fault_domains             = ["FAULT-DOMAIN-3"]
   license_model             = "LICENSE_INCLUDED"
@@ -142,7 +191,7 @@ resource "oci_database_data_guard_association" "test_data_guard_association" {
 
 resource "oci_core_network_security_group" "test_network_security_group" {
   compartment_id = var.compartment_ocid
-  vcn_id         = oci_core_vcn.vcn1.id
+  vcn_id         = oci_core_vcn.test_vcn.id
   display_name   = "tf-example-nsg"
 }