Merge pull request #2104 from oracle/release_gh

Release gh for TFP-5.40.0

Author: ravinitp

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 5.40.0 (May 01, 2024)
+
+### Added
+- Support for Database Management : Support ExaCC databases Fixed merge conflicts
+- Support for New Features: Network Security Group support in ZRCV cloud service
+- Support for Data Safe - Pre masking health check
+- Support for Ability to set Unified Auditing option for Create DBHome | ExaDB-D
+- Fixed AWS_S3 migrations bug, update resource issue with the optional atributes and documentation added
+OKE Workload Identity Auth support
+
 ## 5.39.0 (April 24, 2024)
 
 ### Added

examples/database/db_systems/db_exacs/resources.tf

@@ -71,6 +71,7 @@ resource "oci_database_db_home" "test_db_home_vm_cluster" {
   source       = "VM_CLUSTER_NEW"
   db_version   = "19.0.0.0"
   display_name = "createdDbHome"
+  is_unified_auditing_enabled = "true"
 }
 
 resource "oci_database_db_home" "test_dbrs_db_home_vm_cluster" {

examples/databasemanagement/mdb/main.tf

@@ -79,3 +79,160 @@ resource "oci_database_management_managed_database" "test_managed_database" {
   }
   freeform_tags = var.managed_db_freeform_tags
 }
+
+# External CDB
+variable "external_cdb_id" {
+  default = "ocid1.externalcontainerdatabase"
+}
+variable "connector_id" {
+  default = "ocid1.externaldatabaseconnector"
+}
+
+resource "oci_database_management_externalcontainerdatabase_external_container_dbm_features_management" "test_externalcontainerdatabase_external_container_dbm_features_management" {
+  feature_details {
+    connector_details {
+      connector_type = "EXTERNAL"
+      database_connector_id = var.connector_id
+    }
+    feature = "DIAGNOSTICS_AND_MANAGEMENT"
+    license_model = "LICENSE_INCLUDED"
+  }
+  external_container_database_id = var.external_cdb_id
+  enable_external_container_dbm_feature = "true"
+}
+
+# Uncomment PDB enable APIs only after CDB enablement is done
+# External PDB
+/*variable "external_pdb_id" {
+  default = "ocid1.externalpluggabledatabase"
+}
+variable "pdb_connector_id" {
+  default = "ocid1.externaldatabaseconnector"
+}
+
+resource "oci_database_management_externalpluggabledatabase_external_pluggable_dbm_features_management" "test_externalpluggabledatabase_external_pluggable_dbm_features_management" {
+  feature_details {
+    connector_details {
+      connector_type = "EXTERNAL"
+      database_connector_id = var.pdb_connector_id
+    }
+    feature = "DIAGNOSTICS_AND_MANAGEMENT"
+  }
+  external_pluggable_database_id = var.external_pdb_id
+  enable_external_pluggable_dbm_feature = "true"
+}*/
+
+
+# External Non-CDB
+variable "external_non_cdb_id" {
+  default = "ocid1.externalnoncontainerdatabase"
+}
+variable "non_cdb_connector_id" {
+  default = "ocid1.externaldatabaseconnector"
+}
+
+resource "oci_database_management_externalnoncontainerdatabase_external_non_container_dbm_features_management" "test_externalnoncontainerdatabase_external_non_container_dbm_features_management" {
+  feature_details {
+    connector_details {
+      connector_type = "EXTERNAL"
+      database_connector_id = var.non_cdb_connector_id
+    }
+    feature = "DIAGNOSTICS_AND_MANAGEMENT"
+    license_model = "LICENSE_INCLUDED"
+  }
+  external_non_container_database_id = var.external_non_cdb_id
+  enable_external_non_container_dbm_feature = "true"
+}
+
+# Cloud CDB
+variable "cloud_cdb_id" {
+  default = "ocid1.database"
+}
+variable "cdb_pe_id" {
+  default = "ocid1.dbmgmtprivateendpoint"
+}
+variable "vault_secret_id" {
+  default = "ocid1.vaultsecret"
+}
+variable "cdb_user_role" {
+  default = "SYSDBA"
+}
+variable "cdb_user" {
+  default = "dbsnmp"
+}
+variable "cdb_service" {
+  default = "cdb_service"
+}
+resource "oci_database_management_database_dbm_features_management" "test_database_dbm_features_management" {
+  feature_details {
+    connector_details {
+      connector_type = "PE"
+      private_end_point_id = var.cdb_pe_id
+    }
+    database_connection_details {
+      connection_credentials {
+        credential_type = "DETAILS"
+        password_secret_id = var.vault_secret_id
+        role = var.cdb_user_role
+        user_name = var.cdb_user
+      }
+      connection_string {
+        connection_type = "BASIC"
+        port = "1521"
+        protocol = "TCP"
+        service = var.cdb_service
+      }
+    }
+    feature = "DIAGNOSTICS_AND_MANAGEMENT"
+    management_type = "ADVANCED"
+  }
+  database_id = var.cloud_cdb_id
+  enable_database_dbm_feature = "true"
+}
+
+# Uncomment PDB enable APIs only after CDB enablement is done
+# Cloud PDB
+/*variable "cloud_pdb_id" {
+  default = "ocid1.pluggabledatabase"
+}
+variable "pdb_pe_id" {
+  default = "ocid1.dbmgmtprivateendpoint"
+}
+variable "vault_secret_id" {
+  default = "ocid1.vaultsecret"
+}
+variable "pdb_user_role" {
+  default = "SYSDBA"
+}
+variable "pdb_user" {
+  default = "dbsnmp"
+}
+variable "db_service" {
+  default = "pdb_service"
+}
+resource "oci_database_management_pluggabledatabase_pluggable_database_dbm_features_management" "test_pluggabledatabase_pluggable_database_dbm_features_management" {
+  feature_details {
+    connector_details {
+      connector_type = "PE"
+      private_end_point_id = var.pdb_pe_id
+    }
+    database_connection_details {
+      connection_credentials {
+        credential_type = "DETAILS"
+        password_secret_id = var.vault_secret_id
+        role = var.pdb_user_role
+        user_name = var.pdb_user
+      }
+      connection_string {
+        connection_type = "BASIC"
+        port = "1521"
+        protocol = "TCP"
+        service = var.db_service
+      }
+    }
+    feature = "DIAGNOSTICS_AND_MANAGEMENT"
+    management_type = "ADVANCED"
+  }
+  pluggable_database_id = var.cloud_pdb_id
+  enable_pluggable_database_dbm_feature = "true"
+}*/

examples/databasemigration/migration/migration.tf

@@ -263,7 +263,7 @@ resource "oci_database_migration_migration" "test_migration" {
   }
   data_transfer_medium_details_v2 {
     type = "AWS_S3"
-    access_key_id = "abc"
+    access_key_id = "AKIA4XMMNYWWF4PYZ3EW"
     object_storage_bucket {
       bucket = "bucket"
       namespace = "namespace"

examples/datasafe/masking_health_report/masking_health_report.tf

@@ -0,0 +1,40 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_ocid" {}
+variable "data_safe_target_ocid" {}
+variable "masking_health_report_id" {}
+
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+variable "access_level" {
+  default = "RESTRICTED"
+}
+
+variable "report_compartment_id_in_subtree" {
+  default = false
+}
+data "oci_data_safe_masking_policy_health_reports" "test_health_reports" {
+  #Required
+  compartment_id = var.compartment_ocid
+
+  #Optional
+  access_level = var.access_level
+  compartment_id_in_subtree =  var.report_compartment_id_in_subtree
+}
+data "oci_data_safe_masking_policy_health_report" "test_health_report" {
+  #Required
+  masking_policy_health_report_id = var.masking_health_report_id
+}

examples/recovery/provider.tf renamed to examples/datasafe/masking_health_report_log/masking_health_report_log.tf

@@ -6,8 +6,8 @@ variable "user_ocid" {}
 variable "fingerprint" {}
 variable "private_key_path" {}
 variable "region" {}
-variable "compartment_id" {}
-
+variable "compartment_ocid" {}
+variable "masking_health_report_id" {}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -16,3 +16,9 @@ provider "oci" {
   private_key_path = var.private_key_path
   region           = var.region
 }
+
+
+data "oci_data_safe_masking_policy_health_report_logs" "test_masking_policy_health_report_logs" {
+  #Required
+  masking_policy_health_report_id = var.masking_health_report_id
+}

examples/datasafe/masking_policy/masking_policy.tf

@@ -80,7 +80,6 @@ resource "oci_data_safe_masking_policy" "test_masking_policy" {
     column_source = var.masking_policy_column_source_column_source
 
     #Optional
-    sensitive_data_model_id = oci_data_safe_sensitive_data_model.test_sensitive_data_model.id
     target_id               = var.data_safe_target_ocid
   }
   compartment_id = var.compartment_ocid

examples/recovery/network.tf

@@ -1,6 +1,21 @@
 // Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Mozilla Public License v2.0
 
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_id" {}
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
 variable "protected_database_database_size" {
   default = "XS"
 }
@@ -41,21 +56,28 @@ variable "protected_database_state" {
   default = "ACTIVE"
 }
 
+variable "recovery_service_subnet_id" {
+}
+
+variable "protection_policy_id" {
+  default = "ocid1.recoveryservicepolicy.region1..aaaaaaaam22xkw32t524xvst7dbxz4qsxtwetmfnnxfsgslbq664vya5jbkq"
+}
 
 resource "oci_recovery_protected_database" "test_protected_database" {
   #Required
   compartment_id       = var.compartment_id
   db_unique_name       = var.protected_database_db_unique_name
   display_name         = var.protected_database_display_name
   password             = var.protected_database_password
-  protection_policy_id = oci_recovery_protection_policy.test_protection_policy.id
+  protection_policy_id = var.protection_policy_id
   recovery_service_subnets {
     #Required
-    recovery_service_subnet_id = oci_recovery_recovery_service_subnet.test_recovery_service_subnet.id
+    recovery_service_subnet_id = var.recovery_service_subnet_id
   }
 
   #Optional
   database_id          = var.database_id
+  deletion_schedule    = "DELETE_AFTER_72_HOURS"
   database_size        = var.protected_database_database_size
   freeform_tags        = var.protected_database_freeform_tags
   is_redo_logs_shipped = var.protected_database_is_redo_logs_shipped
@@ -68,8 +90,16 @@ data "oci_recovery_protected_databases" "test_protected_databases" {
   #Optional
   display_name               = var.protected_database_display_name
   id                         = var.protected_database_id
-  protection_policy_id       = oci_recovery_protection_policy.test_protection_policy.id
-  recovery_service_subnet_id = oci_recovery_recovery_service_subnet.test_recovery_service_subnet.id
+  protection_policy_id       = var.protection_policy_id
+  recovery_service_subnet_id = var.recovery_service_subnet_id
   state                      = var.protected_database_state
 }
 
+data "oci_recovery_protected_database_fetch_configuration" "test_protected_database_fetch_configuration" {
+  #Required
+  protected_database_id = oci_recovery_protected_database.test_protected_database.id
+
+  #Optional
+  configuration_type    = "ALL"
+  base64_encode_content = true
+}