Skip to content

Commit 661af49

Browse files
Harshita TapariaMaxrovr
Harshita Taparia
authored and
Maxrovr
committed
Bug Fix for the ACD Version selection using env variable and vmNetwork should not consider state for calculating hash
1 parent bd7f2f3 commit 661af49

File tree

3 files changed

+3
-109
lines changed

3 files changed

+3
-109
lines changed

‎internal/integrationtest/database_autonomous_container_database_dataguard_association_resource_test.go‎

Lines changed: 0 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -157,109 +157,3 @@ func TestDatabaseAutonomousContainerDatabaseDataguardAssociationResource_update(
157157
},
158158
})
159159
}
160-
161-
// issue-routing-tag: database/dbaas-atp-d
162-
func TestDatabaseExaccAutonomousContainerDatabaseDataguardAssociationResource_update(t *testing.T) {
163-
164-
httpreplay.SetScenario("TestDatabaseExaccAutonomousContainerDatabaseDataguardAssociationResource_update")
165-
defer httpreplay.SaveScenario()
166-
167-
config := acctest.ProviderTestConfig()
168-
169-
compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
170-
compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
171-
172-
datasourceName := "data.oci_database_autonomous_container_database_dataguard_associations.exacc_test_autonomous_container_database_dataguard_associations"
173-
singularDatasourceName := "data.oci_database_autonomous_container_database_dataguard_association.exacc_test_autonomous_container_database_dataguard_association"
174-
resourceName := "oci_database_autonomous_container_database_dataguard_association.exacc_test_autonomous_container_database_dataguard_association"
175-
acctest.SaveConfigContent("", "", "", t)
176-
177-
acctest.ResourceTest(t, nil, []resource.TestStep{
178-
{
179-
Config: config +
180-
acctest.GenerateDataSourceFromRepresentationMap("oci_database_autonomous_container_database_dataguard_associations", "exacc_test_autonomous_container_database_dataguard_associations", acctest.Optional, acctest.Create, DatabaseExaccAutonomousContainerDatabaseDataguardAssociationDataSourceRepresentation) +
181-
compartmentIdVariableStr + ExaccACDFSFOResourceConfig,
182-
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
183-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_id"),
184-
185-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.#"),
186-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.0.autonomous_container_database_id"),
187-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.0.id"),
188-
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_database_dataguard_associations.0.is_automatic_failover_enabled", "true"),
189-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.0.peer_autonomous_container_database_dataguard_association_id"),
190-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.0.peer_autonomous_container_database_id"),
191-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.0.peer_lifecycle_state"),
192-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.0.peer_role"),
193-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.0.protection_mode"),
194-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.0.role"),
195-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.0.state"),
196-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_database_dataguard_associations.0.time_created"),
197-
),
198-
},
199-
// verify singular datasource
200-
{
201-
Config: config +
202-
acctest.GenerateDataSourceFromRepresentationMap("oci_database_autonomous_container_database_dataguard_associations", "exacc_test_autonomous_container_database_dataguard_associations", acctest.Optional, acctest.Create, DatabaseExaccAutonomousContainerDatabaseDataguardAssociationDataSourceRepresentation) +
203-
acctest.GenerateDataSourceFromRepresentationMap("oci_database_autonomous_container_database_dataguard_association", "exacc_test_autonomous_container_database_dataguard_association", acctest.Optional, acctest.Create, DatabaseAutonomousContainerExaccAutonomousContainerDatabaseDataguardAssociationSingularDataSourceRepresentation) +
204-
compartmentIdVariableStr + ExaccACDFSFOResourceConfig,
205-
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
206-
resource.TestCheckResourceAttrSet(singularDatasourceName, "autonomous_container_database_dataguard_association_id"),
207-
resource.TestCheckResourceAttrSet(singularDatasourceName, "autonomous_container_database_id"),
208-
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_database_dataguard_associations.0.is_automatic_failover_enabled", "true"),
209-
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
210-
resource.TestCheckResourceAttrSet(singularDatasourceName, "peer_autonomous_container_database_dataguard_association_id"),
211-
resource.TestCheckResourceAttrSet(singularDatasourceName, "peer_autonomous_container_database_id"),
212-
resource.TestCheckResourceAttrSet(singularDatasourceName, "peer_lifecycle_state"),
213-
resource.TestCheckResourceAttrSet(singularDatasourceName, "peer_role"),
214-
resource.TestCheckResourceAttrSet(singularDatasourceName, "protection_mode"),
215-
resource.TestCheckResourceAttrSet(singularDatasourceName, "role"),
216-
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
217-
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
218-
),
219-
},
220-
// verify create with optional parameters
221-
{
222-
Config: config +
223-
acctest.GenerateDataSourceFromRepresentationMap("oci_database_autonomous_container_database_dataguard_associations", "exacc_test_autonomous_container_database_dataguard_associations", acctest.Optional, acctest.Create, DatabaseExaccAutonomousContainerDatabaseDataguardAssociationDataSourceRepresentation) +
224-
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_container_database_dataguard_association", "exacc_test_autonomous_container_database_dataguard_association", acctest.Optional, acctest.Create, exaccAutonomousContainerDatabaseDataguardAssociationResourceRepresentation) +
225-
compartmentIdVariableStr + ExaccACDFSFOResourceConfig,
226-
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
227-
resource.TestCheckResourceAttrSet(resourceName, "autonomous_container_database_dataguard_association_id"),
228-
resource.TestCheckResourceAttrSet(resourceName, "autonomous_container_database_id"),
229-
230-
resource.TestCheckResourceAttrSet(resourceName, "id"),
231-
resource.TestCheckResourceAttr(resourceName, "is_automatic_failover_enabled", "true"),
232-
resource.TestCheckResourceAttrSet(resourceName, "peer_autonomous_container_database_dataguard_association_id"),
233-
resource.TestCheckResourceAttrSet(resourceName, "peer_autonomous_container_database_id"),
234-
resource.TestCheckResourceAttrSet(resourceName, "peer_lifecycle_state"),
235-
resource.TestCheckResourceAttrSet(resourceName, "peer_role"),
236-
resource.TestCheckResourceAttrSet(resourceName, "protection_mode"),
237-
resource.TestCheckResourceAttrSet(resourceName, "role"),
238-
resource.TestCheckResourceAttrSet(resourceName, "state"),
239-
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
240-
),
241-
},
242-
//verify update
243-
{
244-
Config: config +
245-
acctest.GenerateDataSourceFromRepresentationMap("oci_database_autonomous_container_database_dataguard_associations", "exacc_test_autonomous_container_database_dataguard_associations", acctest.Optional, acctest.Create, DatabaseExaccAutonomousContainerDatabaseDataguardAssociationDataSourceRepresentation) +
246-
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_container_database_dataguard_association", "exacc_test_autonomous_container_database_dataguard_association", acctest.Optional, acctest.Update, exaccAutonomousContainerDatabaseDataguardAssociationResourceRepresentation) +
247-
compartmentIdVariableStr + ExaccACDFSFOResourceConfig,
248-
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
249-
resource.TestCheckResourceAttrSet(resourceName, "autonomous_container_database_dataguard_association_id"),
250-
resource.TestCheckResourceAttrSet(resourceName, "autonomous_container_database_id"),
251-
252-
resource.TestCheckResourceAttrSet(resourceName, "id"),
253-
resource.TestCheckResourceAttr(resourceName, "is_automatic_failover_enabled", "false"),
254-
resource.TestCheckResourceAttrSet(resourceName, "peer_autonomous_container_database_dataguard_association_id"),
255-
resource.TestCheckResourceAttrSet(resourceName, "peer_autonomous_container_database_id"),
256-
resource.TestCheckResourceAttrSet(resourceName, "peer_lifecycle_state"),
257-
resource.TestCheckResourceAttrSet(resourceName, "peer_role"),
258-
resource.TestCheckResourceAttrSet(resourceName, "protection_mode"),
259-
resource.TestCheckResourceAttrSet(resourceName, "role"),
260-
resource.TestCheckResourceAttrSet(resourceName, "state"),
261-
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
262-
),
263-
},
264-
})
265-
}

‎internal/integrationtest/database_autonomous_container_database_resource_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var (
5757
"maintenance_window_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsRepresentation},
5858
"service_level_agreement_type": acctest.Representation{RepType: acctest.Optional, Create: `STANDARD`},
5959
"db_name": acctest.Representation{RepType: acctest.Optional, Create: `DBNAME`},
60-
"db_version": acctest.Representation{RepType: acctest.Required, Create: `19.23.0.1.0`},
60+
"db_version": acctest.Representation{RepType: acctest.Required, Create: utils.GetEnvSettingWithDefault("exacc_acd_db_version", "19.24.0.1.0")},
6161
"is_dst_file_update_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
6262
}
6363

@@ -76,7 +76,7 @@ var (
7676
"maintenance_window_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsRepresentation},
7777
"service_level_agreement_type": acctest.Representation{RepType: acctest.Optional, Create: `STANDARD`},
7878
"db_name": acctest.Representation{RepType: acctest.Optional, Create: `DBNAME`},
79-
"db_version": acctest.Representation{RepType: acctest.Required, Create: `19.22.0.1.0`},
79+
"db_version": acctest.Representation{RepType: acctest.Required, Create: utils.GetEnvSettingWithDefault("exacc_acd_db_version", "19.22.0.1.0")},
8080
"is_dst_file_update_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
8181
}
8282

‎internal/integrationtest/database_maintenance_run_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ var (
8282
"maintenance_window_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsRepresentation},
8383
"service_level_agreement_type": acctest.Representation{RepType: acctest.Optional, Create: `STANDARD`},
8484
"db_name": acctest.Representation{RepType: acctest.Optional, Create: `DBNAME2`},
85-
"db_version": acctest.Representation{RepType: acctest.Required, Create: `19.22.0.1.0`},
85+
"db_version": acctest.Representation{RepType: acctest.Required, Create: utils.GetEnvSettingWithDefault("mr_acd_db_version", "19.22.0.1.0")},
8686
"is_dst_file_update_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
8787
}
8888

0 commit comments

Comments
 (0)