Skip to content

Commit e271b75

Browse files
committed
setting default test timeout for ADB resource
1 parent 62a8ae7 commit e271b75

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

oci/database_autonomous_database_resource_test.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,7 @@ var (
6666
"is_preview_version_with_service_terms_accepted": Representation{repType: Optional, create: `false`},
6767
"license_model": Representation{repType: Optional, create: `LICENSE_INCLUDED`},
6868
"data_safe_status": Representation{repType: Optional, create: `REGISTERED`, update: `not_REGISTERED`},
69-
"timeouts": RepresentationGroup{Required, autonomousDatabaseDtaSafeStatusTimeoutsRepresentation},
70-
}
71-
72-
autonomousDatabaseDtaSafeStatusTimeoutsRepresentation = map[string]interface{}{
73-
"delete": Representation{repType: Required, create: `10m`},
69+
"timeouts": RepresentationGroup{Required, autonomousDatabaseTimeoutsRepresentation},
7470
}
7571

7672
autonomousDatabaseRepresentationForSourceFromBackupId = representationCopyWithNewProperties(
@@ -99,15 +95,8 @@ var (
9995
"nsg_ids": Representation{repType: Optional, create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}, update: []string{`${oci_core_network_security_group.test_network_security_group.id}`, `${oci_core_network_security_group.test_network_security_group2.id}`}},
10096
"private_endpoint_label": Representation{repType: Optional, create: `xlx4fcli`},
10197
"subnet_id": Representation{repType: Optional, create: `${oci_core_subnet.test_subnet.id}`},
102-
"timeouts": RepresentationGroup{Required, autonomousDatabasePrivateEndpointTimeoutsRepresentation},
10398
}), []string{"whitelisted_ips"})
10499

105-
autonomousDatabasePrivateEndpointTimeoutsRepresentation = map[string]interface{}{
106-
"create": Representation{repType: Required, create: `10m`},
107-
"update": Representation{repType: Required, create: `10m`},
108-
"delete": Representation{repType: Required, create: `10m`},
109-
}
110-
111100
AutonomousDatabasePrivateEndpointResourceDependencies = generateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", Required, Create, subnetRepresentation) +
112101
generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, vcnRepresentation) +
113102
generateResourceFromRepresentationMap("oci_core_network_security_group", "test_network_security_group", Required, Create, networkSecurityGroupRepresentation) +

oci/database_autonomous_database_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,14 @@ var (
6060
"is_preview_version_with_service_terms_accepted": Representation{repType: Optional, create: `false`},
6161
"license_model": Representation{repType: Optional, create: `LICENSE_INCLUDED`},
6262
"whitelisted_ips": Representation{repType: Optional, create: []string{`1.1.1.1/28`}},
63+
"timeouts": RepresentationGroup{Required, autonomousDatabaseTimeoutsRepresentation},
6364
}
6465

66+
autonomousDatabaseTimeoutsRepresentation = map[string]interface{}{
67+
"create": Representation{repType: Required, create: `20m`},
68+
"update": Representation{repType: Required, create: `20m`},
69+
"delete": Representation{repType: Required, create: `20m`},
70+
}
6571
autonomousDatabaseCopyWithUpdatedIPsRepresentation = getUpdatedRepresentationCopy("whitelisted_ips", Representation{repType: Optional, create: []string{"1.1.1.1/28", "1.1.1.29"}, update: []string{}}, autonomousDatabaseRepresentation)
6672

6773
autonomousDatabaseRepresentationForClone = representationCopyWithNewProperties(
@@ -376,7 +382,7 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
376382

377383
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
378384
resource.TestCheckResourceAttr(singularDatasourceName, "connection_strings.#", "1"),
379-
resource.TestCheckResourceAttr(singularDatasourceName, "connection_strings.0.all_connection_strings.%", "5"),
385+
resource.TestCheckResourceAttr(singularDatasourceName, "connection_strings.0.all_connection_strings.%", "4"),
380386

381387
resource.TestCheckResourceAttr(singularDatasourceName, "connection_urls.#", "1"),
382388
resource.TestCheckResourceAttrSet(singularDatasourceName, "connection_urls.0.apex_url"),

0 commit comments

Comments
 (0)