Support for cloud databases in Database Management

Author: Veeranjaneyulu Goli

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Support change compartment using lifecycle state
 - Support retry for Eventually consistency failure
 - Support for Count API added to `os_management` resource
+- Support for cloud databases in Database Management
 
 ## 4.42.0 (September 01, 2021)
 

examples/databasemanagement/main.tf

@@ -64,6 +64,18 @@ variable "managed_databases_database_parameter_source" {
   default = "CURRENT"
 }
 
+variable "db_management_private_endpoint_name" {
+  default = "TestPrivateEndpoint"
+}
+
+variable "db_management_private_endpoint_description" {
+  default = "Test private endpoint"
+}
+
+variable "db_management_private_endpoint_state" {
+  default = "ACTIVE"
+}
+
 provider "oci" {
   tenancy_ocid = var.tenancy_ocid
   user_ocid = var.user_ocid
@@ -145,4 +157,55 @@ data "oci_database_management_managed_databases_database_parameter" "test_manage
   is_allowed_values_included = var.managed_databases_database_parameter_is_allowed_values_included
   name = var.managed_databases_database_parameter_parameters_name
   source = var.managed_databases_database_parameter_source
+}
+
+resource "oci_core_vcn" "test_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = var.compartment_id
+  display_name   = "exampleVCN"
+  dns_label      = "tfexamplevcn"
+}
+
+resource "oci_core_subnet" "test_subnet" {
+  cidr_block     = "10.0.0.0/24"
+  display_name   = "regionalSubnet"
+  dns_label      = "regionalsubnet"
+  compartment_id = var.compartment_id
+  vcn_id         = oci_core_vcn.test_vcn.id
+}
+
+resource "oci_core_network_security_group" "test_network_security_group" {
+  #Required
+  compartment_id = var.compartment_id
+  vcn_id         = oci_core_vcn.test_vcn.id
+}
+
+resource "oci_database_management_db_management_private_endpoint" "test_db_management_private_endpoint" {
+  #Required
+  compartment_id = var.compartment_id
+  name = var.db_management_private_endpoint_name
+  subnet_id = oci_core_subnet.test_subnet.id
+
+  #Optional
+  description = var.db_management_private_endpoint_description
+  nsg_ids   = [oci_core_network_security_group.test_network_security_group.id]
+}
+
+data "oci_database_management_db_management_private_endpoint" "test_db_management_private_endpoint" {
+  db_management_private_endpoint_id = oci_database_management_db_management_private_endpoint.test_db_management_private_endpoint.id
+}
+
+data "oci_database_management_db_management_private_endpoints" "test_db_management_private_endpoints" {
+  #Required
+  compartment_id = var.compartment_id
+}
+
+data "oci_database_management_db_management_private_endpoints" "test_db_management_private_endpoints_with_name" {
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  name = var.db_management_private_endpoint_name
+  vcn_id = oci_core_vcn.test_vcn.id
+  state = var.db_management_private_endpoint_state
 }

oci/database_management_db_management_private_endpoint_associated_database_data_source.go

@@ -0,0 +1,119 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	oci_database_management "github.com/oracle/oci-go-sdk/v46/databasemanagement"
+)
+
+func init() {
+	RegisterDatasource("oci_database_management_db_management_private_endpoint_associated_database", DatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseDataSource())
+}
+
+func DatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readSingularDatabaseManagementDbManagementPrivateEndpointAssociatedDatabase,
+		Schema: map[string]*schema.Schema{
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"db_management_private_endpoint_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			// Computed
+			"items": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"compartment_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"time_registered": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func readSingularDatabaseManagementDbManagementPrivateEndpointAssociatedDatabase(d *schema.ResourceData, m interface{}) error {
+	sync := &DatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).dbManagementClient()
+
+	return ReadResource(sync)
+}
+
+type DatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_database_management.DbManagementClient
+	Res    *oci_database_management.ListAssociatedDatabasesResponse
+}
+
+func (s *DatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *DatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseDataSourceCrud) Get() error {
+	request := oci_database_management.ListAssociatedDatabasesRequest{}
+
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
+	if dbManagementPrivateEndpointId, ok := s.D.GetOkExists("db_management_private_endpoint_id"); ok {
+		tmp := dbManagementPrivateEndpointId.(string)
+		request.DbManagementPrivateEndpointId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "database_management")
+
+	response, err := s.Client.ListAssociatedDatabases(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *DatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(GenerateDataSourceHashID("DatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseDataSource-", DatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseDataSource(), s.D))
+
+	items := []interface{}{}
+	for _, item := range s.Res.Items {
+		items = append(items, AssociatedDatabaseSummaryToMap(item))
+	}
+	s.D.Set("items", items)
+
+	return nil
+}

oci/database_management_db_management_private_endpoint_associated_database_test.go

@@ -0,0 +1,82 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+
+	"github.com/terraform-providers/terraform-provider-oci/httpreplay"
+)
+
+var (
+	dbManagementPrivateEndpointAssociatedDatabaseSingularDataSourceRepresentation = map[string]interface{}{
+		"compartment_id":                    Representation{repType: Required, create: `${var.compartment_id}`},
+		"db_management_private_endpoint_id": Representation{repType: Required, create: `${oci_database_management_db_management_private_endpoint.test_db_management_private_endpoint.id}`},
+	}
+
+	dbManagementPrivateEndpointAssociatedDatabaseDataSourceRepresentation = map[string]interface{}{
+		"compartment_id":                    Representation{repType: Required, create: `${var.compartment_id}`},
+		"db_management_private_endpoint_id": Representation{repType: Required, create: `${oci_database_management_db_management_private_endpoint.test_db_management_private_endpoint.id}`},
+	}
+
+	DbManagementPrivateEndpointAssociatedDatabaseResourceConfig = generateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", Required, Create, subnetRepresentation) +
+		generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, vcnRepresentation) +
+		generateResourceFromRepresentationMap("oci_database_management_db_management_private_endpoint", "test_db_management_private_endpoint", Required, Create, dbManagementPrivateEndpointRepresentation)
+)
+
+// issue-routing-tag: database_management/default
+func TestDatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseResource_basic(t *testing.T) {
+	t.Skip("Skip this test till Database Management service provides a better way of testing this. It requires a live managed database instance")
+	httpreplay.SetScenario("TestDatabaseManagementDbManagementPrivateEndpointAssociatedDatabaseResource_basic")
+	defer httpreplay.SaveScenario()
+
+	provider := testAccProvider
+	config := testProviderConfig()
+
+	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	datasourceName := "data.oci_database_management_db_management_private_endpoint_associated_databases.test_db_management_private_endpoint_associated_databases"
+	singularDatasourceName := "data.oci_database_management_db_management_private_endpoint_associated_database.test_db_management_private_endpoint_associated_database"
+
+	saveConfigContent("", "", "", t)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		Providers: map[string]terraform.ResourceProvider{
+			"oci": provider,
+		},
+		Steps: []resource.TestStep{
+			// verify datasource
+			{
+				Config: config +
+					generateDataSourceFromRepresentationMap("oci_database_management_db_management_private_endpoint_associated_databases", "test_db_management_private_endpoint_associated_databases", Required, Create, dbManagementPrivateEndpointAssociatedDatabaseDataSourceRepresentation) +
+					compartmentIdVariableStr + DbManagementPrivateEndpointAssociatedDatabaseResourceConfig,
+				Check: ComposeAggregateTestCheckFuncWrapper(
+					resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttrSet(datasourceName, "db_management_private_endpoint_id"),
+
+					resource.TestCheckResourceAttrSet(datasourceName, "associated_database_collection.#"),
+					resource.TestCheckResourceAttrSet(datasourceName, "associated_database_collection.0.items.#"),
+				),
+			},
+			// verify singular datasource
+			{
+				Config: config +
+					generateDataSourceFromRepresentationMap("oci_database_management_db_management_private_endpoint_associated_database", "test_db_management_private_endpoint_associated_database", Required, Create, dbManagementPrivateEndpointAssociatedDatabaseSingularDataSourceRepresentation) +
+					compartmentIdVariableStr + DbManagementPrivateEndpointAssociatedDatabaseResourceConfig,
+				Check: ComposeAggregateTestCheckFuncWrapper(
+					resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "db_management_private_endpoint_id"),
+
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "items.#"),
+				),
+			},
+		},
+	})
+}