Merge branch 'master' of ssh://bitbucket.oci.oraclecorp.com:7999/orc/terraform-provider into release_gh

Author: sankhsin

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 7.19.0 (September 17, 2025)
+
+### Added
+- Support for BaseDB@Partner Clouds- DBAAS Support
+- Ensure that WR does not error out if there are no work request errors
+- Support for ADB-S: Refreshable Metadata Clones
+
+### Deprecation
+- Support for IPv6 for OCI FSS
+
+### Bug Fix
+- Fixing tunnel inspection and nat rules names for herds reset export resources failure.
+- display name causing update issue
+
 ## 7.18.0 (September 10, 2025)
 
 ### Added

examples/database/adb/adb_refreshable_clone/adb_refreshable_clone.tf

@@ -40,6 +40,20 @@ resource "oci_database_autonomous_database" "test_autonomous_database_source" {
   license_model            = "LICENSE_INCLUDED"
 }
 
+resource "oci_database_autonomous_database" "test_autonomous_ecpu_database_source" {
+  admin_password           = "BEstrO0ng_#11"
+  compartment_id           = var.compartment_id
+  compute_count          = "4"
+  compute_model           = "ECPU"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "rcB8w9HgKux1tty"
+  db_version               = "19c"
+  db_workload              = "OLTP"
+  display_name             = "regular_source"
+  is_dedicated             = "false"
+  license_model            = "LICENSE_INCLUDED"
+}
+
 resource "oci_database_autonomous_database" "test_autonomous_database_refreshable_clone_manual" {
   compartment_id           = var.compartment_id
   db_name                  = "bjfjkXw4ZutTt2"
@@ -69,6 +83,21 @@ resource "oci_database_autonomous_database" "test_autonomous_database_refreshabl
   source_id                                      = oci_database_autonomous_database.test_autonomous_database_source.id
 }
 
+resource "oci_database_autonomous_database" "test_autonomous_database_refreshable_clone_metadata" {
+  compartment_id           = var.compartment_id
+  db_name                  = "bjfjkXw4ZutTttry"
+  compute_count           = "4"
+  compute_model           = "ECPU"
+  data_storage_size_in_tbs = "1"
+  is_dedicated             = "false"
+  is_refreshable_clone     = "true"
+  license_model            = "LICENSE_INCLUDED"
+  refreshable_mode         = "MANUAL"
+  source                   = "CLONE_TO_REFRESHABLE"
+  clone_type               = "METADATA"
+  source_id                = oci_database_autonomous_database.test_autonomous_ecpu_database_source.id
+}
+
 data "oci_database_autonomous_database" "oci_database_autonomous_database_manual" {
   autonomous_database_id = oci_database_autonomous_database.test_autonomous_database_refreshable_clone_manual.id
 }
@@ -82,6 +111,15 @@ data "oci_database_autonomous_databases" "oci_database_autonomous_databases_manu
   }
 }
 
+data "oci_database_autonomous_databases" "oci_database_autonomous_databases_metadata" {
+  compartment_id = var.compartment_id
+
+  filter {
+    name   = "id"
+    values = [oci_database_autonomous_database.test_autonomous_database_refreshable_clone_metadata.id]
+  }
+}
+
 output "autonomous_database_refreshable_clone_manual" {
   value = data.oci_database_autonomous_databases.oci_database_autonomous_databases_manual.autonomous_databases
 }
@@ -101,4 +139,8 @@ data "oci_database_autonomous_databases" "oci_database_autonomous_databases_auto
 
 output "autonomous_database_refreshable_clone_automatic" {
   value = data.oci_database_autonomous_databases.oci_database_autonomous_databases_automatic.autonomous_databases
+}
+
+output "autonomous_database_refreshable_clone_metadata" {
+  value = data.oci_database_autonomous_databases.oci_database_autonomous_databases_metadata.autonomous_databases
 }

examples/database/dataguard/vm_shape/dataguard.tf renamed to examples/database/dataguard/db_vm/basic/dataguard.tf

@@ -0,0 +1,45 @@
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+#
+#    NAME
+#      datasource.tf
+#
+#    USAGE
+#      Use the following path for the Example & Backward Compatibility tests: database/dataguard/db_vm/multicloud
+#    NOTES
+#      Terraform Integration Test: TestDatabaseDataGuardAssociationResourceMultiCloud
+#
+#    FILE(S)
+#      database_data_guard_association_multicloud_test.go
+#
+#    MODIFIED   MM/DD/YY
+#    escabrer   08/28/2025 - Created
+
+
+
+data "oci_identity_availability_domain" "test_multicloud_availability_domain" {
+  ad_number = "3"
+  compartment_id = var.multicloud_compartment_id
+}
+
+data "oci_database_db_homes" "test_multicloud_db_homes" {
+  compartment_id = var.multicloud_compartment_id
+  db_system_id = oci_database_db_system.test_multicloud_db_system.id
+}
+
+data "oci_database_databases" "test_multicloud_databases" {
+  compartment_id = var.multicloud_compartment_id
+  db_home_id = data.oci_database_db_homes.test_multicloud_db_homes.db_homes.0.db_home_id
+}
+
+data "oci_database_data_guard_association" "test_multicloud_dataguard_association" {
+  data_guard_association_id = oci_database_data_guard_association.test_multicloud_dataguard_association.id
+  database_id = data.oci_database_databases.test_multicloud_databases.databases.0.id
+}
+
+data "oci_database_data_guard_associations" "test_multicloud_dataguard_associations" {
+  database_id = data.oci_database_databases.test_multicloud_databases.databases.0.id
+  filter {
+    name = "id"
+    values = [oci_database_data_guard_association.test_multicloud_dataguard_association.id]
+  }
+}

examples/database/dataguard/vm_shape/datasources.tf renamed to examples/database/dataguard/db_vm/basic/datasources.tf

@@ -0,0 +1,61 @@
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+#
+#    NAME
+#      dbsystem.tf
+#
+#    USAGE
+#      Use the following path for the Example & Backward Compatibility tests: database/dataguard/db_vm/multicloud
+#    NOTES
+#      Terraform Integration Test: TestDatabaseDataGuardAssociationResourceMultiCloud
+#
+#    FILE(S)
+#      database_data_guard_association_multicloud_test.go
+#
+#    MODIFIED   MM/DD/YY
+#    escabrer   08/28/2025 - Created
+
+
+resource "oci_database_db_system" "test_multicloud_db_system" {
+  availability_domain = data.oci_identity_availability_domain.test_multicloud_availability_domain.name
+  cluster_placement_group_id = var.multicloud_cluster_placement_group_id
+  compartment_id = var.multicloud_compartment_id
+  compute_count = "8"
+  compute_model = "ECPU"
+  data_collection_options {
+    is_diagnostics_events_enabled = "false"
+    is_health_monitoring_enabled = "false"
+    is_incident_logs_enabled = "false"
+  }
+  data_storage_percentage = "80"
+  data_storage_size_in_gb = "256"
+  database_edition = "ENTERPRISE_EDITION"
+  db_home {
+    database {
+      admin_password = var.admin_password
+      character_set = "AL32UTF8"
+      db_backup_config {
+        auto_backup_enabled = "false"
+      }
+      db_name = "tfdb310"
+      db_workload = "OLTP"
+      ncharacter_set = "AL16UTF16"
+    }
+    db_version = "19.26.0.0"
+    display_name = "tfDbHomeMultiCloud"
+  }
+  db_system_options {
+    storage_management = "LVM"
+  }
+  display_name = "tfDBSystemMultiCloud"
+  domain = var.multicloud_domain
+  hostname = "tfdbhost311"
+  license_model = "LICENSE_INCLUDED"
+  node_count = "1"
+  nsg_ids = [var.multicloud_nsg_id]
+  shape = "VM.Standard.x86"
+  source = "NONE"
+  ssh_public_keys = [var.ssh_public_key]
+  storage_volume_performance_mode = "HIGH_PERFORMANCE"
+  subnet_id = var.multicloud_subnet_id
+  subscription_id = var.multicloud_subscription_id
+}

examples/database/dataguard/vm_shape/main.tf renamed to examples/database/dataguard/db_vm/basic/main.tf

@@ -0,0 +1,45 @@
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+#
+#    NAME
+#      main.tf
+#
+#    USAGE
+#      Use the following path for the Example & Backward Compatibility tests: database/dataguard/db_vm/multicloud
+#    NOTES
+#      Terraform Integration Test: TestDatabaseDataGuardAssociationResourceMultiCloud
+#
+#    FILE(S)
+#      database_data_guard_association_multicloud_test.go
+#
+#    MODIFIED   MM/DD/YY
+#    escabrer   08/28/2025 - Created
+
+
+resource "oci_database_data_guard_association" "test_multicloud_dataguard_association" {
+  availability_domain = data.oci_identity_availability_domain.test_multicloud_availability_domain.name
+  cluster_placement_group_id = var.multicloud_cluster_placement_group_id
+  compute_count = "4"
+  compute_model = "ECPU"
+  creation_type = "NewDbSystem"
+  data_collection_options {
+    is_diagnostics_events_enabled = "false"
+    is_health_monitoring_enabled = "false"
+    is_incident_logs_enabled = "false"
+  }
+  database_admin_password = var.admin_password
+  database_id = data.oci_database_databases.test_multicloud_databases.databases.0.id
+  delete_standby_db_home_on_delete = "true"
+  display_name = "tfDataguardAssociationMultiCloud"
+  domain = var.multicloud_domain
+  hostname = "tfpeerdb311"
+  is_active_data_guard_enabled = "false"
+  license_model = "LICENSE_INCLUDED"
+  node_count = "1"
+  nsg_ids = [var.multicloud_nsg_id]
+  protection_mode = "MAXIMUM_PERFORMANCE"
+  shape = "VM.Standard.x86"
+  storage_volume_performance_mode = "HIGH_PERFORMANCE"
+  subnet_id = var.multicloud_subnet_id
+  subscription_id = var.multicloud_subscription_id
+  transport_type = "ASYNC"
+}