Skip to content

Commit c88a9a1

Browse files
Terraform Team AutomationjiaqchenO
authored andcommitted
Added - Support for Database Management: Support advanced DBM features for ADB
1 parent 58a619c commit c88a9a1

File tree

23 files changed

+1261
-56
lines changed

23 files changed

+1261
-56
lines changed

examples/databasemanagement/mdb/main.tf

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ resource "oci_database_management_database_dbm_features_management" "test_databa
302302
}
303303
database_id = var.cloud_cdb_id
304304
enable_database_dbm_feature = "true"
305-
305+
306306
}
307307

308308
# Modify DIAGNOSTICS_AND_MANAGEMENT
@@ -419,7 +419,7 @@ resource "oci_database_management_pluggabledatabase_pluggable_database_dbm_featu
419419
}
420420

421421

422-
# Disable DIAGNOSTICS_AND_MANAGEMENT for Cloud CDB
422+
# Disable DIAGNOSTICS_AND_MANAGEMENT for Cloud CDB
423423
resource "oci_database_management_database_dbm_features_management" "test_database_dbm_features_management_diag_disable" {
424424
feature_details {
425425
feature = "DIAGNOSTICS_AND_MANAGEMENT"
@@ -432,3 +432,57 @@ resource "oci_database_management_database_dbm_features_management" "test_databa
432432
oci_database_management_pluggabledatabase_pluggable_database_dbm_features_management.test_pluggabledatabase_pluggable_database_dbm_features_management_disable_diag
433433
]
434434
}
435+
436+
variable "adb_id" {
437+
default = "ocid1.autonomousdatabase<>"
438+
}
439+
440+
variable "adb_service_name" {
441+
default = "<>"
442+
}
443+
444+
variable "adb_username" {
445+
default = "ADMIN"
446+
}
447+
448+
variable "adb_port" {
449+
default = "1521"
450+
}
451+
452+
variable "adb_pe_id" {
453+
default = "ocid1.dbmgmtprivateendpoint<>"
454+
}
455+
456+
variable "adb_secret_id" {
457+
default = "ocid1.vaultsecret<>"
458+
}
459+
460+
variable "adb_protocol" {
461+
default = "TCPS"
462+
}
463+
464+
resource "oci_database_management_autonomous_database_autonomous_database_dbm_features_management" "test_adb_dbm_features_management" {
465+
feature_details {
466+
connector_details {
467+
connector_type = "PE"
468+
private_end_point_id = var.adb_pe_id
469+
}
470+
database_connection_details {
471+
connection_credentials {
472+
credential_type = "DETAILS"
473+
password_secret_id = var.adb_secret_id
474+
role = "NORMAL"
475+
user_name = var.adb_username
476+
}
477+
connection_string {
478+
connection_type = "BASIC"
479+
port = var.adb_port
480+
protocol = var.adb_protocol
481+
service = var.adb_service_name
482+
}
483+
}
484+
feature = "DIAGNOSTICS_AND_MANAGEMENT"
485+
}
486+
autonomous_database_id = var.adb_id
487+
enable_autonomous_database_dbm_feature = "true"
488+
}

examples/databasemanagement/pe/main.tf

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ variable "db_management_private_endpoint_is_cluster" {
3535
default = false
3636
}
3737

38+
variable "db_management_private_endpoint_is_dns_resolution_enabled" {
39+
default = false
40+
}
41+
3842
variable "pe_defined_tags_value" {
3943
default = "pe_tag_value"
4044
}
@@ -84,7 +88,7 @@ resource "oci_core_network_security_group" "test_network_security_group" {
8488
}
8589

8690
# Create a new DB Management Private Endpoint.
87-
resource "oci_database_management_db_management_private_endpoint" "test_db_management_private_endpoint" {
91+
resource "oci_database_management_db_management_private_endpoint" "test_db_management_private_endpoint_create" {
8892
#Required
8993
compartment_id = var.compartment_id
9094
name = var.db_management_private_endpoint_name
@@ -98,17 +102,18 @@ resource "oci_database_management_db_management_private_endpoint" "test_db_manag
98102
"${oci_identity_tag_namespace.tag_namespace1.name}.${oci_identity_tag.tag1.name}" = var.pe_defined_tags_value
99103
}
100104
freeform_tags = var.pe_freeform_tags
105+
is_dns_resolution_enabled = var.db_management_private_endpoint_is_dns_resolution_enabled
101106
}
102107

103108
# Get DB Management Private Endpoint.
104109
data "oci_database_management_db_management_private_endpoint" "test_db_management_private_endpoint" {
105-
db_management_private_endpoint_id = oci_database_management_db_management_private_endpoint.test_db_management_private_endpoint.id
110+
db_management_private_endpoint_id = oci_database_management_db_management_private_endpoint.test_db_management_private_endpoint_create.id
106111
}
107112

108113
# List DB Management Private Endpoints.
109114
data "oci_database_management_db_management_private_endpoints" "test_db_management_private_endpoints" {
110115
#Required
111-
compartment_id = var.compartment_id
116+
compartment_id = oci_database_management_db_management_private_endpoint.test_db_management_private_endpoint_create.compartment_id
112117
}
113118

114119
# List DB Management Private Endpoints matching the given filter criteria.
@@ -120,5 +125,5 @@ data "oci_database_management_db_management_private_endpoints" "test_db_manageme
120125
name = var.db_management_private_endpoint_name
121126
vcn_id = oci_core_vcn.test_vcn.id
122127
state = var.db_management_private_endpoint_state
123-
is_cluster = var.db_management_private_endpoint_is_cluster
128+
is_cluster = oci_database_management_db_management_private_endpoint.test_db_management_private_endpoint_create.is_cluster
124129
}

internal/integrationtest/database_management_autonomous_database_autonomous_database_dbm_features_management_test.go

Lines changed: 181 additions & 0 deletions
Large diffs are not rendered by default.

internal/integrationtest/database_management_db_management_private_endpoint_test.go

Lines changed: 54 additions & 45 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)