Skip to content

Commit 1bd27cc

Browse files
jotruonjotruon
committed
Add workrequest for db system
1 parent 97bbc68 commit 1bd27cc

6 files changed

+139
-6
lines changed

‎oci/database_database_resource.go‎

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"strings"
1111
"time"
1212

13+
oci_work_requests "github.com/oracle/oci-go-sdk/v47/workrequests"
14+
1315
oci_common "github.com/oracle/oci-go-sdk/v47/common"
1416

1517
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -407,6 +409,7 @@ func createDatabaseDatabase(d *schema.ResourceData, m interface{}) error {
407409
sync := &DatabaseDatabaseResourceCrud{}
408410
sync.D = d
409411
sync.Client = m.(*OracleClients).databaseClient()
412+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
410413

411414
return CreateResource(d, sync)
412415
}
@@ -415,6 +418,7 @@ func readDatabaseDatabase(d *schema.ResourceData, m interface{}) error {
415418
sync := &DatabaseDatabaseResourceCrud{}
416419
sync.D = d
417420
sync.Client = m.(*OracleClients).databaseClient()
421+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
418422

419423
return ReadResource(sync)
420424
}
@@ -423,6 +427,7 @@ func deleteDatabaseDatabase(d *schema.ResourceData, m interface{}) error {
423427
sync := &DatabaseDatabaseResourceCrud{}
424428
sync.D = d
425429
sync.Client = m.(*OracleClients).databaseClient()
430+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
426431
sync.DisableNotFoundRetries = true
427432

428433
return DeleteResource(d, sync)
@@ -431,6 +436,7 @@ func deleteDatabaseDatabase(d *schema.ResourceData, m interface{}) error {
431436
type DatabaseDatabaseResourceCrud struct {
432437
BaseCrud
433438
Client *oci_database.DatabaseClient
439+
WorkRequestClient *oci_work_requests.WorkRequestClient
434440
Res *oci_database.Database
435441
DisableNotFoundRetries bool
436442
}
@@ -491,6 +497,13 @@ func (s *DatabaseDatabaseResourceCrud) Create() error {
491497
if err != nil {
492498
return err
493499
}
500+
workId := response.OpcWorkRequestId
501+
if workId != nil {
502+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
503+
if err != nil {
504+
return err
505+
}
506+
}
494507

495508
s.Res = &response.Database
496509
return nil
@@ -918,6 +931,7 @@ func updateDatabaseDatabase(d *schema.ResourceData, m interface{}) error {
918931
sync := &DatabaseDatabaseResourceCrud{}
919932
sync.D = d
920933
sync.Client = m.(*OracleClients).databaseClient()
934+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
921935

922936
return UpdateResource(d, sync)
923937
}
@@ -957,6 +971,14 @@ func (s *DatabaseDatabaseResourceCrud) Update() error {
957971
return err
958972
}
959973

974+
workId := response.OpcWorkRequestId
975+
if workId != nil {
976+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
977+
if err != nil {
978+
return err
979+
}
980+
}
981+
960982
s.Res = &response.Database
961983
return nil
962984
}
@@ -1088,8 +1110,18 @@ func (s *DatabaseDatabaseResourceCrud) kmsRotation(databaseId string) error {
10881110
rotateKeyRequest := oci_database.RotateVaultKeyRequest{}
10891111
rotateKeyRequest.DatabaseId = &databaseId
10901112
rotateKeyRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "database")
1091-
_, err := s.Client.RotateVaultKey(context.Background(), rotateKeyRequest)
1092-
return err
1113+
response, err := s.Client.RotateVaultKey(context.Background(), rotateKeyRequest)
1114+
if err != nil {
1115+
return err
1116+
}
1117+
workId := response.OpcWorkRequestId
1118+
if workId != nil {
1119+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
1120+
if err != nil {
1121+
return err
1122+
}
1123+
}
1124+
return nil
10931125
}
10941126
return nil
10951127
}
@@ -1115,10 +1147,16 @@ func (s *DatabaseDatabaseResourceCrud) kmsMigration(databaseId string) error {
11151147
migrationKeyRequest.KmsKeyVersionId = &temp
11161148
}
11171149
}
1118-
_, err := s.Client.MigrateVaultKey(context.Background(), migrationKeyRequest)
1150+
response, err := s.Client.MigrateVaultKey(context.Background(), migrationKeyRequest)
11191151
if err != nil {
11201152
return err
11211153
}
1154+
workId := response.OpcWorkRequestId
1155+
if workId != nil {
1156+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
1157+
if err != nil {
1158+
}
1159+
}
11221160
migrateOperation = true
11231161
}
11241162

‎oci/database_database_software_image_resource.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,11 @@ func (s *DatabaseDatabaseSoftwareImageResourceCrud) Create() error {
276276
}
277277

278278
s.Res = &response.DatabaseSoftwareImage
279+
280+
if waitErr := waitForCreatedState(s.D, s); waitErr != nil {
281+
return waitErr
282+
}
283+
279284
return nil
280285
}
281286

@@ -335,6 +340,11 @@ func (s *DatabaseDatabaseSoftwareImageResourceCrud) Update() error {
335340
return err
336341
}
337342

343+
// This update does not support work-request
344+
if waitErr := waitForUpdatedState(s.D, s); waitErr != nil {
345+
return waitErr
346+
}
347+
338348
s.Res = &response.DatabaseSoftwareImage
339349
return nil
340350
}

‎oci/database_db_home_resource.go‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"strings"
1111
"time"
1212

13+
oci_work_requests "github.com/oracle/oci-go-sdk/v47/workrequests"
14+
1315
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1416
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
1517

@@ -362,6 +364,7 @@ func createDatabaseDbHome(d *schema.ResourceData, m interface{}) error {
362364
sync := &DatabaseDbHomeResourceCrud{}
363365
sync.D = d
364366
sync.Client = m.(*OracleClients).databaseClient()
367+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
365368

366369
return CreateResource(d, sync)
367370
}
@@ -370,6 +373,7 @@ func readDatabaseDbHome(d *schema.ResourceData, m interface{}) error {
370373
sync := &DatabaseDbHomeResourceCrud{}
371374
sync.D = d
372375
sync.Client = m.(*OracleClients).databaseClient()
376+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
373377

374378
return ReadResource(sync)
375379
}
@@ -378,6 +382,7 @@ func deleteDatabaseDbHome(d *schema.ResourceData, m interface{}) error {
378382
sync := &DatabaseDbHomeResourceCrud{}
379383
sync.D = d
380384
sync.Client = m.(*OracleClients).databaseClient()
385+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
381386
sync.DisableNotFoundRetries = true
382387

383388
return DeleteResource(d, sync)
@@ -386,6 +391,7 @@ func deleteDatabaseDbHome(d *schema.ResourceData, m interface{}) error {
386391
type DatabaseDbHomeResourceCrud struct {
387392
BaseCrud
388393
Client *oci_database.DatabaseClient
394+
WorkRequestClient *oci_work_requests.WorkRequestClient
389395
Res *oci_database.DbHome
390396
Database *oci_database.Database
391397
DisableNotFoundRetries bool
@@ -448,6 +454,15 @@ func (s *DatabaseDbHomeResourceCrud) Create() error {
448454
if err != nil {
449455
return err
450456
}
457+
458+
workId := response.OpcWorkRequestId
459+
if workId != nil {
460+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
461+
if err != nil {
462+
return err
463+
}
464+
}
465+
451466
s.Res = &response.DbHome
452467

453468
err = s.getDatabaseInfo()
@@ -514,6 +529,14 @@ func (s *DatabaseDbHomeResourceCrud) Update() error {
514529
return err
515530
}
516531

532+
workId := response.OpcWorkRequestId
533+
if workId != nil {
534+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
535+
if err != nil {
536+
return err
537+
}
538+
}
539+
517540
s.Res = &response.DbHome
518541
err = s.Get()
519542
if err != nil {
@@ -547,6 +570,14 @@ func (s *DatabaseDbHomeResourceCrud) Update() error {
547570
return err
548571
}
549572

573+
workId = response.OpcWorkRequestId
574+
if workId != nil {
575+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
576+
if err != nil {
577+
return err
578+
}
579+
}
580+
550581
getDatabaseRequest := oci_database.GetDatabaseRequest{}
551582

552583
getDatabaseRequest.DatabaseId = s.Database.Id
@@ -1093,6 +1124,7 @@ func updateDatabaseDbHome(d *schema.ResourceData, m interface{}) error {
10931124
sync := &DatabaseDbHomeResourceCrud{}
10941125
sync.D = d
10951126
sync.Client = m.(*OracleClients).databaseClient()
1127+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
10961128

10971129
return UpdateResource(d, sync)
10981130
}
@@ -1144,7 +1176,15 @@ func (s *DatabaseDbHomeResourceCrud) deleteNestedDB() error {
11441176

11451177
request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "database")
11461178

1147-
_, err = s.Client.DeleteDatabase(context.Background(), request)
1179+
response, err := s.Client.DeleteDatabase(context.Background(), request)
1180+
1181+
workId := response.OpcWorkRequestId
1182+
if workId != nil {
1183+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeDeleted, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries)
1184+
if err != nil {
1185+
return err
1186+
}
1187+
}
11481188

11491189
return nil
11501190
}

‎oci/database_db_node_console_connection_resource.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,11 @@ func (s *DatabaseDbNodeConsoleConnectionResourceCrud) Create() error {
146146
}
147147

148148
s.Res = &response.ConsoleConnection
149+
150+
if waitErr := waitForCreatedState(s.D, s); waitErr != nil {
151+
return waitErr
152+
}
153+
149154
return nil
150155
}
151156

‎oci/database_db_system_resource.go‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"strings"
1111
"time"
1212

13+
oci_work_requests "github.com/oracle/oci-go-sdk/v47/workrequests"
14+
1315
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1416
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
1517

@@ -27,7 +29,7 @@ func DatabaseDbSystemResource() *schema.Resource {
2729
State: schema.ImportStatePassthrough,
2830
},
2931
Timeouts: &schema.ResourceTimeout{
30-
Create: getTimeoutDuration("0h"),
32+
Create: getTimeoutDuration("2h"),
3133
Update: getTimeoutDuration("2h"),
3234
Delete: getTimeoutDuration("2h"),
3335
},
@@ -827,6 +829,7 @@ func createDatabaseDbSystem(d *schema.ResourceData, m interface{}) error {
827829
sync := &DatabaseDbSystemResourceCrud{}
828830
sync.D = d
829831
sync.Client = m.(*OracleClients).databaseClient()
832+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
830833

831834
return CreateDBSystemResource(d, sync)
832835
}
@@ -835,6 +838,7 @@ func readDatabaseDbSystem(d *schema.ResourceData, m interface{}) error {
835838
sync := &DatabaseDbSystemResourceCrud{}
836839
sync.D = d
837840
sync.Client = m.(*OracleClients).databaseClient()
841+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
838842

839843
return ReadResource(sync)
840844
}
@@ -843,6 +847,7 @@ func updateDatabaseDbSystem(d *schema.ResourceData, m interface{}) error {
843847
sync := &DatabaseDbSystemResourceCrud{}
844848
sync.D = d
845849
sync.Client = m.(*OracleClients).databaseClient()
850+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
846851

847852
return UpdateResource(d, sync)
848853
}
@@ -851,6 +856,7 @@ func deleteDatabaseDbSystem(d *schema.ResourceData, m interface{}) error {
851856
sync := &DatabaseDbSystemResourceCrud{}
852857
sync.D = d
853858
sync.Client = m.(*OracleClients).databaseClient()
859+
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
854860
sync.DisableNotFoundRetries = true
855861

856862
return DeleteResource(d, sync)
@@ -859,6 +865,7 @@ func deleteDatabaseDbSystem(d *schema.ResourceData, m interface{}) error {
859865
type DatabaseDbSystemResourceCrud struct {
860866
BaseCrud
861867
Client *oci_database.DatabaseClient
868+
WorkRequestClient *oci_work_requests.WorkRequestClient
862869
Res *oci_database.DbSystem
863870
DbHome *oci_database.DbHome
864871
Database *oci_database.Database
@@ -931,6 +938,14 @@ func (s *DatabaseDbSystemResourceCrud) Create() error {
931938

932939
s.Res = &response.DbSystem
933940

941+
workId := response.OpcWorkRequestId
942+
if workId != nil {
943+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
944+
if err != nil {
945+
return err
946+
}
947+
}
948+
934949
err = s.getDbHomeInfo()
935950
if err != nil {
936951
log.Printf("[WARN] Could not get info about the first DbHome in the dbSystem: %v", err)
@@ -1070,8 +1085,17 @@ func (s *DatabaseDbSystemResourceCrud) Update() error {
10701085
return err
10711086
}
10721087

1088+
workId := response.OpcWorkRequestId
1089+
if workId != nil {
1090+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
1091+
if err != nil {
1092+
return err
1093+
}
1094+
}
1095+
10731096
s.Res = &response.DbSystem
10741097

1098+
// Check lifecycle state of db system
10751099
getDbSystemResponse, err := waitForDbSystemIfItIsUpdating(s.Res.Id, s.Client, s.D.Timeout(schema.TimeoutUpdate))
10761100
if err != nil {
10771101
err = s.SetData()
@@ -2915,6 +2939,14 @@ func (s *DatabaseDbSystemResourceCrud) UpdateDatabaseOperation() error {
29152939
return err
29162940
}
29172941

2942+
workId := updateDatabaseResponse.OpcWorkRequestId
2943+
if workId != nil {
2944+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
2945+
if err != nil {
2946+
return err
2947+
}
2948+
}
2949+
29182950
getDatabaseRequest := oci_database.GetDatabaseRequest{}
29192951

29202952
getDatabaseRequest.DatabaseId = s.Database.Id
@@ -2947,6 +2979,14 @@ func (s *DatabaseDbSystemResourceCrud) sendUpdateForLicenseModel(dbSystemId stri
29472979
return err
29482980
}
29492981

2982+
workId := response.OpcWorkRequestId
2983+
if workId != nil {
2984+
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "database", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
2985+
if err != nil {
2986+
return err
2987+
}
2988+
}
2989+
29502990
s.Res = &response.DbSystem
29512991

29522992
getDbSystemResponse, err := waitForDbSystemIfItIsUpdating(s.Res.Id, s.Client, s.D.Timeout(schema.TimeoutUpdate))

‎website/docs/r/database_db_system.html.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ The following attributes are exported:
334334
## Timeouts
335335

336336
The `timeouts` block allows you to specify [timeouts](https://registry.terraform.io/providers/hashicorp/oci/latest/docs/guides/changing_timeouts) for certain operations:
337-
* `create` - (Defaults to 0 hours), when creating the Db System
337+
* `create` - (Defaults to 2 hours), when creating the Db System
338338
* `update` - (Defaults to 2 hours), when updating the Db System
339339
* `delete` - (Defaults to 2 hours), when destroying the Db System
340340

0 commit comments

Comments
 (0)