changes to use new version of sdk retry logic

Author: rcohenma

crud/helpers.go

@@ -140,13 +140,14 @@ func LoadBalancerResourceID(res interface{}, workReq *oci_load_balancer.WorkRequ
 	return nil, false
 }
 
-func LoadBalancerResourceGet(client *oci_load_balancer.LoadBalancerClient, d *schema.ResourceData, wr *oci_load_balancer.WorkRequest, retryOptions ...oci_common.RetryPolicyOption) (id string, stillWorking bool, err error) {
+func LoadBalancerResourceGet(client *oci_load_balancer.LoadBalancerClient, d *schema.ResourceData, wr *oci_load_balancer.WorkRequest, retryPolicy *oci_common.RetryPolicy) (id string, stillWorking bool, err error) {
 	id = d.Id()
 	// NOTE: if the id is for a work request, refresh its state and loadBalancerID.
 	if strings.HasPrefix(id, "ocid1.loadbalancerworkrequest.") {
 		getWorkRequestRequest := oci_load_balancer.GetWorkRequestRequest{}
 		getWorkRequestRequest.WorkRequestId = &id
-		updatedWorkRes, err := client.GetWorkRequest(context.Background(), getWorkRequestRequest, retryOptions...)
+		getWorkRequestRequest.RequestMetadata.RetryPolicy = retryPolicy
+		updatedWorkRes, err := client.GetWorkRequest(context.Background(), getWorkRequestRequest)
 		if err != nil {
 			return "", false, err
 		}
@@ -165,7 +166,7 @@ func LoadBalancerResourceGet(client *oci_load_balancer.LoadBalancerClient, d *sc
 	return id, false, nil
 }
 
-func LoadBalancerWaitForWorkRequest(client *oci_load_balancer.LoadBalancerClient, d *schema.ResourceData, wr *oci_load_balancer.WorkRequest, retryOptions ...oci_common.RetryPolicyOption) error {
+func LoadBalancerWaitForWorkRequest(client *oci_load_balancer.LoadBalancerClient, d *schema.ResourceData, wr *oci_load_balancer.WorkRequest, retryPolicy *oci_common.RetryPolicy) error {
 	var e error
 	stateConf := &resource.StateChangeConf{
 		Pending: []string{
@@ -179,7 +180,8 @@ func LoadBalancerWaitForWorkRequest(client *oci_load_balancer.LoadBalancerClient
 		Refresh: func() (interface{}, string, error) {
 			getWorkRequestRequest := oci_load_balancer.GetWorkRequestRequest{}
 			getWorkRequestRequest.WorkRequestId = wr.Id
-			workRequestResponse, err := client.GetWorkRequest(context.Background(), getWorkRequestRequest, retryOptions...)
+			getWorkRequestRequest.RequestMetadata.RetryPolicy = retryPolicy
+			workRequestResponse, err := client.GetWorkRequest(context.Background(), getWorkRequestRequest)
 			wr = &workRequestResponse.WorkRequest
 			return wr, string(wr.LifecycleState), err
 		},

provider/core_console_history_content_data_source.go

@@ -84,7 +84,9 @@ func (s *ConsoleHistoryContentDataSourceCrud) Get() error {
 		request.Offset = &tmp
 	}
 
-	response, err := s.Client.GetConsoleHistoryContent(context.Background(), request, getRetryOptions(false, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "core")
+
+	response, err := s.Client.GetConsoleHistoryContent(context.Background(), request)
 	if err != nil {
 		return err
 	}

provider/core_console_history_resource.go

@@ -123,7 +123,9 @@ func (s *ConsoleHistoryResourceCrud) Create() error {
 		request.InstanceId = &tmp
 	}
 
-	response, err := s.Client.CaptureConsoleHistory(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.CaptureConsoleHistory(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -138,7 +140,9 @@ func (s *ConsoleHistoryResourceCrud) Get() error {
 	tmp := s.D.Id()
 	request.InstanceConsoleHistoryId = &tmp
 
-	response, err := s.Client.GetConsoleHistory(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.GetConsoleHistory(context.Background(), request)
 	if err != nil {
 		return err
 	}

provider/core_cpe_resource.go

@@ -117,7 +117,9 @@ func (s *CpeResourceCrud) Create() error {
 		request.IpAddress = &tmp
 	}
 
-	response, err := s.Client.CreateCpe(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.CreateCpe(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -132,7 +134,9 @@ func (s *CpeResourceCrud) Get() error {
 	tmp := s.D.Id()
 	request.CpeId = &tmp
 
-	response, err := s.Client.GetCpe(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.GetCpe(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -152,7 +156,9 @@ func (s *CpeResourceCrud) Update() error {
 		request.DisplayName = &tmp
 	}
 
-	response, err := s.Client.UpdateCpe(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.UpdateCpe(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -167,7 +173,9 @@ func (s *CpeResourceCrud) Delete() error {
 	tmp := s.D.Id()
 	request.CpeId = &tmp
 
-	_, err := s.Client.DeleteCpe(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	_, err := s.Client.DeleteCpe(context.Background(), request)
 	return err
 }
 

provider/core_cpes_data_source.go

@@ -75,7 +75,9 @@ func (s *CpesDataSourceCrud) Get() error {
 		request.Page = &tmp
 	}
 
-	response, err := s.Client.ListCpes(context.Background(), request, getRetryOptions(false, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "core")
+
+	response, err := s.Client.ListCpes(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -84,7 +86,7 @@ func (s *CpesDataSourceCrud) Get() error {
 	request.Page = s.Res.OpcNextPage
 
 	for request.Page != nil {
-		listResponse, err := s.Client.ListCpes(context.Background(), request, getRetryOptions(false, "core")...)
+		listResponse, err := s.Client.ListCpes(context.Background(), request)
 		if err != nil {
 			return err
 		}

provider/core_dhcp_options_data_source.go

@@ -101,7 +101,9 @@ func (s *DhcpOptionsDataSourceCrud) Get() error {
 		request.VcnId = &tmp
 	}
 
-	response, err := s.Client.ListDhcpOptions(context.Background(), request, getRetryOptions(false, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "core")
+
+	response, err := s.Client.ListDhcpOptions(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -110,7 +112,7 @@ func (s *DhcpOptionsDataSourceCrud) Get() error {
 	request.Page = s.Res.OpcNextPage
 
 	for request.Page != nil {
-		listResponse, err := s.Client.ListDhcpOptions(context.Background(), request, getRetryOptions(false, "core")...)
+		listResponse, err := s.Client.ListDhcpOptions(context.Background(), request)
 		if err != nil {
 			return err
 		}

provider/core_dhcp_options_default_resource.go

@@ -70,7 +70,9 @@ func (s *DefaultDhcpOptionsResourceCrud) reset() error {
 		},
 	}
 
-	response, err := s.Client.UpdateDhcpOptions(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.UpdateDhcpOptions(context.Background(), request)
 	if err != nil {
 		return err
 	}

provider/core_dhcp_options_resource.go

@@ -213,7 +213,9 @@ func (s *DhcpOptionsResourceCrud) Create() error {
 		request.VcnId = &tmp
 	}
 
-	response, err := s.Client.CreateDhcpOptions(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.CreateDhcpOptions(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -228,7 +230,9 @@ func (s *DhcpOptionsResourceCrud) Get() error {
 	tmp := s.D.Id()
 	request.DhcpId = &tmp
 
-	response, err := s.Client.GetDhcpOptions(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.GetDhcpOptions(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -262,7 +266,9 @@ func (s *DhcpOptionsResourceCrud) Update() error {
 		request.Options = tmp
 	}
 
-	response, err := s.Client.UpdateDhcpOptions(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.UpdateDhcpOptions(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -277,7 +283,9 @@ func (s *DhcpOptionsResourceCrud) Delete() error {
 	tmp := s.D.Id()
 	request.DhcpId = &tmp
 
-	_, err := s.Client.DeleteDhcpOptions(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	_, err := s.Client.DeleteDhcpOptions(context.Background(), request)
 	return err
 }
 

provider/core_drg_attachment_resource.go

@@ -153,7 +153,9 @@ func (s *DrgAttachmentResourceCrud) Create() error {
 		request.VcnId = &tmp
 	}
 
-	response, err := s.Client.CreateDrgAttachment(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.CreateDrgAttachment(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -168,7 +170,9 @@ func (s *DrgAttachmentResourceCrud) Get() error {
 	tmp := s.D.Id()
 	request.DrgAttachmentId = &tmp
 
-	response, err := s.Client.GetDrgAttachment(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.GetDrgAttachment(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -188,7 +192,9 @@ func (s *DrgAttachmentResourceCrud) Update() error {
 	tmp := s.D.Id()
 	request.DrgAttachmentId = &tmp
 
-	response, err := s.Client.UpdateDrgAttachment(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	response, err := s.Client.UpdateDrgAttachment(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -203,7 +209,9 @@ func (s *DrgAttachmentResourceCrud) Delete() error {
 	tmp := s.D.Id()
 	request.DrgAttachmentId = &tmp
 
-	_, err := s.Client.DeleteDrgAttachment(context.Background(), request, getRetryOptions(s.DisableNotFoundRetries, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	_, err := s.Client.DeleteDrgAttachment(context.Background(), request)
 	return err
 }
 

provider/core_drg_attachments_data_source.go

@@ -93,7 +93,9 @@ func (s *DrgAttachmentsDataSourceCrud) Get() error {
 		request.VcnId = &tmp
 	}
 
-	response, err := s.Client.ListDrgAttachments(context.Background(), request, getRetryOptions(false, "core")...)
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "core")
+
+	response, err := s.Client.ListDrgAttachments(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -102,7 +104,7 @@ func (s *DrgAttachmentsDataSourceCrud) Get() error {
 	request.Page = s.Res.OpcNextPage
 
 	for request.Page != nil {
-		listResponse, err := s.Client.ListDrgAttachments(context.Background(), request, getRetryOptions(false, "core")...)
+		listResponse, err := s.Client.ListDrgAttachments(context.Background(), request)
 		if err != nil {
 			return err
 		}