Added - Support for ExaCS Private DNS Integration

Author: Terraform Team Automation

examples/database/db_systems/db_exacs/datasources.tf

@@ -20,6 +20,10 @@ data "oci_database_cloud_vm_cluster_iorm_config" "test_cloud_vm_cluster_iorm_con
   cloud_vm_cluster_id = oci_database_cloud_vm_cluster_iorm_config.test_cloud_vm_cluster_iorm_config.cloud_vm_cluster_id
 }
 
+data "oci_identity_tenancy" "tenancy" {
+  tenancy_id = var.tenancy_ocid
+}
+
 data "oci_database_db_servers" "test_cloud_db_servers" {
   #Required
   compartment_id            = var.compartment_ocid

examples/database/db_systems/db_exacs/network.tf

@@ -114,3 +114,29 @@ resource "oci_core_network_security_group" "test_network_security_group_backup"
   vcn_id         = oci_core_vcn.vcn.id
   display_name   = "displayName"
 }
+
+resource "oci_dns_zone" "test_zone" {
+  compartment_id = var.compartment_ocid
+  name           = "sicdbaas.exacs.zonetest"
+  zone_type      = "PRIMARY"
+  scope          = "PRIVATE"
+  view_id        = oci_dns_view.test_view.id
+}
+
+resource "oci_dns_view" "test_view" {
+  compartment_id = var.compartment_ocid
+  scope          = "PRIVATE"
+}
+
+resource "oci_dns_resolver" "test_resolver" {
+  attached_views {
+    view_id = oci_dns_view.test_view.id
+  }
+  display_name = "test_resolver"
+  resolver_id = data.oci_core_vcn_dns_resolver_association.test_vcn_dns_resolver_association.dns_resolver_id
+  scope = "PRIVATE"
+}
+
+data "oci_core_vcn_dns_resolver_association" "test_vcn_dns_resolver_association" {
+  vcn_id = "${oci_core_vcn.vcn.id}"
+}

examples/database/db_systems/db_exacs/resources.tf

@@ -19,7 +19,7 @@ resource "oci_database_cloud_vm_cluster" "test_cloud_vm_cluster" {
   compartment_id                  = var.compartment_ocid
   cpu_core_count                  = var.cloud_vm_cluster_cpu_core_count
   display_name                    = "MyTFVmClusterExaCs"
-  domain                          = oci_core_subnet.subnet.subnet_domain_name
+  domain                          = oci_dns_zone.test_zone.name
   gi_version                      = var.cloud_vm_cluster_gi_version
   hostname                        = var.cloud_vm_cluster_hostname
   ssh_public_keys                 = [var.ssh_public_key]
@@ -33,6 +33,7 @@ resource "oci_database_cloud_vm_cluster" "test_cloud_vm_cluster" {
   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
+  private_zone_id                 = oci_dns_zone.test_zone.id
 
   data_collection_options {
     #Optional

internal/integrationtest/database_cloud_vm_cluster_iorm_config_test.go

@@ -31,7 +31,12 @@ var (
 		"db_plans":            acctest.RepresentationGroup{RepType: acctest.Required, Group: dbPlanRepresentation},
 	}
 
-	DatabaseCloudVmClusterIormConfigResourceDependencies = AvailabilityDomainConfig + DatabaseCloudVmClusterRequiredOnlyResource
+	DatabaseCloudVmClusterIormResourceDependencies = ad_subnet_security + acctest.GenerateResourceFromRepresentationMap("oci_database_cloud_exadata_infrastructure", "test_cloud_exadata_infrastructure", acctest.Required, acctest.Create,
+		acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(DatabaseCloudExadataInfrastructureRepresentation, []string{"compute_count"}), map[string]interface{}{
+			"compute_count": acctest.Representation{RepType: acctest.Required, Create: `2`, Update: `3`},
+		})) + acctest.GenerateResourceFromRepresentationMap("oci_database_cloud_vm_cluster", "test_cloud_vm_cluster", acctest.Required, acctest.Create, DatabaseCloudVmClusterRepresentation)
+
+	DatabaseCloudVmClusterIormConfigResourceDependencies = AvailabilityDomainConfig + DatabaseCloudVmClusterIormResourceDependencies
 )
 
 // issue-routing-tag: database/ExaCS

internal/integrationtest/database_cloud_vm_cluster_test.go

@@ -214,6 +214,12 @@ func DatabaseCloudVmClusterResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"private_zone_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
 			"scan_listener_port_tcp": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -605,6 +611,11 @@ func (s *DatabaseCloudVmClusterResourceCrud) Create() error {
 		}
 	}
 
+	if privateZoneId, ok := s.D.GetOkExists("private_zone_id"); ok {
+		tmp := privateZoneId.(string)
+		request.PrivateZoneId = &tmp
+	}
+
 	if scanListenerPortTcp, ok := s.D.GetOkExists("scan_listener_port_tcp"); ok {
 		tmp := scanListenerPortTcp.(int)
 		request.ScanListenerPortTcp = &tmp

internal/service/database/database_cloud_vm_cluster_resource.go

@@ -50,7 +50,7 @@ The following attributes are exported:
 * `freeform_tags` - Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
 * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Autonomous VM cluster.
 * `is_local_backup_enabled` - If true, database backup on local Exadata storage is configured for the Autonomous VM cluster. If false, database backup on local Exadata storage is not available in the Autonomous VM cluster. 
-* `is_mtls_enabled` - Enable mutual TLS(mTLS) authentication for database at time of provisioning a VMCluster. Default is TLS.
+* `is_mtls_enabled` - Enable mutual TLS(mTLS) authentication for database while provisioning a VMCluster. Default is TLS.
 * `last_maintenance_run_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the last maintenance run.
 * `license_model` - The Oracle license model that applies to the Autonomous VM cluster. The default is LICENSE_INCLUDED. 
 * `lifecycle_details` - Additional information about the current lifecycle state.

website/docs/d/database_autonomous_vm_cluster.html.markdown

@@ -64,7 +64,7 @@ The following attributes are exported:
 * `freeform_tags` - Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
 * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Autonomous VM cluster.
 * `is_local_backup_enabled` - If true, database backup on local Exadata storage is configured for the Autonomous VM cluster. If false, database backup on local Exadata storage is not available in the Autonomous VM cluster. 
-* `is_mtls_enabled` - Enable mutual TLS(mTLS) authentication for database at time of provisioning a VMCluster. Default is TLS.
+* `is_mtls_enabled` - Enable mutual TLS(mTLS) authentication for database while provisioning a VMCluster. Default is TLS.
 * `last_maintenance_run_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the last maintenance run.
 * `license_model` - The Oracle license model that applies to the Autonomous VM cluster. The default is LICENSE_INCLUDED. 
 * `lifecycle_details` - Additional information about the current lifecycle state.

website/docs/d/database_autonomous_vm_clusters.html.markdown

@@ -10,7 +10,7 @@ description: |-
 # Data Source: oci_database_cloud_exadata_infrastructure_un_allocated_resource
 This data source provides details about a specific Cloud Exadata Infrastructure Un Allocated Resource resource in Oracle Cloud Infrastructure Database service.
 
-Gets un allocated resources information for the specified Cloud Exadata infrastructure.
+Gets unallocated resources information for the specified Cloud Exadata infrastructure.
 
 
 ## Example Usage
@@ -33,13 +33,13 @@ The following arguments are supported:
 
 The following attributes are exported:
 
-* `cloud_autonomous_vm_clusters` - The list of Cloud Autonomous VM Clusters on the Infra and their associated unallocated resources details
+* `cloud_autonomous_vm_clusters` - The list of Cloud Autonomous VM Clusters on the Infrastructure and their associated unallocated resources details.
 	* `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Cloud Exadata infrastructure.
-	* `un_allocated_adb_storage_in_tbs` - Total unallocated autonomous data storage in the CAVM in TBs.
+	* `un_allocated_adb_storage_in_tbs` - Total unallocated autonomous data storage in the Cloud Autonomous VM Cluster in TBs.
 * `cloud_exadata_infrastructure_display_name` - The user-friendly name for the Cloud Exadata infrastructure. The name does not need to be unique.
 * `cloud_exadata_infrastructure_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Cloud Exadata infrastructure.
 * `exadata_storage_in_tbs` - Total unallocated exadata storage in the infrastructure in TBs.
-* `local_storage_in_gbs` - The minimum amount of un allocated storage that is available across all nodes in the infrastructure.
-* `memory_in_gbs` - The minimum amount of un allocated memory that is available across all nodes in the infrastructure.
-* `ocpus` - The minimum amount of un allocated ocpus that is available across all nodes in the infrastructure.
+* `local_storage_in_gbs` - The minimum amount of unallocated storage available across all nodes in the infrastructure.
+* `memory_in_gbs` - The minimum amount of unallocated memory available across all nodes in the infrastructure.
+* `ocpus` - The minimum amount of unallocated ocpus available across all nodes in the infrastructure.
 

website/docs/d/database_cloud_exadata_infrastructure_un_allocated_resource.html.markdown

@@ -49,7 +49,7 @@ The following attributes are exported:
 * `data_storage_percentage` - The percentage assigned to DATA storage (user data and database files). The remaining percentage is assigned to RECO storage (database redo logs, archive logs, and recovery manager backups). Accepted values are 35, 40, 60 and 80. The default is 80 percent assigned to DATA storage. See [Storage Configuration](https://docs.cloud.oracle.com/iaas/Content/Database/Concepts/exaoverview.htm#Exadata) in the Exadata documentation for details on the impact of the configuration settings on storage. 
 * `data_storage_size_in_tbs` - The data disk group size to be allocated in TBs.
 * `db_node_storage_size_in_gbs` - The local node storage to be allocated in GBs.
-* `db_servers` - The list of Db servers.
+* `db_servers` - The list of DB servers.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). 
 * `disk_redundancy` - The type of redundancy configured for the cloud Vm cluster. NORMAL is 2-way redundancy. HIGH is 3-way redundancy. 
 * `display_name` - The user-friendly name for the cloud VM cluster. The name does not need to be unique.