Skip to content

Commit 51d8707

Browse files
karthikoracle1993vsin12
karthikoracle1993
authored and
vsin12
committed
Bug fix Autostart and autostop along with other updates.
1 parent 7cac9d9 commit 51d8707

File tree

3 files changed

+84
-47
lines changed

3 files changed

+84
-47
lines changed

‎internal/integrationtest/database_autonomous_database_resource_test.go‎

Lines changed: 66 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4444,7 +4444,7 @@ func TestDatabaseAutonomousDatabaseResource_scheduledOperations(t *testing.T) {
44444444
//0. Verify Create
44454445
{
44464446
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
4447-
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create, DatabaseAutonomousDatabaseRepresentation),
4447+
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create, autonomousDatabaseRepresentationForScheduledOperations),
44484448
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
44494449
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
44504450
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -4498,7 +4498,7 @@ func TestDatabaseAutonomousDatabaseResource_scheduledOperations(t *testing.T) {
44984498
{
44994499
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
45004500
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create,
4501-
acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(DatabaseAutonomousDatabaseRepresentation, []string{"scheduled_operations"}),
4501+
acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(autonomousDatabaseRepresentationForScheduledOperations, []string{"scheduled_operations"}),
45024502
map[string]interface{}{
45034503
"scheduled_operations": []acctest.RepresentationGroup{
45044504
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationFriday},
@@ -4561,7 +4561,7 @@ func TestDatabaseAutonomousDatabaseResource_scheduledOperations(t *testing.T) {
45614561
{
45624562
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
45634563
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create,
4564-
acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(DatabaseAutonomousDatabaseRepresentation, []string{"scheduled_operations"}),
4564+
acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(autonomousDatabaseRepresentationForScheduledOperations, []string{"scheduled_operations"}),
45654565
map[string]interface{}{
45664566
"scheduled_operations": []acctest.RepresentationGroup{
45674567
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationMondayUpdated},
@@ -4615,6 +4615,69 @@ func TestDatabaseAutonomousDatabaseResource_scheduledOperations(t *testing.T) {
46154615
"scheduled_stop_time": "19:00",
46164616
}, nil),
46174617

4618+
func(s *terraform.State) (err error) {
4619+
_, err = acctest.FromInstanceState(s, resourceName, "id")
4620+
return err
4621+
},
4622+
),
4623+
},
4624+
{
4625+
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
4626+
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create,
4627+
acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(autonomousDatabaseRepresentationForScheduledOperations, []string{"scheduled_operations"}),
4628+
map[string]interface{}{
4629+
"scheduled_operations": []acctest.RepresentationGroup{
4630+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationMondayUpdated},
4631+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationTuesday},
4632+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationWednesday},
4633+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationThursday},
4634+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationFriday},
4635+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationSaturday},
4636+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationSunday}},
4637+
"cpu_core_count": acctest.Representation{RepType: acctest.Optional, Create: `8.0`},
4638+
})),
4639+
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
4640+
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
4641+
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
4642+
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "8"),
4643+
// verify computed field db_workload to be defaulted to OLTP
4644+
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
4645+
acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
4646+
"day_of_week.0.name": "MONDAY",
4647+
"scheduled_start_time": "09:00",
4648+
"scheduled_stop_time": "",
4649+
}, nil),
4650+
acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
4651+
"day_of_week.0.name": "TUESDAY",
4652+
"scheduled_start_time": "09:00",
4653+
"scheduled_stop_time": "19:00",
4654+
}, nil),
4655+
acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
4656+
"day_of_week.0.name": "WEDNESDAY",
4657+
"scheduled_start_time": "09:00",
4658+
"scheduled_stop_time": "19:00",
4659+
}, nil),
4660+
acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
4661+
"day_of_week.0.name": "THURSDAY",
4662+
"scheduled_start_time": "09:00",
4663+
"scheduled_stop_time": "19:00",
4664+
}, nil),
4665+
acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
4666+
"day_of_week.0.name": "FRIDAY",
4667+
"scheduled_start_time": "09:00",
4668+
"scheduled_stop_time": "19:00",
4669+
}, nil),
4670+
acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
4671+
"day_of_week.0.name": "SATURDAY",
4672+
"scheduled_start_time": "09:00",
4673+
"scheduled_stop_time": "19:00",
4674+
}, nil),
4675+
acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
4676+
"day_of_week.0.name": "SUNDAY",
4677+
"scheduled_start_time": "09:00",
4678+
"scheduled_stop_time": "19:00",
4679+
}, nil),
4680+
46184681
func(s *terraform.State) (err error) {
46194682
_, err = acctest.FromInstanceState(s, resourceName, "id")
46204683
return err

‎internal/integrationtest/database_autonomous_database_test.go‎

Lines changed: 17 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,8 @@ var (
8080
"is_mtls_connection_required": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
8181
"autonomous_maintenance_schedule_type": acctest.Representation{RepType: acctest.Optional, Create: `REGULAR`},
8282
"is_preview_version_with_service_terms_accepted": acctest.Representation{RepType: acctest.Optional, Create: `false`},
83-
"customer_contacts": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseCustomerContactsRepresentation},
84-
"license_model": acctest.Representation{RepType: acctest.Optional, Create: `LICENSE_INCLUDED`},
85-
"scheduled_operations": []acctest.RepresentationGroup{
86-
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationMonday},
87-
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationTuesday},
88-
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationWednesday},
89-
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationThursday},
90-
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationFriday},
91-
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationSaturday},
92-
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationSunday}},
83+
"customer_contacts": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseCustomerContactsRepresentation},
84+
"license_model": acctest.Representation{RepType: acctest.Optional, Create: `LICENSE_INCLUDED`},
9385
"whitelisted_ips": acctest.Representation{RepType: acctest.Optional, Create: []string{`1.1.1.1/28`}},
9486
"operations_insights_status": acctest.Representation{RepType: acctest.Optional, Create: `NOT_ENABLED`, Update: `ENABLED`},
9587
"timeouts": acctest.RepresentationGroup{RepType: acctest.Required, Group: autonomousDatabaseTimeoutsRepresentation},
@@ -294,6 +286,17 @@ var (
294286
"source_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_database_autonomous_database.test_autonomous_database_source.id}`},
295287
})
296288

289+
autonomousDatabaseRepresentationForScheduledOperations = acctest.RepresentationCopyWithNewProperties(DatabaseAutonomousDatabaseRepresentation, map[string]interface{}{
290+
"scheduled_operations": []acctest.RepresentationGroup{
291+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationMonday},
292+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationTuesday},
293+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationWednesday},
294+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationThursday},
295+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationFriday},
296+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationSaturday},
297+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationSunday}},
298+
})
299+
297300
DatabaseAutonomousDatabaseResourceDependencies = DefinedTagsDependencies + KeyResourceDependencyConfigDbaas +
298301
acctest.GenerateDataSourceFromRepresentationMap("oci_database_autonomous_db_versions", "test_autonomous_db_versions", acctest.Required, acctest.Create, DatabaseDatabaseAutonomousDbVersionDataSourceRepresentation) +
299302
acctest.GenerateDataSourceFromRepresentationMap("oci_database_autonomous_db_versions", "test_autonomous_dw_versions", acctest.Required, acctest.Create,
@@ -496,7 +499,7 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
496499
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseDbToolsDetailsRepresentationMongodbApi},
497500
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseDbToolsDetailsRepresentationOml},
498501
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseDbToolsDetailsRepresentationOrds}},
499-
}), []string{"scheduled_operations", "admin_password", "customer_contacts", "freeform_tags", "defined_tags", "display_name"})),
502+
}), []string{"admin_password", "customer_contacts", "freeform_tags", "defined_tags", "display_name"})),
500503
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
501504
resource.TestCheckResourceAttr(resourceName, "db_tools_details.#", "7"),
502505
acctest.CheckResourceSetContainsElementWithProperties(resourceName, "db_tools_details", map[string]string{
@@ -633,11 +636,6 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
633636
resource.TestCheckResourceAttrSet(resourceName, "kms_key_id"),
634637
resource.TestCheckResourceAttr(resourceName, "license_model", "BRING_YOUR_OWN_LICENSE"),
635638
resource.TestCheckResourceAttr(resourceName, "ncharacter_set", "AL16UTF16"),
636-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.#", "1"),
637-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.day_of_week.#", "1"),
638-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.day_of_week.0.name", "MONDAY"),
639-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.scheduled_start_time", "09:00"),
640-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.scheduled_stop_time", "19:00"),
641639
resource.TestCheckResourceAttrSet(resourceName, "vault_id"),
642640
resource.TestCheckResourceAttr(resourceName, "state", "AVAILABLE"),
643641
resource.TestCheckResourceAttr(resourceName, "whitelisted_ips.#", "1"),
@@ -767,11 +765,6 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
767765
resource.TestCheckResourceAttrSet(resourceName, "kms_key_id"),
768766
resource.TestCheckResourceAttr(resourceName, "license_model", "BRING_YOUR_OWN_LICENSE"),
769767
resource.TestCheckResourceAttr(resourceName, "ncharacter_set", "AL16UTF16"),
770-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.#", "1"),
771-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.day_of_week.#", "1"),
772-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.day_of_week.0.name", "MONDAY"),
773-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.scheduled_start_time", "09:00"),
774-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.scheduled_stop_time", "19:00"),
775768
resource.TestCheckResourceAttrSet(resourceName, "vault_id"),
776769
resource.TestCheckResourceAttr(resourceName, "state", "AVAILABLE"),
777770
resource.TestCheckResourceAttr(resourceName, "whitelisted_ips.#", "1"),
@@ -1128,11 +1121,6 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
11281121
resource.TestCheckResourceAttr(resourceName, "is_preview_version_with_service_terms_accepted", "false"),
11291122
resource.TestCheckResourceAttrSet(resourceName, "kms_key_id"),
11301123
resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
1131-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.#", "1"),
1132-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.day_of_week.#", "1"),
1133-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.day_of_week.0.name", "TUESDAY"),
1134-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.scheduled_start_time", "10:00"),
1135-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.scheduled_stop_time", "20:00"),
11361124
resource.TestCheckResourceAttrSet(resourceName, "state"),
11371125
resource.TestCheckResourceAttrSet(resourceName, "vault_id"),
11381126
resource.TestCheckResourceAttr(resourceName, "whitelisted_ips.#", "0"),
@@ -1171,11 +1159,6 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
11711159
resource.TestCheckResourceAttrSet(resourceName, "kms_key_id"),
11721160
resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
11731161
resource.TestCheckResourceAttr(resourceName, "ncharacter_set", "AL16UTF16"),
1174-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.#", "1"),
1175-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.day_of_week.#", "1"),
1176-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.day_of_week.0.name", "TUESDAY"),
1177-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.scheduled_start_time", "10:00"),
1178-
resource.TestCheckResourceAttr(resourceName, "scheduled_operations.0.scheduled_stop_time", "20:00"),
11791162
resource.TestCheckResourceAttrSet(resourceName, "state"),
11801163
resource.TestCheckResourceAttrSet(resourceName, "vault_id"),
11811164
resource.TestCheckResourceAttr(resourceName, "whitelisted_ips.#", "0"),
@@ -1304,11 +1287,6 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
13041287
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.database_management_status"),
13051288
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.permission_level"),
13061289
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.remote_disaster_recovery_configuration.#", "0"),
1307-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.scheduled_operations.#", "1"),
1308-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.scheduled_operations.0.day_of_week.#", "1"),
1309-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.scheduled_operations.0.day_of_week.0.name", "TUESDAY"),
1310-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.scheduled_operations.0.scheduled_start_time", "10:00"),
1311-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.scheduled_operations.0.scheduled_stop_time", "20:00"),
13121290
// @Codegen: Can't test private_endpoint with fake resource
13131291
//resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.private_endpoint"),
13141292
//resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.private_endpoint_ip"),
@@ -1395,11 +1373,6 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
13951373
resource.TestCheckResourceAttrSet(singularDatasourceName, "database_management_status"),
13961374
resource.TestCheckResourceAttrSet(singularDatasourceName, "permission_level"),
13971375
resource.TestCheckResourceAttr(singularDatasourceName, "remote_disaster_recovery_configuration.#", "0"),
1398-
resource.TestCheckResourceAttr(singularDatasourceName, "scheduled_operations.#", "1"),
1399-
resource.TestCheckResourceAttr(singularDatasourceName, "scheduled_operations.0.day_of_week.#", "1"),
1400-
resource.TestCheckResourceAttr(singularDatasourceName, "scheduled_operations.0.day_of_week.0.name", "TUESDAY"),
1401-
resource.TestCheckResourceAttr(singularDatasourceName, "scheduled_operations.0.scheduled_start_time", "10:00"),
1402-
resource.TestCheckResourceAttr(singularDatasourceName, "scheduled_operations.0.scheduled_stop_time", "20:00"),
14031376
// @Codegen: Can't test private_endpointTestResourceDatabaseAutonomousDatabaseResource_preview with fake resource
14041377
//resource.TestCheckResourceAttrSet(singularDatasourceName, "private_endpoint"),
14051378
//resource.TestCheckResourceAttrSet(singularDatasourceName, "private_endpoint_ip"),
@@ -1486,7 +1459,7 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
14861459
acctest.RepresentationCopyWithRemovedProperties(acctest.GetMultipleUpdatedRepresenationCopy([]string{"db_workload", "db_version", "is_mtls_connection_required"},
14871460
[]interface{}{acctest.Representation{RepType: acctest.Optional, Create: `DW`},
14881461
acctest.Representation{RepType: acctest.Optional, Create: `${data.oci_database_autonomous_db_versions.test_autonomous_dw_versions.autonomous_db_versions.0.version}`},
1489-
acctest.Representation{RepType: acctest.Optional, Create: `false`}}, autonomousDatabaseRepresentationWithDefinedTagsIgnoreChanges), []string{"scheduled_operations", "db_tools_details"})),
1462+
acctest.Representation{RepType: acctest.Optional, Create: `false`}}, autonomousDatabaseRepresentationWithDefinedTagsIgnoreChanges), []string{"db_tools_details"})),
14901463
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
14911464
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#12"),
14921465
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -1522,7 +1495,7 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
15221495
[]interface{}{acctest.Representation{RepType: acctest.Optional, Create: `DW`},
15231496
acctest.Representation{RepType: acctest.Optional, Update: `true`},
15241497
acctest.Representation{RepType: acctest.Optional, Create: `${data.oci_database_autonomous_db_versions.test_autonomous_dw_versions.autonomous_db_versions.0.version}`},
1525-
acctest.Representation{RepType: acctest.Optional, Create: `false`}}, autonomousDatabaseRepresentationAutoScale), []string{"scheduled_operations", "db_tools_details"})),
1498+
acctest.Representation{RepType: acctest.Optional, Create: `false`}}, autonomousDatabaseRepresentationAutoScale), []string{"db_tools_details"})),
15261499
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
15271500
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#12"),
15281501
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -1711,5 +1684,6 @@ func DatabaseAutonomousDatabaseSweepResponseFetchOperation(client *client.Oracle
17111684
RetryPolicy: retryPolicy,
17121685
},
17131686
})
1687+
17141688
return err
17151689
}

0 commit comments

Comments
 (0)