Skip to content

Commit e2471b7

Browse files
Added retry logic api calls in core instance resource
Added changelog entry
1 parent 9ea1626 commit e2471b7

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- Support for logging in API Gateway Service
1010
- Support for Service Connector Hub
1111
- Support resource discovery for `Compute Image Capability Schema `
12+
- Support to configure automatic retries to `core_instance` resource
1213

1314
### Deprecated
1415
- The `delete_object_in_destination_bucket` attribute in `oci_objectstorage_replication_policy` is now deprecated

oci/core_instance_resource.go

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -910,6 +910,9 @@ func (s *CoreInstanceResourceCrud) Update() error {
910910
vnicOpts := oci_core.UpdateVnicRequest{
911911
VnicId: vnic.Id,
912912
UpdateVnicDetails: updateVnicDetails,
913+
RequestMetadata: common.RequestMetadata{
914+
RetryPolicy: getRetryPolicy(s.DisableNotFoundRetries, "core"),
915+
},
913916
}
914917

915918
_, err = s.VirtualNetworkClient.UpdateVnic(context.Background(), vnicOpts)
@@ -1638,8 +1641,10 @@ func (s *CoreInstanceResourceCrud) getPrimaryVnic() (*oci_core.Vnic, error) {
16381641
request := oci_core.ListVnicAttachmentsRequest{
16391642
CompartmentId: s.Res.CompartmentId,
16401643
InstanceId: s.Res.Id,
1644+
RequestMetadata: common.RequestMetadata{
1645+
RetryPolicy: getRetryPolicy(s.DisableNotFoundRetries, "core"),
1646+
},
16411647
}
1642-
request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
16431648
var attachments []oci_core.VnicAttachment
16441649

16451650
for {
@@ -1662,7 +1667,12 @@ func (s *CoreInstanceResourceCrud) getPrimaryVnic() (*oci_core.Vnic, error) {
16621667

16631668
for _, attachment := range attachments {
16641669
if attachment.LifecycleState == oci_core.VnicAttachmentLifecycleStateAttached {
1665-
request := oci_core.GetVnicRequest{VnicId: attachment.VnicId}
1670+
request := oci_core.GetVnicRequest{
1671+
VnicId: attachment.VnicId,
1672+
RequestMetadata: common.RequestMetadata{
1673+
RetryPolicy: getRetryPolicy(s.DisableNotFoundRetries, "core"),
1674+
},
1675+
}
16661676
response, _ := s.VirtualNetworkClient.GetVnic(context.Background(), request)
16671677
vnic := &response.Vnic
16681678

@@ -1681,6 +1691,9 @@ func (s *CoreInstanceResourceCrud) getBootVolume() (*oci_core.BootVolume, error)
16811691
AvailabilityDomain: s.Res.AvailabilityDomain,
16821692
CompartmentId: s.Res.CompartmentId,
16831693
InstanceId: s.Res.Id,
1694+
RequestMetadata: common.RequestMetadata{
1695+
RetryPolicy: getRetryPolicy(s.DisableNotFoundRetries, "core"),
1696+
},
16841697
}
16851698

16861699
response, err := s.Client.ListBootVolumeAttachments(context.Background(), request)
@@ -1697,7 +1710,12 @@ func (s *CoreInstanceResourceCrud) getBootVolume() (*oci_core.BootVolume, error)
16971710
return nil, fmt.Errorf("Found a boot volume attachment with no boot volume ID")
16981711
}
16991712

1700-
bootVolumeRequest := oci_core.GetBootVolumeRequest{BootVolumeId: bootVolumeId}
1713+
bootVolumeRequest := oci_core.GetBootVolumeRequest{
1714+
BootVolumeId: bootVolumeId,
1715+
RequestMetadata: common.RequestMetadata{
1716+
RetryPolicy: getRetryPolicy(s.DisableNotFoundRetries, "core"),
1717+
},
1718+
}
17011719
bootVolumeResponse, err := s.BlockStorageClient.GetBootVolume(context.Background(), bootVolumeRequest)
17021720
if err != nil {
17031721
return nil, err

0 commit comments

Comments
 (0)