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

Author: sagarp337

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 7.20.0 (September 23, 2025)
+
+### Added
+- Support for Java Management Service 10.0 - Standalone Plane Component (SDKs & TERSI ONLY)
+- Support for Java Management Service 10.0
+- Support for ExaDB-D Exascale Integration
+- Support for OCI Cache Discovery Endpoint for Sharded Clusters
+- Support for Marketplace Metadata for Attribution and Attestation
+- Support for Data Safe - Confidence Level support in Data Discovery
+
+
 ## 7.19.0 (September 17, 2025)
 
 ### Added

examples/database/db_systems/db_exacs/resources.tf

@@ -206,4 +206,43 @@ resource "oci_database_pluggable_database" "test_pluggable_database" {
         pdb_admin_password = "BEstrO0ng_#11"
         pdb_name = "SalesPdb"
         tde_wallet_password = "BEstrO0ng_#11"
-}
+}
+
+resource "oci_database_cloud_exadata_infrastructure_configure_exascale_management" "test_cloud_exadata_infrastructure_configure_exascale_management" {
+  cloud_exadata_infrastructure_id = oci_database_cloud_exadata_infrastructure.test_cloud_exadata_infrastructure.id
+  total_storage_in_gbs            = var.cloud_exadata_infrastructure_configure_exascale_management_total_storage_in_gbs
+}
+
+resource "oci_database_exascale_db_storage_vault" "test_exascale_db_storage_exacs_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_cloud_exadata_infrastructure_configure_exascale_management.test_cloud_exadata_infrastructure_configure_exascale_management.id
+}
+
+resource "oci_database_cloud_vm_cluster" "test_exascale_cloud_vm_cluster" {
+  #Required
+  backup_subnet_id                = oci_core_subnet.subnet_backup.id
+  cloud_exadata_infrastructure_id = oci_database_cloud_exadata_infrastructure.test_cloud_exadata_infrastructure.id
+  compartment_id                  = var.compartment_ocid
+  cpu_core_count                  = var.cloud_vm_cluster_cpu_core_count
+  display_name                    = "MyTFExascaleVmClusterExaCs"
+  gi_version                      = var.cloud_vm_cluster_gi_version
+  hostname                        = var.cloud_vm_cluster_hostname
+  ssh_public_keys                 = [var.ssh_public_key]
+  subnet_id                       = oci_core_subnet.subnet.id
+
+  #Optional
+  exascale_db_storage_vault_id    = oci_database_exascale_db_storage_vault.test_exascale_db_storage_exacs_vault.id
+  db_node_storage_size_in_gbs     = var.cloud_vm_cluster_db_node_storage_size_in_gbs
+  db_servers                      = [data.oci_database_db_servers.test_cloud_db_servers.db_servers.0.id, data.oci_database_db_servers.test_cloud_db_servers.db_servers.1.id]
+  memory_size_in_gbs              = var.cloud_vm_cluster_memory_size_in_gbs
+  ocpu_count                      = var.cloud_vm_cluster_ocpu_count
+  scan_listener_port_tcp          = var.cloud_vm_cluster_scan_listener_port_tcp
+  scan_listener_port_tcp_ssl      = var.cloud_vm_cluster_scan_listener_port_tcp_ssl
+  subscription_id                 = var.tenant_subscription_id
+}

examples/database/db_systems/db_exacs/variables.tf

@@ -157,4 +157,8 @@ variable "cloud_vm_cluster_db_node_storage_size_in_gbs" {
 
 variable "cloud_vm_cluster_db_servers" {
   default = []
-}
+}
+
+variable "cloud_exadata_infrastructure_configure_exascale_management_total_storage_in_gbs" {
+  default = 4096
+}

examples/datasafe/discovery_job_result/discovery_job_result.tf

@@ -27,6 +27,10 @@ variable "discovery_jobs_result_planned_action" {
   default = "NONE"
 }
 
+variable "discovery_jobs_result_confidence_level" {
+  default = ["HIGH"]
+}
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -42,5 +46,6 @@ data "oci_data_safe_discovery_jobs_results" "test_discovery_jobs_results" {
   #Optional
   discovery_type    = var.discovery_jobs_result_discovery_type
   is_result_applied = var.discovery_jobs_result_is_result_applied
+  confidence_level  = var.discovery_jobs_result_confidence_level
 }
 

examples/datasafe/security_assessment_findings/security_assessment_findings.tf

@@ -44,5 +44,5 @@ resource "oci_data_safe_security_assessment" "oci_data_safe_security_assessment"
 
 data "oci_data_safe_security_assessment_findings" "test_security_assessment_findings" {
   #Required
-  security_assessment_id = var.security_assessment_ocid
-}
+  security_assessment_id = oci_data_safe_security_assessment.oci_data_safe_security_assessment.id
+}

examples/datasafe/sensitive_column/sensitive_column.tf

@@ -49,6 +49,10 @@ variable "sensitive_data_models_sensitive_column_status" {
   default = "VALID"
 }
 
+variable "sensitive_data_models_sensitive_column_confidence_level" {
+  default = ["NONE"]
+}
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -100,5 +104,6 @@ data "oci_data_safe_sensitive_data_models_sensitive_columns" "test_sensitive_dat
   column_name                           = var.sensitive_data_models_sensitive_column_column_name_list
   object                                = var.sensitive_data_models_sensitive_column_object_list
   schema_name                           = var.sensitive_data_models_sensitive_column_schema_name_list
+  confidence_level                      = var.sensitive_data_models_sensitive_column_confidence_level
 }
 

examples/jms/fleet_container.tf

@@ -0,0 +1,36 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "fleet_container_display_name" {
+  default = "displayName"
+}
+
+variable "fleet_container_jre_security_status" {
+  default = "EARLY_ACCESS"
+}
+
+variable "fleet_container_jre_version" {
+  default = "jreVersion"
+}
+
+variable "fleet_container_time_started_greater_than_or_equal_to" {
+  default = "timeStartedGreaterThanOrEqualTo"
+}
+
+variable "fleet_container_time_started_less_than_or_equal_to" {
+  default = "timeStartedLessThanOrEqualTo"
+}
+
+data "oci_jms_fleet_containers" "test_fleet_containers" {
+  #Required
+  fleet_id = var.fleet_ocid
+
+  #Optional
+  application_name                      = var.application_name
+  display_name                          = var.fleet_container_display_name
+  jre_security_status                   = var.fleet_container_jre_security_status
+  jre_version                           = var.fleet_container_jre_version
+  managed_instance_id                   = var.managed_instance_ocid
+  time_started_greater_than_or_equal_to = var.time_end
+  time_started_less_than_or_equal_to    = var.time_start
+}

examples/jms/fleet_error.tf

@@ -17,7 +17,7 @@ variable "fleet_error_time_last_seen_less_than_or_equal_to" {}
 data "oci_jms_fleet_errors" "test_fleet_errors" {
 
 	#Optional
-	compartment_id = var.compartment_id
+	compartment_id = var.compartment_ocid
 	compartment_id_in_subtree = var.fleet_error_compartment_id_in_subtree
 	fleet_id = var.fleet_ocid
 	time_first_seen_greater_than_or_equal_to = var.fleet_error_time_first_seen_greater_than_or_equal_to

examples/jms/fleet_error_analytic.tf

@@ -8,6 +8,6 @@ variable "fleet_error_analytic_compartment_id_in_subtree" {
 data "oci_jms_fleet_error_analytics" "test_fleet_error_analytics" {
 
 	#Optional
-	compartment_id = var.compartment_id
+	compartment_id = var.compartment_ocid
 	compartment_id_in_subtree = var.fleet_error_analytic_compartment_id_in_subtree
 }

examples/jms/fleet_library_application.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 "fleet_library_application_application_name_contains" {
+  default = "applicationNameContains"
+}
+
+variable "fleet_library_application_library_key" {
+  default = "libraryKey"
+}
+
+data "oci_jms_fleet_library_applications" "test_fleet_library_applications" {
+  #Required
+  fleet_id    = var.fleet_ocid
+  library_key = var.fleet_library_application_library_key
+
+  #Optional
+  application_id            = var.application_id
+  application_name          = var.application_name
+  application_name_contains = var.fleet_library_application_application_name_contains
+  managed_instance_id       = var.managed_instance_ocid
+  time_end                  = var.time_end
+  time_start                = var.time_start
+}