Skip to content

Commit e33f262

Browse files
Terraform Team Automationsagarp337
Terraform Team Automation
authored and
sagarp337
committed
Added - Support for ADB-S: Cheaper Autonomous Data Guard
1 parent 4443ce0 commit e33f262

13 files changed

+931
-194
lines changed

‎internal/integrationtest/database_autonomous_cross_region_disaster_recovery_test.go‎

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

‎internal/integrationtest/database_autonomous_database_regional_wallet_management_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,11 @@ func TestDatabaseAutonomousDatabaseRegionalWalletManagementResource_basic(t *tes
6464
},
6565
),
6666
},
67-
68-
// delete before next Create
67+
//1. delete before next Create
6968
{
7069
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseRegionalWalletManagementResourceDependencies,
7170
},
72-
// verify Create with optionals
71+
//2. verify Create with optionals
7372
{
7473
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseRegionalWalletManagementResourceDependencies +
7574
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database_regional_wallet_management", "test_autonomous_database_regional_wallet_management", acctest.Optional, acctest.Create, DatabaseAutonomousDatabaseRegionalWalletManagementRepresentation),
@@ -88,7 +87,7 @@ func TestDatabaseAutonomousDatabaseRegionalWalletManagementResource_basic(t *tes
8887
},
8988
),
9089
},
91-
//1. verify updates to updatable parameters
90+
//3. verify updates to updatable parameters
9291
{
9392
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseRegionalWalletManagementResourceDependencies +
9493
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database_regional_wallet_management", "test_autonomous_database_regional_wallet_management", acctest.Optional, acctest.Update, DatabaseAutonomousDatabaseRegionalWalletManagementRepresentation),
@@ -106,7 +105,7 @@ func TestDatabaseAutonomousDatabaseRegionalWalletManagementResource_basic(t *tes
106105
},
107106
),
108107
},
109-
//2. verify singular datasource
108+
//4. verify singular datasource
110109
{
111110
Config: config +
112111
acctest.GenerateDataSourceFromRepresentationMap("oci_database_autonomous_database_regional_wallet_management", "test_autonomous_database_regional_wallet_management", acctest.Required, acctest.Create, DatabaseDatabaseAutonomousDatabaseRegionalWalletManagementSingularDataSourceRepresentation) +

‎internal/integrationtest/database_autonomous_database_resource_test.go‎

Lines changed: 42 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"context"
88
"fmt"
99
"log"
10+
"os"
1011
"strconv"
1112
"testing"
1213
"time"
@@ -99,6 +100,20 @@ var (
99100
"timeouts": acctest.RepresentationGroup{RepType: acctest.Required, Group: autonomousDatabaseTimeoutsRepresentation},
100101
}
101102

103+
DatabaseAutonomousDatabaseBackupRepresentationNew = map[string]interface{}{
104+
"autonomous_database_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_autonomous_database.test_autonomous_database.id}`},
105+
"display_name": acctest.Representation{RepType: acctest.Required, Create: `LongTerm Backup`},
106+
"is_long_term_backup": acctest.Representation{RepType: acctest.Required, Create: `true`},
107+
"retention_period_in_days": acctest.Representation{RepType: acctest.Required, Create: `90`, Update: `91`},
108+
}
109+
110+
AutonomousDatabaseFromBackupDependenciesLongTerm = DatabaseAutonomousDatabaseResourceDependencies +
111+
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database_backup", "test_autonomous_database_backup", acctest.Required, acctest.Create, DatabaseAutonomousDatabaseBackupRepresentationNew) +
112+
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Required, acctest.Create,
113+
acctest.RepresentationCopyWithNewProperties(DatabaseAutonomousDatabaseRepresentation, map[string]interface{}{
114+
"db_name": acctest.Representation{RepType: acctest.Required, Create: adbBackupSourceName},
115+
}))
116+
102117
autonomousDatabaseRepresentationForSourceFromBackupId = acctest.RepresentationCopyWithNewProperties(
103118
acctest.GetUpdatedRepresentationCopy("db_name", acctest.Representation{RepType: acctest.Required, Create: adbBackupIdName}, DatabaseAutonomousDatabaseRepresentation),
104119
map[string]interface{}{
@@ -189,6 +204,7 @@ var (
189204
"whitelisted_ips": acctest.Representation{RepType: acctest.Optional, Create: []string{`1.1.1.1/28`}, Update: []string{`1.1.1.1/28`, `2.2.2.2/28`}},
190205
"admin_password": acctest.Representation{RepType: acctest.Required, Create: `BEstrO0ng_#11`},
191206
})
207+
192208
autonomousDatabaseDGExaccRepresentation = acctest.RepresentationCopyWithNewProperties(
193209
acctest.RepresentationCopyWithRemovedProperties(acctest.GetUpdatedRepresentationCopy("db_name", acctest.Representation{RepType: acctest.Required, Create: adbExaccName}, DatabaseAutonomousDatabaseRepresentation), []string{"license_model", "db_version", "is_auto_scaling_enabled", "operations_insights_status", "admin_password", "kms_key_id", "vault_id", "autonomous_maintenance_schedule_type", "customer_contacts", "scheduled_operations"}),
194210
map[string]interface{}{
@@ -239,6 +255,12 @@ var (
239255

240256
// issue-routing-tag: database/dbaas-adb
241257
func TestResourceDatabaseAutonomousDatabaseDedicated(t *testing.T) {
258+
shouldSkipADBDtest := os.Getenv("TF_VAR_should_skip_adbd_test")
259+
260+
if shouldSkipADBDtest == "true" {
261+
t.Skip("Skipping TestDatabaseCrossRegionDisasterRecovery_basic test.\n" + "Current TF_VAR_should_skip_adbd_test=" + shouldSkipADBDtest)
262+
}
263+
242264
httpreplay.SetScenario("TestResourceDatabaseAutonomousDatabaseDedicated")
243265
defer httpreplay.SaveScenario()
244266

@@ -1091,11 +1113,11 @@ func TestResourceDatabaseAutonomousDatabaseResource_FromBackupId(t *testing.T) {
10911113
acctest.ResourceTest(t, testAccCheckDatabaseAutonomousDatabaseDestroy, []resource.TestStep{
10921114
//0. Create dependencies
10931115
{
1094-
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependencies,
1116+
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependenciesLongTerm,
10951117
},
10961118
//1. verify create
10971119
{
1098-
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependencies +
1120+
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependenciesLongTerm +
10991121
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database_from_backupid", acctest.Required, acctest.Create, autonomousDatabaseRepresentationForSourceFromBackupId),
11001122
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
11011123
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
@@ -1116,11 +1138,11 @@ func TestResourceDatabaseAutonomousDatabaseResource_FromBackupId(t *testing.T) {
11161138
},
11171139
//2. delete before next Create
11181140
{
1119-
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependencies,
1141+
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependenciesLongTerm,
11201142
},
11211143
//3. verify Create with optionals
11221144
{
1123-
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependencies +
1145+
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependenciesLongTerm +
11241146
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database_from_backupid", acctest.Optional, acctest.Create, autonomousDatabaseRepresentationForSourceFromBackupId),
11251147
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
11261148
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
@@ -1155,13 +1177,13 @@ func TestResourceDatabaseAutonomousDatabaseResource_FromBackupTimestamp(t *testi
11551177
resourceName := "oci_database_autonomous_database.test_autonomous_database_from_backuptimestamp"
11561178

11571179
acctest.ResourceTest(t, testAccCheckDatabaseAutonomousDatabaseDestroy, []resource.TestStep{
1158-
//1. Create dependencies
1180+
//0. Create dependencies
11591181
{
1160-
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependencies,
1182+
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependenciesLongTerm,
11611183
},
1162-
//2. verify create
1184+
//1. verify create
11631185
{
1164-
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependencies +
1186+
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependenciesLongTerm +
11651187
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database_from_backuptimestamp", acctest.Required, acctest.Create, autonomousDatabaseRepresentationForSourceFromBackupTimestamp),
11661188
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
11671189
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
@@ -1180,13 +1202,13 @@ func TestResourceDatabaseAutonomousDatabaseResource_FromBackupTimestamp(t *testi
11801202
},
11811203
),
11821204
},
1183-
//3. delete before next Create
1205+
//2. delete before next Create
11841206
{
1185-
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependencies,
1207+
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependenciesLongTerm,
11861208
},
1187-
//4. verify Create with optionals
1209+
//3. verify Create with optionals
11881210
{
1189-
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependencies +
1211+
Config: config + compartmentIdVariableStr + AutonomousDatabaseFromBackupDependenciesLongTerm +
11901212
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database_from_backuptimestamp", acctest.Optional, acctest.Create, autonomousDatabaseRepresentationForSourceFromBackupTimestamp),
11911213
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
11921214
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
@@ -1623,7 +1645,7 @@ func TestResourceDatabaseAutonomousDatabaseResource_dbVersion(t *testing.T) {
16231645
var resId, resId2 string
16241646

16251647
acctest.ResourceTest(t, testAccCheckDatabaseAutonomousDatabaseDestroy, []resource.TestStep{
1626-
// verify Create with optionals
1648+
//0. verify Create with optionals
16271649
{
16281650
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
16291651
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create, autonomousDatabaseDbVersionUpdateRepresentation),
@@ -1648,16 +1670,11 @@ func TestResourceDatabaseAutonomousDatabaseResource_dbVersion(t *testing.T) {
16481670

16491671
func(s *terraform.State) (err error) {
16501672
resId, err = acctest.FromInstanceState(s, resourceName, "id")
1651-
if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
1652-
if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
1653-
return errExport
1654-
}
1655-
}
16561673
return err
16571674
},
16581675
),
16591676
},
1660-
// verify Update to only db_version
1677+
//1. verify Update to only db_version
16611678
{
16621679
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
16631680
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Update, autonomousDatabaseDbVersionUpdateRepresentation),
@@ -1689,7 +1706,7 @@ func TestResourceDatabaseAutonomousDatabaseResource_dbVersion(t *testing.T) {
16891706
},
16901707
),
16911708
},
1692-
// verify Update of parameters except db_version
1709+
//2. verify Update of parameters except db_version
16931710
{
16941711
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
16951712
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Update,
@@ -1771,11 +1788,6 @@ func TestResourceDatabaseAutonomousDatabaseResource_dataGuard(t *testing.T) {
17711788

17721789
func(s *terraform.State) (err error) {
17731790
resId, err = acctest.FromInstanceState(s, resourceName, "id")
1774-
if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
1775-
if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
1776-
return errExport
1777-
}
1778-
}
17791791
return err
17801792
},
17811793
),
@@ -2089,11 +2101,6 @@ func TestResourceDatabaseAutonomousDatabaseResource_switchover(t *testing.T) {
20892101

20902102
func(s *terraform.State) (err error) {
20912103
resId, err = acctest.FromInstanceState(s, resourceName, "id")
2092-
if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
2093-
if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
2094-
return errExport
2095-
}
2096-
}
20972104
return err
20982105
},
20992106
),
@@ -2409,7 +2416,7 @@ func TestResourceDatabaseAutonomousDatabaseResource_refreshableClone(t *testing.
24092416
//resource.TestCheckResourceAttrSet(clonesDatasourceName, "autonomous_databases.0.refreshable_mode"),
24102417
resource.TestCheckResourceAttrSet(clonesDatasourceName, "autonomous_databases.0.refreshable_status"),
24112418
resource.TestCheckResourceAttrSet(clonesDatasourceName, "autonomous_databases.0.source_id"),
2412-
//resource.TestCheckResourceAttr(clonesDatasourceName, "autonomous_databases.0.standby_db.#", "0"),
2419+
resource.TestCheckResourceAttr(clonesDatasourceName, "autonomous_databases.0.standby_db.#", "1"),
24132420
resource.TestCheckResourceAttrSet(clonesDatasourceName, "autonomous_databases.0.time_created"),
24142421
//resource.TestCheckResourceAttrSet(clonesDatasourceName, "autonomous_databases.0.time_deletion_of_free_autonomous_database"),
24152422
resource.TestCheckResourceAttrSet(clonesDatasourceName, "autonomous_databases.0.time_maintenance_begin"),
@@ -3142,11 +3149,6 @@ func TestResourceDatabaseAutonomousDatabaseResource_ConfigureKey(t *testing.T) {
31423149

31433150
func(s *terraform.State) (err error) {
31443151
resId, err = acctest.FromInstanceState(s, resourceName, "id")
3145-
if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
3146-
if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
3147-
return errExport
3148-
}
3149-
}
31503152
return err
31513153
},
31523154
),
@@ -3284,7 +3286,7 @@ func TestDatabaseAutonomousDatabaseResource_ecpu(t *testing.T) {
32843286
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create, autonomousDatabaseRepresentationEcpu), "database", "autonomousDatabase", t)
32853287

32863288
acctest.ResourceTest(t, testAccCheckDatabaseAutonomousDatabaseDestroy, []resource.TestStep{
3287-
// verify Create
3289+
//0. verify Create
32883290
{
32893291
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
32903292
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Required, acctest.Create, autonomousDatabaseRepresentationEcpu),
@@ -3304,12 +3306,11 @@ func TestDatabaseAutonomousDatabaseResource_ecpu(t *testing.T) {
33043306
},
33053307
),
33063308
},
3307-
3308-
// delete before next Create
3309+
//1. delete before next Create
33093310
{
33103311
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies,
33113312
},
3312-
// verify Create with optionals and long dbName
3313+
//2. verify Create with optionals and long dbName
33133314
{
33143315
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
33153316
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Required, acctest.Create, autonomousDatabaseRepresentationEcpu),
@@ -3342,16 +3343,11 @@ func TestDatabaseAutonomousDatabaseResource_ecpu(t *testing.T) {
33423343

33433344
func(s *terraform.State) (err error) {
33443345
resId, err = acctest.FromInstanceState(s, resourceName, "id")
3345-
if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
3346-
if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
3347-
return errExport
3348-
}
3349-
}
33503346
return err
33513347
},
33523348
),
33533349
},
3354-
// verify ecpu update
3350+
//3. verify ecpu update
33553351
{
33563352
Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
33573353
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Required, acctest.Create,

0 commit comments

Comments
 (0)