Skip to content

Commit 422171f

Browse files
varmax2511varmax2511
committed
Fixing work request errors
1 parent ecd393a commit 422171f

32 files changed

+106
-1361
lines changed

‎oci/apigateway_deployment_resource.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,6 @@ func deleteApigatewayDeployment(d *schema.ResourceData, m interface{}) error {
14271427
type ApigatewayDeploymentResourceCrud struct {
14281428
BaseCrud
14291429
Client *oci_apigateway.DeploymentClient
1430-
WorkRequestsClient *oci_apigateway.WorkRequestsClient
14311430
Res *oci_apigateway.Deployment
14321431
DisableNotFoundRetries bool
14331432
WorkRequestClient *oci_apigateway.WorkRequestsClient
@@ -1744,7 +1743,7 @@ func (s *ApigatewayDeploymentResourceCrud) Delete() error {
17441743
workId := response.OpcWorkRequestId
17451744
// Wait until it finishes
17461745
_, delWorkRequestErr := deploymentWaitForWorkRequest(workId, "deployment",
1747-
oci_apigateway.WorkRequestResourceActionTypeDeleted, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries, s.WorkRequestsClient)
1746+
oci_apigateway.WorkRequestResourceActionTypeDeleted, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries, s.WorkRequestClient)
17481747
return delWorkRequestErr
17491748
}
17501749

‎oci/core_cluster_network_resource.go‎

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1313

1414
oci_core "github.com/oracle/oci-go-sdk/v42/core"
15-
oci_work_requests "github.com/oracle/oci-go-sdk/v42/workrequests"
1615
)
1716

1817
func init() {
@@ -277,7 +276,6 @@ func createCoreClusterNetwork(d *schema.ResourceData, m interface{}) error {
277276
sync := &CoreClusterNetworkResourceCrud{}
278277
sync.D = d
279278
sync.Client = m.(*OracleClients).computeManagementClient()
280-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
281279

282280
return CreateResource(d, sync)
283281
}
@@ -294,7 +292,6 @@ func updateCoreClusterNetwork(d *schema.ResourceData, m interface{}) error {
294292
sync := &CoreClusterNetworkResourceCrud{}
295293
sync.D = d
296294
sync.Client = m.(*OracleClients).computeManagementClient()
297-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
298295

299296
return UpdateResource(d, sync)
300297
}
@@ -304,7 +301,6 @@ func deleteCoreClusterNetwork(d *schema.ResourceData, m interface{}) error {
304301
sync.D = d
305302
sync.Client = m.(*OracleClients).computeManagementClient()
306303
sync.DisableNotFoundRetries = true
307-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
308304

309305
return DeleteResource(d, sync)
310306
}
@@ -314,7 +310,6 @@ type CoreClusterNetworkResourceCrud struct {
314310
Client *oci_core.ComputeManagementClient
315311
Res *oci_core.ClusterNetwork
316312
DisableNotFoundRetries bool
317-
WorkRequestClient *oci_work_requests.WorkRequestClient
318313
}
319314

320315
func (s *CoreClusterNetworkResourceCrud) ID() string {
@@ -407,18 +402,8 @@ func (s *CoreClusterNetworkResourceCrud) Create() error {
407402
return err
408403
}
409404

410-
workId := response.OpcWorkRequestId
411-
if workId != nil {
412-
identifier, err := WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "clusternetwork", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
413-
if identifier != nil {
414-
s.D.SetId(*identifier)
415-
}
416-
if err != nil {
417-
return err
418-
}
419-
}
420-
421-
return s.Get()
405+
s.Res = &response.ClusterNetwork
406+
return nil
422407
}
423408

424409
func (s *CoreClusterNetworkResourceCrud) Get() error {
@@ -506,20 +491,8 @@ func (s *CoreClusterNetworkResourceCrud) Delete() error {
506491

507492
request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
508493

509-
response, err := s.Client.TerminateClusterNetwork(context.Background(), request)
510-
if err != nil {
511-
return err
512-
}
513-
514-
workId := response.OpcWorkRequestId
515-
if workId != nil {
516-
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "clusternetwork", oci_work_requests.WorkRequestResourceActionTypeDeleted, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries)
517-
if err != nil {
518-
return err
519-
}
520-
}
521-
522-
return s.Get()
494+
_, err := s.Client.TerminateClusterNetwork(context.Background(), request)
495+
return err
523496
}
524497

525498
func (s *CoreClusterNetworkResourceCrud) SetData() error {

‎oci/core_dedicated_vm_host_resource.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ func (s *CoreDedicatedVmHostResourceCrud) Create() error {
220220
}
221221

222222
workId := response.OpcWorkRequestId
223+
s.Res = &response.DedicatedVmHost
224+
223225
if workId != nil {
224226
identifier, err := WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "dedicatedvmhost", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
225227
if identifier != nil {

‎oci/core_image_resource.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,8 @@ func (s *CoreImageResourceCrud) Create() error {
362362
}
363363

364364
workId := response.OpcWorkRequestId
365+
s.Res = &response.Image
366+
365367
if workId != nil {
366368
identifier, err := WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "image", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
367369
if identifier != nil {

‎oci/core_instance_pool_instance_resource.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ func (s *CoreInstancePoolInstanceResourceCrud) Create() error {
209209
}
210210

211211
workId := response.OpcWorkRequestId
212+
s.Res = &response.InstancePoolInstance
213+
212214
if workId != nil {
213215
identifier, err := WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "instancepool", oci_work_requests.WorkRequestResourceActionTypeRelated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
214216
if identifier != nil {
@@ -219,7 +221,7 @@ func (s *CoreInstancePoolInstanceResourceCrud) Create() error {
219221
}
220222
}
221223

222-
return s.Get()
224+
return nil
223225
}
224226

225227
func (s *CoreInstancePoolInstanceResourceCrud) Get() error {

‎oci/core_subnet_resource.go‎

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

1111
oci_core "github.com/oracle/oci-go-sdk/v42/core"
12-
oci_work_requests "github.com/oracle/oci-go-sdk/v42/workrequests"
1312
)
1413

1514
func init() {
@@ -148,7 +147,6 @@ func createCoreSubnet(d *schema.ResourceData, m interface{}) error {
148147
sync := &CoreSubnetResourceCrud{}
149148
sync.D = d
150149
sync.Client = m.(*OracleClients).virtualNetworkClient()
151-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
152150

153151
return CreateResource(d, sync)
154152
}
@@ -165,7 +163,6 @@ func updateCoreSubnet(d *schema.ResourceData, m interface{}) error {
165163
sync := &CoreSubnetResourceCrud{}
166164
sync.D = d
167165
sync.Client = m.(*OracleClients).virtualNetworkClient()
168-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
169166

170167
return UpdateResource(d, sync)
171168
}
@@ -175,7 +172,6 @@ func deleteCoreSubnet(d *schema.ResourceData, m interface{}) error {
175172
sync.D = d
176173
sync.Client = m.(*OracleClients).virtualNetworkClient()
177174
sync.DisableNotFoundRetries = true
178-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
179175

180176
return DeleteResource(d, sync)
181177
}
@@ -185,7 +181,6 @@ type CoreSubnetResourceCrud struct {
185181
Client *oci_core.VirtualNetworkClient
186182
Res *oci_core.Subnet
187183
DisableNotFoundRetries bool
188-
WorkRequestClient *oci_work_requests.WorkRequestClient
189184
}
190185

191186
func (s *CoreSubnetResourceCrud) ID() string {
@@ -513,17 +508,9 @@ func (s *CoreSubnetResourceCrud) updateCompartment(compartment interface{}) erro
513508

514509
changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
515510

516-
response, err := s.Client.ChangeSubnetCompartment(context.Background(), changeCompartmentRequest)
511+
_, err := s.Client.ChangeSubnetCompartment(context.Background(), changeCompartmentRequest)
517512
if err != nil {
518513
return err
519514
}
520-
521-
workId := response.OpcWorkRequestId
522-
if workId != nil {
523-
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "subnet", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
524-
if err != nil {
525-
return err
526-
}
527-
}
528515
return nil
529516
}

‎oci/core_vcn_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_core "github.com/oracle/oci-go-sdk/v42/core"
13-
oci_work_requests "github.com/oracle/oci-go-sdk/v42/workrequests"
1413
)
1514

1615
func init() {
@@ -120,7 +119,6 @@ func createCoreVcn(d *schema.ResourceData, m interface{}) error {
120119
sync := &CoreVcnResourceCrud{}
121120
sync.D = d
122121
sync.Client = m.(*OracleClients).virtualNetworkClient()
123-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
124122

125123
return CreateResource(d, sync)
126124
}
@@ -137,7 +135,6 @@ func updateCoreVcn(d *schema.ResourceData, m interface{}) error {
137135
sync := &CoreVcnResourceCrud{}
138136
sync.D = d
139137
sync.Client = m.(*OracleClients).virtualNetworkClient()
140-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
141138

142139
return UpdateResource(d, sync)
143140
}
@@ -147,7 +144,6 @@ func deleteCoreVcn(d *schema.ResourceData, m interface{}) error {
147144
sync.D = d
148145
sync.Client = m.(*OracleClients).virtualNetworkClient()
149146
sync.DisableNotFoundRetries = true
150-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
151147

152148
return DeleteResource(d, sync)
153149
}
@@ -157,7 +153,6 @@ type CoreVcnResourceCrud struct {
157153
Client *oci_core.VirtualNetworkClient
158154
Res *oci_core.Vcn
159155
DisableNotFoundRetries bool
160-
WorkRequestClient *oci_work_requests.WorkRequestClient
161156
}
162157

163158
func (s *CoreVcnResourceCrud) ID() string {
@@ -416,18 +411,10 @@ func (s *CoreVcnResourceCrud) updateCompartment(compartment interface{}) error {
416411

417412
changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
418413

419-
response, err := s.Client.ChangeVcnCompartment(context.Background(), changeCompartmentRequest)
414+
_, err := s.Client.ChangeVcnCompartment(context.Background(), changeCompartmentRequest)
420415
if err != nil {
421416
return err
422417
}
423-
424-
workId := response.OpcWorkRequestId
425-
if workId != nil {
426-
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "vcn", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
427-
if err != nil {
428-
return err
429-
}
430-
}
431418
return nil
432419
}
433420

‎oci/core_vlan_resource.go‎

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

1111
oci_core "github.com/oracle/oci-go-sdk/v42/core"
12-
oci_work_requests "github.com/oracle/oci-go-sdk/v42/workrequests"
1312
)
1413

1514
func init() {
@@ -105,7 +104,6 @@ func createCoreVlan(d *schema.ResourceData, m interface{}) error {
105104
sync := &CoreVlanResourceCrud{}
106105
sync.D = d
107106
sync.Client = m.(*OracleClients).virtualNetworkClient()
108-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
109107

110108
return CreateResource(d, sync)
111109
}
@@ -122,7 +120,6 @@ func updateCoreVlan(d *schema.ResourceData, m interface{}) error {
122120
sync := &CoreVlanResourceCrud{}
123121
sync.D = d
124122
sync.Client = m.(*OracleClients).virtualNetworkClient()
125-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
126123

127124
return UpdateResource(d, sync)
128125
}
@@ -132,7 +129,6 @@ func deleteCoreVlan(d *schema.ResourceData, m interface{}) error {
132129
sync.D = d
133130
sync.Client = m.(*OracleClients).virtualNetworkClient()
134131
sync.DisableNotFoundRetries = true
135-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
136132

137133
return DeleteResource(d, sync)
138134
}
@@ -142,7 +138,6 @@ type CoreVlanResourceCrud struct {
142138
Client *oci_core.VirtualNetworkClient
143139
Res *oci_core.Vlan
144140
DisableNotFoundRetries bool
145-
WorkRequestClient *oci_work_requests.WorkRequestClient
146141
}
147142

148143
func (s *CoreVlanResourceCrud) ID() string {
@@ -405,17 +400,9 @@ func (s *CoreVlanResourceCrud) updateCompartment(compartment interface{}) error
405400

406401
changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
407402

408-
response, err := s.Client.ChangeVlanCompartment(context.Background(), changeCompartmentRequest)
403+
_, err := s.Client.ChangeVlanCompartment(context.Background(), changeCompartmentRequest)
409404
if err != nil {
410405
return err
411406
}
412-
413-
workId := response.OpcWorkRequestId
414-
if workId != nil {
415-
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "vlan", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
416-
if err != nil {
417-
return err
418-
}
419-
}
420407
return nil
421408
}

‎oci/database_autonomous_container_database_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() {
@@ -486,7 +485,6 @@ func createDatabaseAutonomousContainerDatabase(d *schema.ResourceData, m interfa
486485
sync := &DatabaseAutonomousContainerDatabaseResourceCrud{}
487486
sync.D = d
488487
sync.Client = m.(*OracleClients).databaseClient()
489-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
490488

491489
if e := CreateResource(d, sync); e != nil {
492490
return e
@@ -514,7 +512,6 @@ func updateDatabaseAutonomousContainerDatabase(d *schema.ResourceData, m interfa
514512
sync := &DatabaseAutonomousContainerDatabaseResourceCrud{}
515513
sync.D = d
516514
sync.Client = m.(*OracleClients).databaseClient()
517-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
518515

519516
if _, ok := sync.D.GetOkExists("rotate_key_trigger"); ok && sync.D.HasChange("rotate_key_trigger") {
520517
err := sync.RotateContainerDatabaseEncryptionKey()
@@ -531,7 +528,6 @@ func deleteDatabaseAutonomousContainerDatabase(d *schema.ResourceData, m interfa
531528
sync.D = d
532529
sync.Client = m.(*OracleClients).databaseClient()
533530
sync.DisableNotFoundRetries = true
534-
sync.WorkRequestClient = m.(*OracleClients).workRequestClient
535531

536532
return DeleteResource(d, sync)
537533
}
@@ -541,7 +537,6 @@ type DatabaseAutonomousContainerDatabaseResourceCrud struct {
541537
Client *oci_database.DatabaseClient
542538
Res *oci_database.AutonomousContainerDatabase
543539
DisableNotFoundRetries bool
544-
WorkRequestClient *oci_work_requests.WorkRequestClient
545540
}
546541

547542
func (s *DatabaseAutonomousContainerDatabaseResourceCrud) ID() string {
@@ -1200,18 +1195,10 @@ func (s *DatabaseAutonomousContainerDatabaseResourceCrud) updateCompartment(comp
12001195

12011196
changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "database")
12021197

1203-
response, err := s.Client.ChangeAutonomousContainerDatabaseCompartment(context.Background(), changeCompartmentRequest)
1198+
_, err := s.Client.ChangeAutonomousContainerDatabaseCompartment(context.Background(), changeCompartmentRequest)
12041199
if err != nil {
12051200
return err
12061201
}
1207-
1208-
workId := response.OpcWorkRequestId
1209-
if workId != nil {
1210-
_, err = WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "autonomousContainerDatabase", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
1211-
if err != nil {
1212-
return err
1213-
}
1214-
}
12151202
return nil
12161203
}
12171204

‎oci/database_autonomous_exadata_infrastructure_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ func TestDatabaseAutonomousExadataInfrastructureResource_basic(t *testing.T) {
303303
ImportStateVerify: true,
304304
ImportStateVerifyIgnore: []string{
305305
"maintenance_window_details",
306+
"create_async",
306307
},
307308
ResourceName: resourceName,
308309
},

0 commit comments

Comments
 (0)