Added - Support for Datbase External TCPS

KavyaKS94 · sagarp337 · commit 218b1ec0b9b9 · 2022-04-22T17:46:05.000-05:00
diff --git a/examples/database/external_databases/variables.tf b/examples/database/external_databases/variables.tf
@@ -73,7 +73,7 @@ variable "service" {
 }
 
 variable "connector_agent_id" {
-    default = "ocid1.managementagent.oc1.phx.amaaaaaajobtc3iaes4ijczgekzqigoji25xocsny7yundummydummydummy"
+
 }
 
 variable "external_database_connector_display_name" {
diff --git a/internal/integrationtest/database_external_database_connector_tcps_test.go b/internal/integrationtest/database_external_database_connector_tcps_test.go
diff --git a/internal/integrationtest/database_external_database_connector_test.go b/internal/integrationtest/database_external_database_connector_test.go
@@ -256,6 +256,12 @@ func TestDatabaseExternalDatabaseConnectorResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
 			),
 		},
+
+		// remove singular datasource from previous step so that it doesn't conflict with import tests
+		{
+			Config: config + compartmentIdVariableStr + agentIdVariableStr + ExternalDatabaseConnectorResourceConfig,
+		},
+
 		// verify resource import
 		{
 			Config:            config + ExternalDatabaseConnectorRequiredOnlyResource,
diff --git a/internal/service/database/database_external_database_connector_data_source.go b/internal/service/database/database_external_database_connector_data_source.go
@@ -158,6 +158,26 @@ func (s *DatabaseExternalDatabaseConnectorDataSourceCrud) DatabaseConnectionCred
 		if v.CredentialName != nil {
 			result["credential_name"] = string(*v.CredentialName)
 		}
+	case oci_database.DatabaseSslConnectionCredentials:
+		result["credential_type"] = "SSL_DETAILS"
+
+		if v.CredentialName != nil {
+			result["credential_name"] = string(*v.CredentialName)
+		}
+
+		if password, ok := s.D.GetOkExists("connection_credentials.0.password"); ok && password != nil {
+			result["password"] = password.(string)
+		}
+
+		result["role"] = string(v.Role)
+
+		if v.SslSecretId != nil {
+			result["ssl_secret_id"] = string(*v.SslSecretId)
+		}
+
+		if username, ok := s.D.GetOkExists("connection_credentials.0.username"); ok && username != nil {
+			result["username"] = username.(string)
+		}
 	default:
 		log.Printf("[WARN] Received 'credential_type' of unknown type %v", *obj)
 		return nil
diff --git a/internal/service/database/database_external_database_connector_resource.go b/internal/service/database/database_external_database_connector_resource.go
@@ -53,6 +53,7 @@ func DatabaseExternalDatabaseConnectorResource() *schema.Resource {
 							ValidateFunc: validation.StringInSlice([]string{
 								"DETAILS",
 								"NAME_REFERENCE",
+								"SSL_DETAILS",
 							}, true),
 						},
 						"password": {
@@ -66,6 +67,11 @@ func DatabaseExternalDatabaseConnectorResource() *schema.Resource {
 							Optional: true,
 							Computed: true,
 						},
+						"ssl_secret_id": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Computed: true,
+						},
 						"username": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -445,6 +451,28 @@ func (s *DatabaseExternalDatabaseConnectorResourceCrud) mapToDatabaseConnectionC
 			details.CredentialName = &tmp
 		}
 		baseObject = details
+	case strings.ToLower("SSL_DETAILS"):
+		details := oci_database.DatabaseSslConnectionCredentials{}
+		if credentialName, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "credential_name")); ok {
+			tmp := credentialName.(string)
+			details.CredentialName = &tmp
+		}
+		if password, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "password")); ok {
+			tmp := password.(string)
+			details.Password = &tmp
+		}
+		if role, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "role")); ok {
+			details.Role = oci_database.DatabaseSslConnectionCredentialsRoleEnum(role.(string))
+		}
+		if sslSecretId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "ssl_secret_id")); ok {
+			tmp := sslSecretId.(string)
+			details.SslSecretId = &tmp
+		}
+		if username, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "username")); ok {
+			tmp := username.(string)
+			details.Username = &tmp
+		}
+		baseObject = details
 	default:
 		return nil, fmt.Errorf("unknown credential_type '%v' was specified", credentialType)
 	}
@@ -476,6 +504,27 @@ func (s *DatabaseExternalDatabaseConnectorResourceCrud) DatabaseConnectionCreden
 		if v.CredentialName != nil {
 			result["credential_name"] = string(*v.CredentialName)
 		}
+	case oci_database.DatabaseSslConnectionCredentials:
+		result["credential_type"] = "SSL_DETAILS"
+
+		if v.CredentialName != nil {
+			result["credential_name"] = string(*v.CredentialName)
+		}
+
+		if password, ok := s.D.GetOkExists("connection_credentials.0.password"); ok && password != nil {
+			result["password"] = password.(string)
+		}
+
+		result["role"] = string(v.Role)
+
+		if v.SslSecretId != nil {
+			result["ssl_secret_id"] = string(*v.SslSecretId)
+		}
+
+		if username, ok := s.D.GetOkExists("connection_credentials.0.username"); ok && username != nil {
+			result["username"] = username.(string)
+		}
+
 	default:
 		log.Printf("[WARN] Received 'credential_type' of unknown type %v", *obj)
 		return nil
diff --git a/internal/service/database/database_external_database_connectors_data_source.go b/internal/service/database/database_external_database_connectors_data_source.go
@@ -220,6 +220,21 @@ func (s *DatabaseExternalDatabaseConnectorsDataSourceCrud) DatabaseConnectionCre
 		if v.CredentialName != nil {
 			result["credential_name"] = string(*v.CredentialName)
 		}
+	case oci_database.DatabaseSslConnectionCredentials:
+		result["credential_type"] = "SSL_DETAILS"
+		if v.CredentialName != nil {
+			result["credential_name"] = string(*v.CredentialName)
+		}
+		if password, ok := s.D.GetOkExists("connection_credentials.0.password"); ok && password != nil {
+			result["password"] = password.(string)
+		}
+		result["role"] = string(v.Role)
+		if v.SslSecretId != nil {
+			result["ssl_secret_id"] = string(*v.SslSecretId)
+		}
+		if username, ok := s.D.GetOkExists("connection_credentials.0.username"); ok && username != nil {
+			result["username"] = username.(string)
+		}
 	default:
 		log.Printf("[WARN] Received 'credential_type' of unknown type %v", *obj)
 		return nil
diff --git a/website/docs/d/database_autonomous_container_database.html.markdown b/website/docs/d/database_autonomous_container_database.html.markdown
@@ -32,7 +32,7 @@ The following arguments are supported:
 
 The following attributes are exported:
 
-* `autonomous_exadata_infrastructure_id` - The OCID of the Autonomous Exadata Infrastructure.
+* `autonomous_exadata_infrastructure_id` - **No longer used.** For Autonomous Database on dedicated Exadata infrastructure, the container database is created within a specified `cloudAutonomousVmCluster`.  
 * `autonomous_vm_cluster_id` - The OCID of the Autonomous VM Cluster.
 * `availability_domain` - The availability domain of the Autonomous Container Database.
 * `backup_config` - Backup options for the Autonomous Container Database. 
diff --git a/website/docs/d/database_autonomous_container_databases.html.markdown b/website/docs/d/database_autonomous_container_databases.html.markdown
@@ -57,7 +57,7 @@ The following attributes are exported:
 
 The following attributes are exported:
 
-* `autonomous_exadata_infrastructure_id` - The OCID of the Autonomous Exadata Infrastructure.
+* `autonomous_exadata_infrastructure_id` - **No longer used.** For Autonomous Database on dedicated Exadata infrastructure, the container database is created within a specified `cloudAutonomousVmCluster`.  
 * `autonomous_vm_cluster_id` - The OCID of the Autonomous VM Cluster.
 * `availability_domain` - The availability domain of the Autonomous Container Database.
 * `backup_config` - Backup options for the Autonomous Container Database. 
diff --git a/website/docs/d/database_autonomous_exadata_infrastructure_shapes.html.markdown b/website/docs/d/database_autonomous_exadata_infrastructure_shapes.html.markdown
@@ -10,7 +10,7 @@ description: |-
 # Data Source: oci_database_autonomous_exadata_infrastructure_shapes
 This data source provides the list of Autonomous Exadata Infrastructure Shapes in Oracle Cloud Infrastructure Database service.
 
-**Deprecated.** 
+**Deprecated.**
 
 
 ## Example Usage
diff --git a/website/docs/d/database_autonomous_vm_cluster.html.markdown b/website/docs/d/database_autonomous_vm_cluster.html.markdown
@@ -10,7 +10,7 @@ description: |-
 # Data Source: oci_database_autonomous_vm_cluster
 This data source provides details about a specific Autonomous Vm Cluster resource in Oracle Cloud Infrastructure Database service.
 
-Gets information about the specified Autonomous VM cluster for an Exadata Cloud@Customer system. To get information about an Autonomous VM Cluster in the Oracle cloud, see [GetCloudAutonomousVmCluster](https://docs.cloud.oracle.com/iaas/api/#/en/database/latest/CloudAutonomousVmCluster/GetCloudAutonomousVmCluster). 
+Gets information about the specified Autonomous VM cluster for an Exadata Cloud@Customer system. To get information about an Autonomous VM Cluster in the Oracle cloud, see [GetCloudAutonomousVmCluster](https://docs.cloud.oracle.com/iaas/api/#/en/database/latest/CloudAutonomousVmCluster/GetCloudAutonomousVmCluster).
 
 
 ## Example Usage
diff --git a/website/docs/d/database_external_database_connector.html.markdown b/website/docs/d/database_external_database_connector.html.markdown
@@ -40,6 +40,7 @@ The following attributes are exported:
 	* `credential_type` - The type of credential used to connect to the database.
 	* `password` - The password that will be used to connect to the database.
 	* `role` - The role of the user that will be connecting to the database.
+	* `ssl_secret_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [secret](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm#concepts).
 	* `username` - The username that will be used to connect to the database.
 * `connection_status` - The status of connectivity to the external database.
 * `connection_string` - The Oracle Database connection string. 
diff --git a/website/docs/d/database_external_database_connectors.html.markdown b/website/docs/d/database_external_database_connectors.html.markdown
@@ -55,6 +55,7 @@ The following attributes are exported:
 	* `credential_type` - The type of credential used to connect to the database.
 	* `password` - The password that will be used to connect to the database.
 	* `role` - The role of the user that will be connecting to the database.
+	* `ssl_secret_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [secret](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm#concepts).
 	* `username` - The username that will be used to connect to the database.
 * `connection_status` - The status of connectivity to the external database.
 * `connection_string` - The Oracle Database connection string. 
diff --git a/website/docs/r/database_db_system.html.markdown b/website/docs/r/database_db_system.html.markdown
@@ -146,7 +146,7 @@ The following arguments are supported:
 	**Subnet Restrictions:** See the subnet restrictions information for **subnetId**. 
 * `cluster_name` - (Optional) The cluster name for Exadata and 2-node RAC virtual machine DB systems. The cluster name must begin with an alphabetic character, and may contain hyphens (-). Underscores (_) are not permitted. The cluster name can be no longer than 11 characters and is not case sensitive. 
 * `compartment_id` - (Required) (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment the DB system  belongs in.
-* `cpu_core_count` - (Optional) (Updatable) The number of CPU cores to enable for a bare metal or Exadata DB system. The valid values depend on the specified shape:
+* `cpu_core_count` - (Optional) (Updatable) The number of CPU cores to enable for a bare metal or Exadata DB system or AMD VMDB Systems. The valid values depend on the specified shape:
 	* BM.DenseIO1.36 - Specify a multiple of 2, from 2 to 36.
 	* BM.DenseIO2.52 - Specify a multiple of 2, from 2 to 52.
 	* Exadata.Base.48 - Specify a multiple of 2, from 0 to 48.
@@ -156,8 +156,9 @@ The following arguments are supported:
 	* Exadata.Quarter2.92 - Specify a multiple of 2, from 0 to 92.
 	* Exadata.Half2.184 - Specify a multiple of 4, from 0 to 184.
 	* Exadata.Full2.368 - Specify a multiple of 8, from 0 to 368.
+	* VM.Standard.E4.Flex - Specify any thing from 1 to 64.
 
-	This parameter is not used for virtual machine DB systems because virtual machine DB systems have a set number of cores for each shape. For information about the number of cores for a virtual machine DB system shape, see [Virtual Machine DB Systems](https://docs.cloud.oracle.com/iaas/Content/Database/Concepts/overview.htm#virtualmachine) 
+	This parameter is not used for INTEL virtual machine DB systems because virtual machine DB systems have a set number of cores for each shape. For information about the number of cores for a virtual machine DB system shape, see [Virtual Machine DB Systems](https://docs.cloud.oracle.com/iaas/Content/Database/Concepts/overview.htm#virtualmachine) 
 * `data_storage_percentage` - (Optional) 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). Specify 80 or 40. The default is 80 percent assigned to DATA storage. Not applicable for virtual machine DB systems. Required for BMDBs.
 * `data_storage_size_in_gb` - (Optional) (Updatable) Size (in GB) of the initial data volume that will be created and attached to a virtual machine DB system. You can scale up storage after provisioning, as needed. Note that the total storage size attached will be more than the amount you specify to allow for REDO/RECO space and software volume. Required for VMDBs.
 * `database_edition` - (Required when source=DATABASE | DB_BACKUP | NONE) The Oracle Database Edition that applies to all the databases on the DB system. Exadata DB systems and 2-node RAC DB systems require ENTERPRISE_EDITION_EXTREME_PERFORMANCE. 
diff --git a/website/docs/r/database_external_database_connector.html.markdown b/website/docs/r/database_external_database_connector.html.markdown
@@ -25,6 +25,7 @@ resource "oci_database_external_database_connector" "test_external_database_conn
 		credential_type = var.external_database_connector_connection_credentials_credential_type
 		password = var.external_database_connector_connection_credentials_password
 		role = var.external_database_connector_connection_credentials_role
+		ssl_secret_id = oci_vault_secret.test_secret.id
 		username = var.external_database_connector_connection_credentials_username
 	}
 	connection_string {
@@ -54,9 +55,10 @@ The following arguments are supported:
 
 		For example: inventorydb.abc112233445566778899 
 	* `credential_type` - (Optional) (Updatable) The type of credential used to connect to the database.
-	* `password` - (Required when credential_type=DETAILS) (Updatable) The password that will be used to connect to the database.
-	* `role` - (Required when credential_type=DETAILS) (Updatable) The role of the user that will be connecting to the database.
-	* `username` - (Required when credential_type=DETAILS) (Updatable) The username that will be used to connect to the database.
+	* `password` - (Required when credential_type=DETAILS | SSL_DETAILS) (Updatable) The password that will be used to connect to the database.
+	* `role` - (Required when credential_type=DETAILS | SSL_DETAILS) (Updatable) The role of the user that will be connecting to the database.
+	* `ssl_secret_id` - (Required when credential_type=SSL_DETAILS) (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [secret](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm#concepts).
+	* `username` - (Required when credential_type=DETAILS | SSL_DETAILS) (Updatable) The username that will be used to connect to the database.
 * `connection_string` - (Required) (Updatable) The Oracle Database connection string. 
 	* `hostname` - (Required) (Updatable) The host name of the database.
 	* `port` - (Required) (Updatable) The port used to connect to the database.
@@ -85,6 +87,7 @@ The following attributes are exported:
 	* `credential_type` - The type of credential used to connect to the database.
 	* `password` - The password that will be used to connect to the database.
 	* `role` - The role of the user that will be connecting to the database.
+	* `ssl_secret_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [secret](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm#concepts).
 	* `username` - The username that will be used to connect to the database.
 * `connection_status` - The status of connectivity to the external database.
 * `connection_string` - The Oracle Database connection string. 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ variable "service" {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`variable "connector_agent_id" {`
`76`		`- default = "ocid1.managementagent.oc1.phx.amaaaaaajobtc3iaes4ijczgekzqigoji25xocsny7yundummydummydummy"`
	`76`	`+`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`variable "external_database_connector_display_name" {`