Skip to content

Commit 1e9a753

Browse files
varmax2511varmax2511
committed
fix for database tests
1 parent 354303d commit 1e9a753

5 files changed

+36
-31
lines changed

‎oci/database_autonomous_exadata_infrastructure_resource.go‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1111

1212
oci_database "github.com/oracle/oci-go-sdk/v42/database"
13-
oci_work_requests "github.com/oracle/oci-go-sdk/v42/workrequests"
1413
)
1514

1615
func init() {
@@ -295,7 +294,6 @@ func createDatabaseAutonomousExadataInfrastructure(d *schema.ResourceData, m int
295294
sync := &DatabaseAutonomousExadataInfrastructureResourceCrud{}
296295
sync.D = d
297296
sync.Client = m.(*OracleClients).databaseClient()
298-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
299297

300298
return CreateResource(d, sync)
301299
}
@@ -312,7 +310,6 @@ func updateDatabaseAutonomousExadataInfrastructure(d *schema.ResourceData, m int
312310
sync := &DatabaseAutonomousExadataInfrastructureResourceCrud{}
313311
sync.D = d
314312
sync.Client = m.(*OracleClients).databaseClient()
315-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
316313

317314
return UpdateResource(d, sync)
318315
}
@@ -322,7 +319,6 @@ func deleteDatabaseAutonomousExadataInfrastructure(d *schema.ResourceData, m int
322319
sync.D = d
323320
sync.Client = m.(*OracleClients).databaseClient()
324321
sync.DisableNotFoundRetries = true
325-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
326322

327323
return DeleteResource(d, sync)
328324
}
@@ -332,7 +328,6 @@ type DatabaseAutonomousExadataInfrastructureResourceCrud struct {
332328
Client *oci_database.DatabaseClient
333329
Res *oci_database.AutonomousExadataInfrastructure
334330
DisableNotFoundRetries bool
335-
WorkRequestClient *oci_work_requests.WorkRequestClient
336331
}
337332

338333
func (s *DatabaseAutonomousExadataInfrastructureResourceCrud) ID() string {
@@ -806,17 +801,9 @@ func (s *DatabaseAutonomousExadataInfrastructureResourceCrud) updateCompartment(
806801

807802
changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "database")
808803

809-
response, err := s.Client.ChangeAutonomousExadataInfrastructureCompartment(context.Background(), changeCompartmentRequest)
804+
_, err := s.Client.ChangeAutonomousExadataInfrastructureCompartment(context.Background(), changeCompartmentRequest)
810805
if err != nil {
811806
return err
812807
}
813-
814-
workId := response.OpcWorkRequestId
815-
if workId != nil {
816-
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "autonomousExadataInfrastructure", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
817-
if err != nil {
818-
return err
819-
}
820-
}
821808
return nil
822809
}

‎oci/database_cloud_exadata_infrastructure_test.go‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,23 @@ var (
5656
"days_of_week": RepresentationGroup{Optional, cloudExadataInfrastructureMaintenanceWindowDaysOfWeekRepresentation},
5757
"hours_of_day": Representation{repType: Optional, create: []string{`4`}, update: []string{`8`}},
5858
"lead_time_in_weeks": Representation{repType: Optional, create: `10`, update: `11`},
59-
"months": RepresentationGroup{Optional, cloudExadataInfrastructureMaintenanceWindowMonthsRepresentation},
59+
"months": []RepresentationGroup{{Optional, cloudExadataInfrastructureMaintenanceWindowMonthsRepresentation}, {Optional, cloudExadataInfrastructureMaintenanceWindowMonthsRepresentation2}, {Optional, cloudExadataInfrastructureMaintenanceWindowMonthsRepresentation3}, {Optional, cloudExadataInfrastructureMaintenanceWindowMonthsRepresentation4}},
6060
"weeks_of_month": Representation{repType: Optional, create: []string{`1`}, update: []string{`2`}},
6161
}
6262
cloudExadataInfrastructureMaintenanceWindowDaysOfWeekRepresentation = map[string]interface{}{
6363
"name": Representation{repType: Required, create: `MONDAY`, update: `TUESDAY`},
6464
}
6565
cloudExadataInfrastructureMaintenanceWindowMonthsRepresentation = map[string]interface{}{
66-
"name": Representation{repType: Required, create: `APRIL`, update: `MAY`},
66+
"name": Representation{repType: Required, create: `MAY`, update: `JUNE`},
67+
}
68+
cloudExadataInfrastructureMaintenanceWindowMonthsRepresentation2 = map[string]interface{}{
69+
"name": Representation{repType: Required, create: `FEBRUARY`, update: `MARCH`},
70+
}
71+
cloudExadataInfrastructureMaintenanceWindowMonthsRepresentation3 = map[string]interface{}{
72+
"name": Representation{repType: Required, create: `AUGUST`, update: `SEPTEMBER`},
73+
}
74+
cloudExadataInfrastructureMaintenanceWindowMonthsRepresentation4 = map[string]interface{}{
75+
"name": Representation{repType: Required, create: `NOVEMBER`, update: `DECEMBER`},
6776
}
6877

6978
CloudExadataInfrastructureResourceDependencies = AvailabilityDomainConfig +
@@ -137,8 +146,8 @@ func TestDatabaseCloudExadataInfrastructureResource_basic(t *testing.T) {
137146
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.days_of_week.0.name", "MONDAY"),
138147
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.hours_of_day.#", "1"),
139148
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.lead_time_in_weeks", "10"),
140-
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.#", "1"),
141-
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.0.name", "APRIL"),
149+
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.#", "4"),
150+
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.0.name", "MAY"),
142151
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.preference", "CUSTOM_PREFERENCE"),
143152
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.weeks_of_month.#", "1"),
144153
resource.TestCheckResourceAttr(resourceName, "shape", "Exadata.X8M"),
@@ -177,8 +186,8 @@ func TestDatabaseCloudExadataInfrastructureResource_basic(t *testing.T) {
177186
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.days_of_week.0.name", "MONDAY"),
178187
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.hours_of_day.#", "1"),
179188
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.lead_time_in_weeks", "10"),
180-
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.#", "1"),
181-
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.0.name", "APRIL"),
189+
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.#", "4"),
190+
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.0.name", "MAY"),
182191
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.preference", "CUSTOM_PREFERENCE"),
183192
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.weeks_of_month.#", "1"),
184193
resource.TestCheckResourceAttr(resourceName, "shape", "Exadata.X8M"),
@@ -212,8 +221,8 @@ func TestDatabaseCloudExadataInfrastructureResource_basic(t *testing.T) {
212221
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.days_of_week.0.name", "TUESDAY"),
213222
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.hours_of_day.#", "1"),
214223
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.lead_time_in_weeks", "11"),
215-
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.#", "1"),
216-
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.0.name", "MAY"),
224+
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.#", "4"),
225+
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.0.name", "JUNE"),
217226
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.preference", "CUSTOM_PREFERENCE"),
218227
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.weeks_of_month.#", "1"),
219228
resource.TestCheckResourceAttr(resourceName, "shape", "Exadata.X8M"),
@@ -255,8 +264,8 @@ func TestDatabaseCloudExadataInfrastructureResource_basic(t *testing.T) {
255264
resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.maintenance_window.0.days_of_week.0.name", "TUESDAY"),
256265
resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.maintenance_window.0.hours_of_day.#", "1"),
257266
resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.maintenance_window.0.lead_time_in_weeks", "11"),
258-
resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.maintenance_window.0.months.#", "1"),
259-
resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.maintenance_window.0.months.0.name", "MAY"),
267+
resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.maintenance_window.0.months.#", "4"),
268+
resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.maintenance_window.0.months.0.name", "JUNE"),
260269
resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.maintenance_window.0.preference", "CUSTOM_PREFERENCE"),
261270
resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.maintenance_window.0.weeks_of_month.#", "1"),
262271
//resource.TestCheckResourceAttrSet(datasourceName, "cloud_exadata_infrastructures.0.next_maintenance_run_id"), // null for fake resource
@@ -289,8 +298,8 @@ func TestDatabaseCloudExadataInfrastructureResource_basic(t *testing.T) {
289298
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.days_of_week.0.name", "TUESDAY"),
290299
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.hours_of_day.#", "1"),
291300
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.lead_time_in_weeks", "11"),
292-
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.months.#", "1"),
293-
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.months.0.name", "MAY"),
301+
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.months.#", "4"),
302+
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.months.0.name", "JUNE"),
294303
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.preference", "CUSTOM_PREFERENCE"),
295304
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.weeks_of_month.#", "1"),
296305
//resource.TestCheckResourceAttrSet(singularDatasourceName, "next_maintenance_run_id"), // null for fake resource

‎oci/database_db_system_resource_exadata_test.go‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,18 @@ func TestResourceDatabaseDBSystemExaData(t *testing.T) {
234234
}
235235
hours_of_day = ["4"]
236236
lead_time_in_weeks = 11
237-
months {
237+
months {
238+
name = "FEBRUARY"
239+
}
240+
months {
238241
name = "MAY"
239242
}
243+
months {
244+
name = "AUGUST"
245+
}
246+
months {
247+
name = "NOVEMBER"
248+
}
240249
weeks_of_month = ["2"]
241250
}
242251
nsg_ids = ["${oci_core_network_security_group.test_network_security_group2.id}"]
@@ -284,8 +293,8 @@ func TestResourceDatabaseDBSystemExaData(t *testing.T) {
284293
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "maintenance_window.0.days_of_week.0.name", "TUESDAY"),
285294
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "maintenance_window.0.hours_of_day.#", "1"),
286295
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "maintenance_window.0.lead_time_in_weeks", "11"),
287-
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "maintenance_window.0.months.#", "1"),
288-
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "maintenance_window.0.months.0.name", "MAY"),
296+
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "maintenance_window.0.months.#", "4"),
297+
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "maintenance_window.0.months.0.name", "FEBRUARY"),
289298
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "maintenance_window.0.preference", "CUSTOM_PREFERENCE"),
290299
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "maintenance_window.0.weeks_of_month.#", "1"),
291300
),

‎oci/database_external_container_database_management_resource.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ func (s *DatabaseExternalContainerDatabaseManagementResourceCrud) Delete() error
265265

266266
workId := response.OpcWorkRequestId
267267
if workId != nil {
268-
_, err := WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "externalContainerDatabase", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
268+
_, err := WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "externalContainerDatabase", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
269269
if err != nil {
270270
return err
271271
}

‎oci/database_external_non_container_database_management_resource.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ func (s *DatabaseExternalNonContainerDatabaseManagementResourceCrud) Delete() er
263263

264264
workId := response.OpcWorkRequestId
265265
if workId != nil {
266-
_, err := WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "externalNonContainerDatabase", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
266+
_, err := WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "externalNonContainerDatabase", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
267267
if err != nil {
268268
return err
269269
}

0 commit comments

Comments
 (0)