Merge pull request #2322 from oracle/release_gh

Releasing version 6.30.0

Author: varakali

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 6.30.0 (March 11, 2025)
+
+### Added
+- Support for ExaDB-C@C Exascale Integration
+- Support for ExaDB-D | IPV6 Support
+- Support for OCI Data Science Model Store changes for AQUA
+- Support for NewDev - ExaCC/ExaCS
+- Support for HeatWave Service: Scheduled Cross-Region Backup Copy
+Terraform support for OpenSearch Data Prepper Pipeline
+tests for datasafe security assessment
+- Support for Data Safe - Discovery and Masking enhancements
+### Bug Fix
+
+- database_database_resource.go update handling
+
 ## 6.29.0 (March 06, 2025)
 
 ### Added

examples/database/exadata_cc/database_software_image.tf

@@ -0,0 +1,16 @@
+resource "oci_database_database_software_image" "test_database_software_image" {
+  compartment_id = var.compartment_ocid
+  database_version                        = "19.0.0.0"
+  display_name                            = "image1"
+  defined_tags = {
+    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedvalue"
+  }
+
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+
+  image_shape_family = "EXACC_SHAPE"
+  image_type         = "DATABASE_IMAGE"
+  patch_set = "19.26.0.0"
+}

examples/database/exadata_cc/exadata-infrastructure.tf

@@ -27,7 +27,7 @@ provider "oci" {
   user_ocid        = var.user_ocid
   fingerprint      = var.fingerprint
   private_key_path = var.private_key_path
-  region           = var.region
+  region           = var.region 
 }
 
 resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {

examples/database/exadata_cc/vm_cluster.tf

@@ -206,6 +206,7 @@ resource "oci_database_vm_cluster" "test_vm_cluster" {
   data_storage_size_in_tbs    = "84"
   db_node_storage_size_in_gbs = "120"
   memory_size_in_gbs          = "60"
+  vm_cluster_type             = "REGULAR"
   data_collection_options {
       #Optional
       is_diagnostics_events_enabled = "true"
@@ -350,3 +351,136 @@ resource "local_file" "test_vm_cluster_network_downloaded_config_file" {
   filename = "${path.module}/vm_cluster_config.txt"
 }
 
+
+resource "oci_database_exadata_infrastructure_configure_exascale_management" "test_exadata_infrastructure_configure_exascale_management" {
+  exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
+  total_storage_in_gbs            = var.exadata_infrastructure_configure_exascale_management_total_storage_in_gbs
+}
+
+resource "oci_database_exascale_db_storage_vault" "test_exascale_db_storage_exacc_vault" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  display_name        = "ExampleExascaleDbStorageVault"
+  high_capacity_database_storage {
+    total_size_in_gbs = 2048
+  }
+  exadata_infrastructure_id = oci_database_exadata_infrastructure_configure_exascale_management.test_exadata_infrastructure_configure_exascale_management.id
+}
+
+resource "oci_database_vm_cluster_network" "test_vm_cluster_network3" {
+  compartment_id = var.compartment_ocid
+  display_name   = "testVmClusterRecommendedNetwork3"
+  dns            = ["192.178.10.10"]
+  ntp            = ["192.178.10.20"]
+
+  exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
+
+  scans {
+    hostname = "myprefix3-nsubzabc-scan"
+
+    ips = [
+      "192.178.20.7",
+      "192.178.20.6",
+      "192.178.20.8",
+    ]
+
+    port = 1521
+    scan_listener_port_tcp = 1521
+    scan_listener_port_tcp_ssl = 2484
+  }
+
+  vm_networks {
+    domain_name  = "oracle.com"
+    gateway      = "192.179.21.1"
+    netmask      = "255.255.0.0"
+    network_type = "BACKUP"
+
+    nodes {
+      hostname = "myprefix8-cghdm1"
+      ip       = "192.179.20.18"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
+    }
+
+    nodes {
+      hostname = "myprefix8-cghdm2"
+      ip       = "192.179.20.20"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
+    }
+
+    vlan_id = "31"
+  }
+
+  vm_networks {
+    domain_name  = "oracle.com"
+    gateway      = "192.178.21.1"
+    netmask      = "255.255.0.0"
+    network_type = "CLIENT"
+
+    nodes {
+      hostname     = "myprefix9-r64zc1"
+      ip           = "192.178.21.10"
+      vip          = "192.178.21.11"
+      vip_hostname = "myprefix8-r64zc1-vip"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
+    }
+
+    nodes {
+      hostname     = "myprefix8-r64zc2"
+      ip           = "192.178.21.14"
+      vip          = "192.178.21.15"
+      vip_hostname = "myprefix8-r64zc2-vip"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
+    }
+
+    vlan_id = "45"
+  }
+
+  #Optional
+  defined_tags = {
+    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedvalue"
+  }
+
+  freeform_tags = {
+    "Department" = "Accounting"
+  }
+
+  validate_vm_cluster_network = true
+
+  action = "ADD_DBSERVER_NETWORK"
+
+  lifecycle {
+    ignore_changes = [
+      vm_networks,
+    ]
+  }
+}
+
+resource "oci_database_vm_cluster" "test_exascale_vm_cluster" {
+  #Required
+  compartment_id            = var.compartment_ocid
+  cpu_core_count            = "4"
+  display_name              = "testVmCluster2"
+  exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
+  gi_version                = "23.0.0.0.0"
+  ssh_public_keys           = [var.ssh_public_key]
+  vm_cluster_network_id     = oci_database_vm_cluster_network.test_vm_cluster_network3.id
+  db_servers                = [data.oci_database_db_servers.test_db_servers.db_servers.0.id, data.oci_database_db_servers.test_db_servers.db_servers.1.id]
+  exascale_db_storage_vault_id    = oci_database_exascale_db_storage_vault.test_exascale_db_storage_exacc_vault.id
+  #Optional
+  defined_tags = {
+    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedvalue"
+  }
+
+  #Optional
+  is_local_backup_enabled     = "false"
+  is_sparse_diskgroup_enabled = "false"
+  license_model               = "LICENSE_INCLUDED"
+  data_storage_size_in_tbs    = "26"
+  db_node_storage_size_in_gbs = "120"
+  memory_size_in_gbs          = "60"
+}
+
+variable "exadata_infrastructure_configure_exascale_management_total_storage_in_gbs" {
+  default = 4096
+}

examples/datasafe/discovery_job/discovery_job.tf

@@ -38,6 +38,10 @@ variable "discovery_job_is_include_all_sensitive_types" {
   default = true
 }
 
+variable "sensitive_data_model_sensitive_type_group_ids_for_discovery" {
+  default = []
+}
+
 variable "discovery_job_state" {
   default = "ACTIVE"
 }
@@ -70,6 +74,7 @@ resource "oci_data_safe_sensitive_data_model" "test_sensitive_data_model" {
   display_name                              = var.sensitive_data_model_display_name
   schemas_for_discovery                     = var.sensitive_data_model_schemas_for_discovery
   sensitive_type_ids_for_discovery          = var.sensitive_data_model_sensitive_type_ids_for_discovery
+  sensitive_type_group_ids_for_discovery    = var.sensitive_data_model_sensitive_type_group_ids_for_discovery
 }
 
 resource "oci_data_safe_discovery_job" "test_discovery_job" {
@@ -83,6 +88,7 @@ resource "oci_data_safe_discovery_job" "test_discovery_job" {
   is_app_defined_relation_discovery_enabled = var.discovery_job_is_app_defined_relation_discovery_enabled
   is_include_all_schemas                    = var.discovery_job_is_include_all_schemas
   is_include_all_sensitive_types            = var.discovery_job_is_include_all_sensitive_types
+  sensitive_type_group_ids_for_discovery    = var.sensitive_data_model_sensitive_type_group_ids_for_discovery
 }
 
 data "oci_data_safe_discovery_jobs" "test_discovery_jobs" {

examples/datasafe/grouped_sensitive_type/grouped_sensitive_type.tf

@@ -0,0 +1,76 @@
+// 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" {}
+
+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 "sensitive_type_group_display_name" {
+  default = "displayName"
+}
+
+variable "sensitive_type_group_description" {
+  default = "description"
+}
+
+variable "sensitive_type_entity_type" {
+  default = "SENSITIVE_TYPE"
+}
+
+variable "sensitive_type_display_name" {
+  default = "displayName"
+}
+
+resource "oci_data_safe_sensitive_type_group" "test_sensitive_type_group" {
+  #Required
+  compartment_id = var.compartment_ocid
+
+  #Optional
+  display_name = var.sensitive_type_group_display_name
+  description = var.sensitive_type_group_description
+}
+
+resource "oci_data_safe_sensitive_type" "test_sensitive_type" {
+  #Required
+  compartment_id = var.compartment_ocid
+  entity_type    = var.sensitive_type_entity_type
+
+  #Optional
+  display_name              = var.sensitive_type_display_name
+}
+
+resource "oci_data_safe_sensitive_type_group_grouped_sensitive_type" "test_sensitive_type_group_grouped_sensitive_type" {
+  #Required
+  sensitive_type_group_id = oci_data_safe_sensitive_type_group.test_sensitive_type_group.id
+
+  #Optional
+  patch_operations {
+    #Required
+    operation = "INSERT"
+    selection = "items"
+    value = {
+      sensitiveTypeId = oci_data_safe_sensitive_type.test_sensitive_type.id
+    }
+  }
+}
+
+data "oci_data_safe_sensitive_type_group_grouped_sensitive_types" "test_sensitive_type_group_grouped_sensitive_types" {
+  #Required
+  sensitive_type_group_id = oci_data_safe_sensitive_type_group.test_sensitive_type_group.id
+
+  #Optional
+  sensitive_type_id = oci_data_safe_sensitive_type.test_sensitive_type.id
+}
+

examples/datasafe/masking_report_masking_error/masking_report_masking_error.tf

@@ -0,0 +1,24 @@
+// 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_masking_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
+}
+
+data "oci_data_safe_masking_report_masking_errors" "test_masking_report_masking_errors" {
+  #Required
+  masking_report_id = var.data_safe_masking_report_id
+
+}

examples/datasafe/security_assessment_findings_scim_filter/security_assessment_findings_scim_filter.tf

@@ -0,0 +1,47 @@
+// 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 "security_assessment_ocid" {}
+variable "data_safe_target_ocid" {}
+
+variable "description" {
+  default = "description"
+}
+
+variable "display_name" {
+  default = "SA_1"
+}
+
+variable "scim_query" {
+  default = "severity eq \"HIGH \" "
+}
+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
+}
+
+resource "oci_data_safe_security_assessment" "oci_data_safe_security_assessment" {
+  #Required
+  compartment_id = var.compartment_ocid
+  target_id = var.data_safe_target_ocid
+
+  #Optional
+  description = var.description
+  display_name = var.display_name
+}
+
+data "oci_data_safe_security_assessment_findings" "test_security_assessment_findings" {
+  #Required
+  security_assessment_id = var.security_assessment_ocid
+  #Optional
+  scim_query                = var.scim_query
+}