Skip to content

Commit ba5a51c

Browse files
pvkrishnachaitanyapvkrishnachaitanya
committed
Revert "Added - Support for Long-term backup retention Phase 1 | ExaDB-D"
This reverts commit 3a3d274.
1 parent a4c1638 commit ba5a51c

11 files changed

+8
-494
lines changed

‎internal/integrationtest/database_autonomous_database_test.go‎

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -63,43 +63,6 @@ var (
6363
adbMemberName = utils.RandomString(1, utils.CharsetWithoutDigits) + utils.RandomString(13, utils.Charset)
6464

6565
DatabaseAutonomousDatabaseRepresentation = map[string]interface{}{
66-
<<<<<<< ours
67-
"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
68-
"admin_password": acctest.Representation{RepType: acctest.Optional, Create: `BEstrO0ng_#11`, Update: `BEstrO0ng_#12`},
69-
"are_primary_whitelisted_ips_used": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
70-
"auto_refresh_frequency_in_seconds": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
71-
"auto_refresh_point_lag_in_seconds": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
72-
"autonomous_maintenance_schedule_type": acctest.Representation{RepType: acctest.Optional, Create: `REGULAR`},
73-
"backup_retention_period_in_days": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
74-
"byol_compute_count_limit": acctest.Representation{RepType: acctest.Optional, Create: `1.0`, Update: `1.1`},
75-
"character_set": acctest.Representation{RepType: acctest.Optional, Create: `AL32UTF8`},
76-
"clone_type": acctest.Representation{RepType: acctest.Optional, Create: `FULL`},
77-
"compute_count": acctest.Representation{RepType: acctest.Optional, Create: `1.0`, Update: `1.1`},
78-
"compute_model": acctest.Representation{RepType: acctest.Optional, Create: `ECPU`, Update: `OCPU`},
79-
"cpu_core_count": acctest.Representation{RepType: acctest.Optional, Create: `1`},
80-
"customer_contacts": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseCustomerContactsRepresentation},
81-
"data_safe_status": acctest.Representation{RepType: acctest.Optional, Create: `NOT_REGISTERED`},
82-
"data_storage_size_in_gb": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
83-
"data_storage_size_in_tbs": acctest.Representation{RepType: acctest.Optional, Create: `1`},
84-
"database_edition": acctest.Representation{RepType: acctest.Optional, Create: `STANDARD_EDITION`, Update: `ENTERPRISE_EDITION`},
85-
"db_name": acctest.Representation{RepType: acctest.Optional, Create: `adbName`, Update: `dbName2`},
86-
"db_tools_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseDbToolsDetailsRepresentation},
87-
"db_workload": acctest.Representation{RepType: acctest.Optional, Create: `OLTP`, Update: `DW`},
88-
"defined_tags": acctest.Representation{RepType: acctest.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")}`},
89-
"disaster_recovery_type": acctest.Representation{RepType: acctest.Optional, Create: `ADG`},
90-
"display_name": acctest.Representation{RepType: acctest.Optional, Create: `example_autonomous_database`, Update: `displayName2`},
91-
"encryption_key": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseEncryptionKeyRepresentation},
92-
"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
93-
"in_memory_percentage": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
94-
"is_access_control_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
95-
"is_auto_scaling_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
96-
"is_auto_scaling_for_storage_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
97-
"is_data_guard_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
98-
"is_dedicated": acctest.Representation{RepType: acctest.Optional, Create: `false`},
99-
"is_dev_tier": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
100-
"is_local_data_guard_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
101-
"is_mtls_connection_required": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
102-
=======
10366
"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
10467
"cpu_core_count": acctest.Representation{RepType: acctest.Required, Create: `1`},
10568
"data_storage_size_in_tbs": acctest.Representation{RepType: acctest.Required, Create: `1`},
@@ -116,7 +79,6 @@ var (
11679
"is_dedicated": acctest.Representation{RepType: acctest.Optional, Create: `false`},
11780
"is_mtls_connection_required": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
11881
"autonomous_maintenance_schedule_type": acctest.Representation{RepType: acctest.Optional, Create: `REGULAR`},
119-
>>>>>>> theirs
12082
"is_preview_version_with_service_terms_accepted": acctest.Representation{RepType: acctest.Optional, Create: `false`},
12183
"customer_contacts": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseCustomerContactsRepresentation},
12284
"license_model": acctest.Representation{RepType: acctest.Optional, Create: `LICENSE_INCLUDED`},
@@ -1299,19 +1261,7 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
12991261
"is_auto_scaling_enabled": acctest.Representation{RepType: acctest.Optional, Update: `true`},
13001262
})),
13011263
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
1302-
<<<<<<< ours
1303-
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
1304-
resource.TestCheckResourceAttr(resourceName, "are_primary_whitelisted_ips_used", "false"),
1305-
resource.TestCheckResourceAttr(resourceName, "auto_refresh_frequency_in_seconds", "10"),
1306-
resource.TestCheckResourceAttr(resourceName, "auto_refresh_point_lag_in_seconds", "10"),
1307-
resource.TestCheckResourceAttr(resourceName, "autonomous_maintenance_schedule_type", "REGULAR"),
1308-
resource.TestCheckResourceAttr(resourceName, "backup_retention_period_in_days", "10"),
1309-
resource.TestCheckResourceAttr(resourceName, "byol_compute_count_limit", "1.0"),
1310-
resource.TestCheckResourceAttr(resourceName, "character_set", "AL32UTF8"),
1311-
resource.TestCheckResourceAttr(resourceName, "clone_type", "FULL"),
1312-
=======
13131264
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#12"),
1314-
>>>>>>> theirs
13151265
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
13161266
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "1"),
13171267
resource.TestCheckResourceAttr(resourceName, "data_storage_size_in_tbs", "1"),
@@ -1348,23 +1298,8 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
13481298
"is_auto_scaling_for_storage_enabled": acctest.Representation{RepType: acctest.Optional, Update: `true`},
13491299
})),
13501300
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
1351-
<<<<<<< ours
1352-
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
1353-
resource.TestCheckResourceAttr(resourceName, "are_primary_whitelisted_ips_used", "false"),
1354-
resource.TestCheckResourceAttr(resourceName, "auto_refresh_frequency_in_seconds", "10"),
1355-
resource.TestCheckResourceAttr(resourceName, "auto_refresh_point_lag_in_seconds", "10"),
1356-
resource.TestCheckResourceAttr(resourceName, "autonomous_maintenance_schedule_type", "REGULAR"),
1357-
resource.TestCheckResourceAttr(resourceName, "backup_retention_period_in_days", "10"),
1358-
resource.TestCheckResourceAttr(resourceName, "byol_compute_count_limit", "1.0"),
1359-
resource.TestCheckResourceAttr(resourceName, "character_set", "AL32UTF8"),
1360-
resource.TestCheckResourceAttr(resourceName, "clone_type", "FULL"),
1361-
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
1362-
resource.TestCheckResourceAttr(resourceName, "compute_count", "1.0"),
1363-
resource.TestCheckResourceAttr(resourceName, "compute_model", "ECPU"),
1364-
=======
13651301
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#12"),
13661302
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
1367-
>>>>>>> theirs
13681303
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "1"),
13691304
resource.TestCheckResourceAttr(resourceName, "data_storage_size_in_tbs", "1"),
13701305
resource.TestCheckResourceAttr(resourceName, "db_name", adbName),
@@ -1402,17 +1337,6 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
14021337
})),
14031338
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
14041339
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#12"),
1405-
<<<<<<< ours
1406-
resource.TestCheckResourceAttr(resourceName, "are_primary_whitelisted_ips_used", "true"),
1407-
resource.TestCheckResourceAttr(resourceName, "auto_refresh_frequency_in_seconds", "11"),
1408-
resource.TestCheckResourceAttr(resourceName, "auto_refresh_point_lag_in_seconds", "11"),
1409-
resource.TestCheckResourceAttr(resourceName, "autonomous_maintenance_schedule_type", "REGULAR"),
1410-
resource.TestCheckResourceAttr(resourceName, "backup_retention_period_in_days", "11"),
1411-
resource.TestCheckResourceAttr(resourceName, "byol_compute_count_limit", "1.1"),
1412-
resource.TestCheckResourceAttr(resourceName, "character_set", "AL32UTF8"),
1413-
resource.TestCheckResourceAttr(resourceName, "clone_type", "FULL"),
1414-
=======
1415-
>>>>>>> theirs
14161340
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
14171341
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "1"),
14181342
resource.TestCheckResourceAttr(resourceName, "data_safe_status", "NOT_REGISTERED"),
@@ -1454,14 +1378,7 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
14541378
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.#", "1"),
14551379
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.actual_used_data_storage_size_in_tbs"),
14561380
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.allocated_storage_size_in_tbs"),
1457-
<<<<<<< ours
1458-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.apex_details.#", "1"),
1459-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.are_primary_whitelisted_ips_used", "true"),
1460-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.auto_refresh_frequency_in_seconds", "11"),
1461-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.auto_refresh_point_lag_in_seconds", "11"),
1462-
=======
14631381
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.apex_details.#"),
1464-
>>>>>>> theirs
14651382
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.autonomous_maintenance_schedule_type", "REGULAR"),
14661383
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.availability_domain"),
14671384
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.backup_config.#", "1"),
@@ -1547,17 +1464,7 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
15471464
acctest.GenerateDataSourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Required, acctest.Create, DatabaseDatabaseAutonomousDatabaseSingularDataSourceRepresentation) +
15481465
compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceConfig,
15491466
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
1550-
<<<<<<< ours
1551-
1552-
resource.TestCheckResourceAttrSet(singularDatasourceName, "actual_used_data_storage_size_in_tbs"),
1553-
resource.TestCheckResourceAttrSet(singularDatasourceName, "allocated_storage_size_in_tbs"),
1554-
resource.TestCheckResourceAttr(singularDatasourceName, "apex_details.#", "1"),
1555-
resource.TestCheckResourceAttr(singularDatasourceName, "are_primary_whitelisted_ips_used", "true"),
1556-
resource.TestCheckResourceAttr(singularDatasourceName, "auto_refresh_frequency_in_seconds", "11"),
1557-
resource.TestCheckResourceAttr(singularDatasourceName, "auto_refresh_point_lag_in_seconds", "11"),
1558-
=======
15591467
resource.TestCheckResourceAttrSet(singularDatasourceName, "autonomous_database_id"),
1560-
>>>>>>> theirs
15611468
resource.TestCheckResourceAttr(singularDatasourceName, "autonomous_maintenance_schedule_type", "REGULAR"),
15621469
resource.TestCheckResourceAttrSet(singularDatasourceName, "availability_domain"),
15631470
resource.TestCheckResourceAttr(singularDatasourceName, "backup_config.#", "1"),

0 commit comments

Comments
 (0)