Support for oci_database_database resource for exadata infrastructure

Author: afedorch

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Added
 - Support for `description` field in networking routing rules in `oci_core_route_table` and `oci_core_security_list`
 - Support for Stop/Start Digital Assistant Instance
+- Support for `oci_database_database` resource for exadata infrastructure
 
 ## 3.57.0 (January 09, 2020)
 

examples/database/db_systems/db_exadata/resources.tf

@@ -59,3 +59,21 @@ resource "oci_database_exadata_iorm_config" "test_exadata_iorm_config" {
     share   = 1
   }
 }
+
+resource "oci_database_database" "test_database" {
+  #Required
+  database {
+    admin_password = "${var.db_admin_password}"
+    db_name        = "${var.second_db_name}"
+    character_set  = "${var.character_set}"
+    ncharacter_set = "${var.n_character_set}"
+    db_workload    = "${var.db_workload}"
+
+    db_backup_config {
+      auto_backup_enabled = false
+    }
+  }
+
+  db_home_id = "${data.oci_database_db_homes.db_homes.db_homes.0.db_home_id}"
+  source     = "NONE"
+}

examples/database/db_systems/db_exadata/variables.tf

@@ -31,6 +31,10 @@ variable "db_name" {
   default = "aTFdb"
 }
 
+variable "second_db_name" {
+  default = "aTFdb2"
+}
+
 variable "db_version" {
   default = "12.1.0.2"
 }

oci/database_database_data_source.go

@@ -10,144 +10,12 @@ import (
 )
 
 func DatabaseDatabaseDataSource() *schema.Resource {
-	return &schema.Resource{
-		Read: readSingularDatabaseDatabase,
-		Schema: map[string]*schema.Schema{
-			"database_id": {
-				Type:     schema.TypeString,
-				Required: true,
-			},
-			// Computed
-			"character_set": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"compartment_id": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"connection_strings": {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						// Required
-
-						// Optional
-
-						// Computed
-						"all_connection_strings": {
-							Type:     schema.TypeMap,
-							Computed: true,
-							Elem:     schema.TypeString,
-						},
-						"cdb_default": {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						"cdb_ip_default": {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-					},
-				},
-			},
-			"db_backup_config": {
-				Type:     schema.TypeList,
-				Computed: true,
-				MaxItems: 1,
-				MinItems: 1,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						// Required
-
-						// Optional
-
-						// Computed
-						"auto_backup_enabled": {
-							Type:     schema.TypeBool,
-							Computed: true,
-						},
-						"auto_backup_window": {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						"backup_destination_details": {
-							Type:     schema.TypeList,
-							Computed: true,
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									// Required
-
-									// Optional
-
-									// Computed
-									"id": {
-										Type:     schema.TypeString,
-										Computed: true,
-									},
-									"type": {
-										Type:     schema.TypeString,
-										Computed: true,
-									},
-								},
-							},
-						},
-						"recovery_window_in_days": {
-							Type:     schema.TypeInt,
-							Computed: true,
-						},
-					},
-				},
-			},
-			"db_home_id": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"db_name": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"db_unique_name": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"db_workload": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"defined_tags": {
-				Type:     schema.TypeMap,
-				Computed: true,
-				Elem:     schema.TypeString,
-			},
-			"freeform_tags": {
-				Type:     schema.TypeMap,
-				Computed: true,
-				Elem:     schema.TypeString,
-			},
-			"lifecycle_details": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"ncharacter_set": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"pdb_name": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"state": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"time_created": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-		},
+	fieldMap := make(map[string]*schema.Schema)
+	fieldMap["database_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
 	}
+	return GetSingularDataSourceItemSchema(DatabaseDatabaseResource(), fieldMap, readSingularDatabaseDatabase)
 }
 
 func readSingularDatabaseDatabase(d *schema.ResourceData, m interface{}) error {
@@ -222,6 +90,10 @@ func (s *DatabaseDatabaseDataSourceCrud) SetData() error {
 		s.D.Set("db_name", *s.Res.DbName)
 	}
 
+	if s.Res.DbSystemId != nil {
+		s.D.Set("db_system_id", *s.Res.DbSystemId)
+	}
+
 	if s.Res.DbUniqueName != nil {
 		s.D.Set("db_unique_name", *s.Res.DbUniqueName)
 	}
@@ -254,35 +126,9 @@ func (s *DatabaseDatabaseDataSourceCrud) SetData() error {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}
 
-	return nil
-}
-
-func BackupDestinationDetailsToMap(obj oci_database.BackupDestinationDetails) map[string]interface{} {
-	result := map[string]interface{}{}
-
-	if obj.Id != nil {
-		result["id"] = string(*obj.Id)
+	if s.Res.VmClusterId != nil {
+		s.D.Set("vm_cluster_id", *s.Res.VmClusterId)
 	}
 
-	result["type"] = string(obj.Type)
-
-	return result
-}
-
-func DatabaseConnectionStringsToMap(obj *oci_database.DatabaseConnectionStrings) map[string]interface{} {
-	result := map[string]interface{}{}
-
-	result["all_connection_strings"] = obj.AllConnectionStrings
-
-	if obj.CdbDefault != nil {
-		result["cdb_default"] = string(*obj.CdbDefault)
-	}
-
-	if obj.CdbIpDefault != nil {
-		result["cdb_ip_default"] = string(*obj.CdbIpDefault)
-	}
-
-	return result
+	return nil
 }
-
-// @CODEGEN 08/2018: Method DbBackupConfigToMap is available in database_db_system_resource.go