Added - Support for Node Subsetting | ADB-D

Author: Terraform Team Automation

examples/database/atp-d/main.tf

@@ -59,6 +59,10 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
   db_version          = "19.18.0.1.0"
 }
 
+variable "cloud_exadata_infrastructure_un_allocated_resource_db_servers" {
+  default = []
+}
+
 resource "random_string" "autonomous_database_admin_password" {
   length      = 16
   min_numeric = 1
@@ -146,4 +150,7 @@ output "autonomous_container_databases" {
 data "oci_database_cloud_exadata_infrastructure_un_allocated_resource" "test_cloud_exadata_infrastructure_un_allocated_resources" {
   #Required
   cloud_exadata_infrastructure_id = oci_database_cloud_exadata_infrastructure.test_cloud_exadata_infrastructure.id
+
+  #Optional
+  db_servers = var.cloud_exadata_infrastructure_un_allocated_resource_db_servers
 }

internal/integrationtest/database_cloud_exadata_infrastructure_un_allocated_resource_test.go

@@ -18,6 +18,7 @@ import (
 var (
 	DatabaseCloudExadataInfrastructureUnAllocatedResourceSingularDataSourceRepresentation = map[string]interface{}{
 		"cloud_exadata_infrastructure_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_cloud_exadata_infrastructure.test_cloud_exadata_infrastructure.id}`},
+		"db_servers":                      acctest.Representation{RepType: acctest.Optional, Create: []string{`dbServers`}},
 	}
 
 	DatabaseCloudExadataInfrastructureUnAllocatedResourceResourceConfig = acctest.GenerateResourceFromRepresentationMap("oci_database_cloud_exadata_infrastructure", "test_cloud_exadata_infrastructure", acctest.Required, acctest.Create, DatabaseCloudExadataInfrastructureRepresentation) +
@@ -46,7 +47,6 @@ func TestDatabaseCloudExadataInfrastructureUnAllocatedResourceResource_basic(t *
 				compartmentIdVariableStr + DatabaseCloudExadataInfrastructureUnAllocatedResourceResourceConfig,
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "cloud_exadata_infrastructure_id"),
-
 				resource.TestCheckResourceAttr(singularDatasourceName, "cloud_autonomous_vm_clusters.#", "0"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "cloud_exadata_infrastructure_display_name"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "exadata_storage_in_tbs"),

internal/integrationtest/database_exadata_infrastructure_un_allocated_resource_test.go

@@ -0,0 +1,60 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package integrationtest
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
+	"github.com/oracle/terraform-provider-oci/httpreplay"
+	"github.com/oracle/terraform-provider-oci/internal/acctest"
+
+	"github.com/oracle/terraform-provider-oci/internal/utils"
+)
+
+var (
+	DatabaseDatabaseExadataInfrastructureUnAllocatedResourceSingularDataSourceRepresentation = map[string]interface{}{
+		"exadata_infrastructure_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_exadata_infrastructure.test_exadata_infrastructure.id}`},
+		"db_servers":                acctest.Representation{RepType: acctest.Optional, Create: []string{`dbServers`}},
+	}
+
+	DatabaseExadataInfrastructureUnAllocatedResourceResourceConfig = acctest.GenerateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", acctest.Required, acctest.Create, DatabaseExadataInfrastructureRepresentation)
+)
+
+// issue-routing-tag: database/ExaCC
+func TestDatabaseExadataInfrastructureUnAllocatedResourceResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestDatabaseExadataInfrastructureUnAllocatedResourceResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := acctest.ProviderTestConfig()
+
+	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	singularDatasourceName := "data.oci_database_exadata_infrastructure_un_allocated_resource.test_exadata_infrastructure_un_allocated_resource"
+
+	acctest.SaveConfigContent("", "", "", t)
+
+	acctest.ResourceTest(t, nil, []resource.TestStep{
+		// verify singular datasource
+		{
+			Config: config +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_database_exadata_infrastructure_un_allocated_resource", "test_exadata_infrastructure_un_allocated_resource", acctest.Required, acctest.Create, DatabaseDatabaseExadataInfrastructureUnAllocatedResourceSingularDataSourceRepresentation) +
+				compartmentIdVariableStr + DatabaseExadataInfrastructureUnAllocatedResourceResourceConfig,
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "exadata_infrastructure_id"),
+
+				resource.TestCheckResourceAttr(singularDatasourceName, "autonomous_vm_clusters.#", "0"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "display_name"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "exadata_storage_in_tbs"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "local_storage_in_gbs"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "memory_in_gbs"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "ocpus"),
+			),
+		},
+	})
+}

internal/service/database/database_cloud_autonomous_vm_cluster_data_source.go

@@ -120,6 +120,8 @@ func (s *DatabaseCloudAutonomousVmClusterDataSourceCrud) SetData() error {
 		s.D.Set("db_node_storage_size_in_gbs", *s.Res.DbNodeStorageSizeInGBs)
 	}
 
+	s.D.Set("db_servers", s.Res.DbServers)
+
 	if s.Res.DefinedTags != nil {
 		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
 	}

internal/service/database/database_cloud_autonomous_vm_cluster_resource.go

@@ -874,6 +874,8 @@ func (s *DatabaseCloudAutonomousVmClusterResourceCrud) SetData() error {
 		s.D.Set("db_node_storage_size_in_gbs", *s.Res.DbNodeStorageSizeInGBs)
 	}
 
+	s.D.Set("db_servers", s.Res.DbServers)
+
 	if s.Res.DefinedTags != nil {
 		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
 	}

internal/service/database/database_cloud_autonomous_vm_clusters_data_source.go

@@ -178,6 +178,8 @@ func (s *DatabaseCloudAutonomousVmClustersDataSourceCrud) SetData() error {
 			cloudAutonomousVmCluster["db_node_storage_size_in_gbs"] = *r.DbNodeStorageSizeInGBs
 		}
 
+		cloudAutonomousVmCluster["db_servers"] = r.DbServers
+
 		if r.DefinedTags != nil {
 			cloudAutonomousVmCluster["defined_tags"] = tfresource.DefinedTagsToMap(r.DefinedTags)
 		}

internal/service/database/database_cloud_exadata_infrastructure_un_allocated_resource_data_source.go

@@ -20,6 +20,13 @@ func DatabaseCloudExadataInfrastructureUnAllocatedResourceDataSource() *schema.R
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"db_servers": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			// Computed
 			"cloud_autonomous_vm_clusters": {
 				Type:     schema.TypeList,
@@ -92,6 +99,19 @@ func (s *DatabaseCloudExadataInfrastructureUnAllocatedResourceDataSourceCrud) Ge
 		request.CloudExadataInfrastructureId = &tmp
 	}
 
+	if dbServers, ok := s.D.GetOkExists("db_servers"); ok {
+		interfaces := dbServers.([]interface{})
+		tmp := make([]string, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = interfaces[i].(string)
+			}
+		}
+		if len(tmp) != 0 || s.D.HasChange("db_servers") {
+			request.DbServers = tmp
+		}
+	}
+
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "database")
 
 	response, err := s.Client.GetCloudExadataInfrastructureUnallocatedResources(context.Background(), request)

internal/service/database/database_exadata_infrastructure_un_allocated_resource_data_source.go

@@ -0,0 +1,175 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package database
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	oci_database "github.com/oracle/oci-go-sdk/v65/database"
+
+	"github.com/oracle/terraform-provider-oci/internal/client"
+	"github.com/oracle/terraform-provider-oci/internal/tfresource"
+)
+
+func DatabaseExadataInfrastructureUnAllocatedResourceDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readSingularDatabaseExadataInfrastructureUnAllocatedResource,
+		Schema: map[string]*schema.Schema{
+			"db_servers": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"exadata_infrastructure_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			// Computed
+			"autonomous_vm_clusters": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"un_allocated_adb_storage_in_tbs": {
+							Type:     schema.TypeFloat,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"display_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"exadata_storage_in_tbs": {
+				Type:     schema.TypeFloat,
+				Computed: true,
+			},
+			"local_storage_in_gbs": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"memory_in_gbs": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"ocpus": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func readSingularDatabaseExadataInfrastructureUnAllocatedResource(d *schema.ResourceData, m interface{}) error {
+	sync := &DatabaseExadataInfrastructureUnAllocatedResourceDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*client.OracleClients).DatabaseClient()
+
+	return tfresource.ReadResource(sync)
+}
+
+type DatabaseExadataInfrastructureUnAllocatedResourceDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_database.DatabaseClient
+	Res    *oci_database.GetExadataInfrastructureUnAllocatedResourcesResponse
+}
+
+func (s *DatabaseExadataInfrastructureUnAllocatedResourceDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *DatabaseExadataInfrastructureUnAllocatedResourceDataSourceCrud) Get() error {
+	request := oci_database.GetExadataInfrastructureUnAllocatedResourcesRequest{}
+
+	if dbServers, ok := s.D.GetOkExists("db_servers"); ok {
+		interfaces := dbServers.([]interface{})
+		tmp := make([]string, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = interfaces[i].(string)
+			}
+		}
+		if len(tmp) != 0 || s.D.HasChange("db_servers") {
+			request.DbServers = tmp
+		}
+	}
+
+	if exadataInfrastructureId, ok := s.D.GetOkExists("exadata_infrastructure_id"); ok {
+		tmp := exadataInfrastructureId.(string)
+		request.ExadataInfrastructureId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "database")
+
+	response, err := s.Client.GetExadataInfrastructureUnAllocatedResources(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *DatabaseExadataInfrastructureUnAllocatedResourceDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(*s.Res.Id)
+
+	autonomousVmClusters := []interface{}{}
+	for _, item := range s.Res.AutonomousVmClusters {
+		autonomousVmClusters = append(autonomousVmClusters, AutonomousVmClusterResourceDetailsToMap(item))
+	}
+	s.D.Set("autonomous_vm_clusters", autonomousVmClusters)
+
+	if s.Res.DisplayName != nil {
+		s.D.Set("display_name", *s.Res.DisplayName)
+	}
+
+	if s.Res.ExadataStorageInTBs != nil {
+		s.D.Set("exadata_storage_in_tbs", *s.Res.ExadataStorageInTBs)
+	}
+
+	if s.Res.LocalStorageInGbs != nil {
+		s.D.Set("local_storage_in_gbs", *s.Res.LocalStorageInGbs)
+	}
+
+	if s.Res.MemoryInGBs != nil {
+		s.D.Set("memory_in_gbs", *s.Res.MemoryInGBs)
+	}
+
+	if s.Res.Ocpus != nil {
+		s.D.Set("ocpus", *s.Res.Ocpus)
+	}
+
+	return nil
+}
+
+func AutonomousVmClusterResourceDetailsToMap(obj oci_database.AutonomousVmClusterResourceDetails) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.Id != nil {
+		result["id"] = string(*obj.Id)
+	}
+
+	if obj.UnAllocatedAdbStorageInTBs != nil {
+		result["un_allocated_adb_storage_in_tbs"] = float64(*obj.UnAllocatedAdbStorageInTBs)
+	}
+
+	return result
+}

internal/service/database/register_datasource.go

@@ -76,6 +76,7 @@ func RegisterDatasource() {
 	tfresource.RegisterDatasource("oci_database_db_versions", DatabaseDbVersionsDataSource())
 	tfresource.RegisterDatasource("oci_database_exadata_infrastructure", DatabaseExadataInfrastructureDataSource())
 	tfresource.RegisterDatasource("oci_database_exadata_infrastructure_download_config_file", DatabaseExadataInfrastructureDownloadConfigFileDataSource())
+	tfresource.RegisterDatasource("oci_database_exadata_infrastructure_un_allocated_resource", DatabaseExadataInfrastructureUnAllocatedResourceDataSource())
 	tfresource.RegisterDatasource("oci_database_exadata_infrastructures", DatabaseExadataInfrastructuresDataSource())
 	tfresource.RegisterDatasource("oci_database_exadata_iorm_config", DatabaseExadataIormConfigDataSource())
 	tfresource.RegisterDatasource("oci_database_external_container_database", DatabaseExternalContainerDatabaseDataSource())

website/docs/d/database_autonomous_container_database.html.markdown

@@ -48,7 +48,7 @@ The following attributes are exported:
 * `cloud_autonomous_vm_cluster_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the cloud Autonomous Exadata VM Cluster.
 * `compartment_id` - The OCID of the compartment.
 * `compute_model` - The compute model of the Autonomous VM Cluster. See [Compute Models in Autonomous Database on Dedicated Exadata Infrastructure](https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak) for more details. 
-* `db_name` - The database name for the Autonomous Container Database. The name must be unique within the Cloud Autonomous VM Cluster, must start with an alphabetic character and followed by 1 to 7 alphanumeric characters.
+* `db_name` - The Database name for the Autonomous Container Database. The name must be unique within the Cloud Autonomous VM Cluster, starting with an alphabetic character, followed by 1 to 7 alphanumeric characters.
 * `db_unique_name` - **Deprecated.** The `DB_UNIQUE_NAME` value is set by Oracle Cloud Infrastructure.  Do not specify a value for this parameter. Specifying a value for this field will cause Terraform operations to fail. 
 * `db_version` - Oracle Database version of the Autonomous Container Database.
 * `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).