Skip to content

Commit 9206e7b

Browse files
frobertvarmax2511
frobert
authored and
varmax2511
committed
fixed format in connection string, resource discovery for dbtools
1 parent 14b0ecf commit 9206e7b

File tree

3 files changed

+45
-12
lines changed

3 files changed

+45
-12
lines changed

‎oci/database_tools_database_tools_connection_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var (
3434
"compartment_id": Representation{RepType: Required, Create: `${var.compartment_id}`},
3535
"display_name": Representation{RepType: Required, Create: `tf_connection_name`, Update: `displayName2`},
3636
"state": Representation{RepType: Optional, Create: `ACTIVE`},
37-
"type": Representation{RepType: Optional, Create: []string{`ORACLE_DATABASE`}}, // `ORACLE_DATABASE`},
37+
"type": Representation{RepType: Optional, Create: []string{`ORACLE_DATABASE`}},
3838
"filter": RepresentationGroup{Required, databaseToolsConnectionDataSourceFilterRepresentation}}
3939
databaseToolsConnectionDataSourceFilterRepresentation = map[string]interface{}{
4040
"name": Representation{RepType: Required, Create: `id`},
@@ -46,15 +46,15 @@ var (
4646
"display_name": Representation{RepType: Required, Create: `tf_connection_name`, Update: `displayName2`},
4747
"type": Representation{RepType: Required, Create: `ORACLE_DATABASE`},
4848
"advanced_properties": Representation{RepType: Optional, Create: map[string]string{"oracle.jdbc.loginTimeout": "0"}, Update: map[string]string{"oracle.net.CONNECT_TIMEOUT": "0"}},
49-
"connection_string": Representation{RepType: Required, Create: `tcps://adb-preprod.us-phoenix-1.oraclecloud.com:1522/u9adutfb2ba8x4d_db202103231555_low.adb.oraclecloud.com`, Update: `connectionString2`},
49+
"connection_string": Representation{RepType: Required, Create: `tcps://adb.us-phoenix-1.oraclecloud.com:1522/u9adutfb2ba8x4d_db202103231111_low.adb.oraclecloud.com`, Update: `connectionString2`},
5050
"defined_tags": Representation{RepType: Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
5151
"freeform_tags": Representation{RepType: Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
5252
"key_stores": RepresentationGroup{Optional, databaseToolsConnectionKeyStoresRepresentation},
5353
"private_endpoint_id": Representation{RepType: Optional, Create: `${oci_database_tools_database_tools_private_endpoint.test_private_endpoint.id}`},
5454
"related_resource": RepresentationGroup{Optional, databaseToolsConnectionRelatedResourceRepresentation},
5555
"user_name": Representation{RepType: Required, Create: `${oci_identity_user.test_user.name}`},
5656
"user_password": RepresentationGroup{Required, databaseToolsConnectionUserPasswordRepresentation},
57-
//"lifecycle": RepresentationGroup{Required, ignoreChangesDatabaseToolsConnectionRepresentation},
57+
"lifecycle": RepresentationGroup{Required, ignoreChangesDatabaseToolsConnectionRepresentation},
5858
}
5959
databaseToolsConnectionKeyStoresRepresentation = map[string]interface{}{
6060
"key_store_content": RepresentationGroup{Optional, databaseToolsConnectionKeyStoresKeyStoreContentRepresentation},
@@ -67,20 +67,20 @@ var (
6767
}
6868
databaseToolsConnectionUserPasswordRepresentation = map[string]interface{}{
6969
"value_type": Representation{RepType: Required, Create: `SECRETID`},
70-
"secret_id": Representation{RepType: Required, Create: `ocid1.vaultsecret.region1.sea.amaaaaaazlynb3aahrylxtg7peotj6yybjblsqocjumsg5fp6glwqkoi2kza`}, // ${oci_vault_secret.test_secret.id}
70+
"secret_id": Representation{RepType: Required, Create: `ocid1.vaultsecret.region1.sea.amaaaaaazlynb3aahrylxtg7peotj6yybjblsqocjumsg5fp6g1111111111`}, // ${oci_vault_secret.test_secret.id}
7171
}
7272
databaseToolsConnectionKeyStoresKeyStoreContentRepresentation = map[string]interface{}{
7373
"value_type": Representation{RepType: Required, Create: `SECRETID`},
74-
"secret_id": Representation{RepType: Optional, Create: `ocid1.vaultsecret.region1.sea.amaaaaaazlynb3aahrylxtg7peotj6yybjblsqocjumsg5fp6glwqkoi2kza`}, // `${oci_vault_secret.test_secret.id}`},
74+
"secret_id": Representation{RepType: Optional, Create: `ocid1.vaultsecret.region1.sea.amaaaaaazlynb3aahrylxtg7peotj6yybjblsqocjumsg5fp6g1111111111`}, // `${oci_vault_secret.test_secret.id}`},
7575
}
7676
databaseToolsConnectionKeyStoresKeyStorePasswordRepresentation = map[string]interface{}{
7777
"value_type": Representation{RepType: Required, Create: `SECRETID`},
78-
"secret_id": Representation{RepType: Optional, Create: `ocid1.vaultsecret.region1.sea.amaaaaaazlynb3aahrylxtg7peotj6yybjblsqocjumsg5fp6glwqkoi2kza`}, //`${oci_vault_secret.test_secret.id}`},
78+
"secret_id": Representation{RepType: Optional, Create: `ocid1.vaultsecret.region1.sea.amaaaaaazlynb3aahrylxtg7peotj6yybjblsqocjumsg5fp6g1111111111`}, //`${oci_vault_secret.test_secret.id}`},
7979
}
8080

81-
//ignoreChangesDatabaseToolsConnectionRepresentation = map[string]interface{}{ // For R1 only
82-
// "ignore_changes": Representation{RepType: Required, Create: []string{`defined_tags`}},
83-
//}
81+
ignoreChangesDatabaseToolsConnectionRepresentation = map[string]interface{}{ // This may vary depending on the tenancy settings
82+
"ignore_changes": Representation{RepType: Required, Create: []string{`defined_tags`, `freeform_tags`}},
83+
}
8484

8585
DatabaseToolsConnectionResourceDependencies = GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", Required, Create, subnetRepresentation) +
8686
GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, vcnRepresentation) +
@@ -127,7 +127,7 @@ func TestDatabaseToolsDatabaseToolsConnectionResource_basic(t *testing.T) {
127127
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
128128
resource.TestCheckResourceAttr(resourceName, "display_name", "tf_connection_name"),
129129
resource.TestCheckResourceAttr(resourceName, "type", "ORACLE_DATABASE"),
130-
resource.TestCheckResourceAttr(resourceName, "connection_string", "tcps://adb-preprod.us-phoenix-1.oraclecloud.com:1522/u9adutfb2ba8x4d_db202103231555_low.adb.oraclecloud.com"),
130+
resource.TestCheckResourceAttr(resourceName, "connection_string", "tcps://adb.us-phoenix-1.oraclecloud.com:1522/u9adutfb2ba8x4d_db202103231111_low.adb.oraclecloud.com"),
131131
resource.TestCheckResourceAttrSet(resourceName, "user_name"),
132132
resource.TestCheckResourceAttr(resourceName, "user_password.#", "1"),
133133
resource.TestCheckResourceAttrSet(resourceName, "user_password.0.secret_id"),
@@ -153,7 +153,7 @@ func TestDatabaseToolsDatabaseToolsConnectionResource_basic(t *testing.T) {
153153
Check: resource.ComposeAggregateTestCheckFunc(
154154
resource.TestCheckResourceAttr(resourceName, "advanced_properties.%", "1"),
155155
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
156-
resource.TestCheckResourceAttr(resourceName, "connection_string", "tcps://adb-preprod.us-phoenix-1.oraclecloud.com:1522/u9adutfb2ba8x4d_db202103231555_low.adb.oraclecloud.com"),
156+
resource.TestCheckResourceAttr(resourceName, "connection_string", "tcps://adb.us-phoenix-1.oraclecloud.com:1522/u9adutfb2ba8x4d_db202103231111_low.adb.oraclecloud.com"),
157157
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"), // On R1: "3": "1" + "2" for Operators = "3"
158158
resource.TestCheckResourceAttr(resourceName, "display_name", "tf_connection_name"),
159159
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
@@ -202,7 +202,7 @@ func TestDatabaseToolsDatabaseToolsConnectionResource_basic(t *testing.T) {
202202
Check: resource.ComposeAggregateTestCheckFunc(
203203
resource.TestCheckResourceAttr(resourceName, "advanced_properties.%", "1"),
204204
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
205-
resource.TestCheckResourceAttr(resourceName, "connection_string", "tcps://adb-preprod.us-phoenix-1.oraclecloud.com:1522/u9adutfb2ba8x4d_db202103231555_low.adb.oraclecloud.com"),
205+
resource.TestCheckResourceAttr(resourceName, "connection_string", "tcps://adb.us-phoenix-1.oraclecloud.com:1522/u9adutfb2ba8x4d_db202103231111_low.adb.oraclecloud.com"),
206206
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
207207
resource.TestCheckResourceAttr(resourceName, "display_name", "tf_connection_name"),
208208
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),

‎oci/export_definitions.go‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
oci_core "github.com/oracle/oci-go-sdk/v51/core"
2020
oci_database "github.com/oracle/oci-go-sdk/v51/database"
2121
oci_database_migration "github.com/oracle/oci-go-sdk/v51/databasemigration"
22+
oci_database_tools "github.com/oracle/oci-go-sdk/v50/databasetools"
2223
oci_datacatalog "github.com/oracle/oci-go-sdk/v51/datacatalog"
2324
oci_dataflow "github.com/oracle/oci-go-sdk/v51/dataflow"
2425
oci_dataintegration "github.com/oracle/oci-go-sdk/v51/dataintegration"
@@ -1202,6 +1203,30 @@ var exportDatabaseMigrationConnectionHints = &TerraformResourceHints{
12021203
},
12031204
}
12041205

1206+
var exportDatabaseToolsDatabaseToolsPrivateEndpointHints = &TerraformResourceHints{
1207+
resourceClass: "oci_database_tools_database_tools_private_endpoint",
1208+
datasourceClass: "oci_database_tools_database_tools_private_endpoints",
1209+
datasourceItemsAttr: "database_tools_private_endpoint_collection",
1210+
isDatasourceCollection: true,
1211+
resourceAbbreviation: "database_tools_private_endpoint",
1212+
requireResourceRefresh: true,
1213+
discoverableLifecycleStates: []string{
1214+
string(oci_database_tools.LifecycleStateActive),
1215+
},
1216+
}
1217+
1218+
var exportDatabaseToolsDatabaseToolsConnectionHints = &TerraformResourceHints{
1219+
resourceClass: "oci_database_tools_database_tools_connection",
1220+
datasourceClass: "oci_database_tools_database_tools_connections",
1221+
datasourceItemsAttr: "database_tools_connection_collection",
1222+
isDatasourceCollection: true,
1223+
resourceAbbreviation: "database_tools_connection",
1224+
requireResourceRefresh: true,
1225+
discoverableLifecycleStates: []string{
1226+
string(oci_database_tools.LifecycleStateActive),
1227+
},
1228+
}
1229+
12051230
var exportDatabasePluggableDatabaseHints = &TerraformResourceHints{
12061231
resourceClass: "oci_database_pluggable_database",
12071232
datasourceClass: "oci_database_pluggable_databases",

‎oci/export_graphs.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ var compartmentResourceGraphs = map[string]TerraformResourceGraph{
3535
"data_safe": dataSafeResourceGraph,
3636
"database": databaseResourceGraph,
3737
"database_migration": databaseMigrationResourceGraph,
38+
"database_tools": databaseToolsResourceGraph,
3839
"datacatalog": datacatalogResourceGraph,
3940
"dataflow": dataflowResourceGraph,
4041
"dataintegration": dataintegrationResourceGraph,
@@ -487,6 +488,13 @@ var databaseMigrationResourceGraph = TerraformResourceGraph{
487488
},
488489
}
489490

491+
var databaseToolsResourceGraph = TerraformResourceGraph{
492+
"oci_identity_compartment": {
493+
{TerraformResourceHints: exportDatabaseToolsDatabaseToolsPrivateEndpointHints},
494+
{TerraformResourceHints: exportDatabaseToolsDatabaseToolsConnectionHints},
495+
},
496+
}
497+
490498
var datacatalogResourceGraph = TerraformResourceGraph{
491499
"oci_identity_compartment": {
492500
{TerraformResourceHints: exportDatacatalogCatalogHints},

0 commit comments

Comments
 (0)