Drop before merge - breaking change for SDK retry logic, management_agent

update

Author: varmax2511

oci/management_agent_management_agents_data_source.go

@@ -27,22 +27,22 @@ func ManagementAgentManagementAgentsDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-			"platform_type": {
+			/*"platform_type": {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
 			"plugin_name": {
 				Type:     schema.TypeString,
 				Optional: true,
-			},
+			},*/
 			"state": {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-			"version": {
+			/*"version": {
 				Type:     schema.TypeString,
 				Optional: true,
-			},
+			},*/
 			"management_agents": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -83,23 +83,23 @@ func (s *ManagementAgentManagementAgentsDataSourceCrud) Get() error {
 		request.DisplayName = &tmp
 	}
 
-	if platformType, ok := s.D.GetOkExists("platform_type"); ok {
+	/*if platformType, ok := s.D.GetOkExists("platform_type"); ok {
 		request.PlatformType = oci_management_agent.ListManagementAgentsPlatformTypeEnum(platformType.(string))
 	}
 
 	if pluginName, ok := s.D.GetOkExists("plugin_name"); ok {
 		tmp := pluginName.(string)
 		request.PluginName = &tmp
-	}
+	}*/
 
 	if state, ok := s.D.GetOkExists("state"); ok {
 		request.LifecycleState = oci_management_agent.ListManagementAgentsLifecycleStateEnum(state.(string))
 	}
 
-	if version, ok := s.D.GetOkExists("version"); ok {
+	/*if version, ok := s.D.GetOkExists("version"); ok {
 		tmp := version.(string)
 		request.Version = &tmp
-	}
+	}*/
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "management_agent")
 

oci/retry.go

@@ -247,15 +247,13 @@ func getRetryPolicy(disableNotFoundRetries bool, service string, optionals ...in
 
 func getDefaultRetryPolicy(disableNotFoundRetries bool, service string, optionals ...interface{}) *oci_common.RetryPolicy {
 	startTime := time.Now()
-	retryPolicy := &oci_common.RetryPolicy{
-		MaximumNumberAttempts: 0,
-		ShouldRetryOperation: func(response oci_common.OCIOperationResponse) bool {
-			return shouldRetry(response, disableNotFoundRetries, service, startTime, optionals...)
-		},
-		NextDuration: func(response oci_common.OCIOperationResponse) time.Duration {
-			return getRetryBackoffDuration(response, disableNotFoundRetries, service, startTime, optionals...)
-		},
+	maximumNumberAttempts := 0
+	shouldRetryOperation := func(response oci_common.OCIOperationResponse) bool {
+		return shouldRetry(response, disableNotFoundRetries, service, startTime, optionals...)
 	}
-
-	return retryPolicy
+	nexDuration := func(response oci_common.OCIOperationResponse) time.Duration {
+		return getRetryBackoffDuration(response, disableNotFoundRetries, service, startTime, optionals...)
+	}
+	retryPolicy := oci_common.NewRetryPolicy(uint(maximumNumberAttempts), shouldRetryOperation, nexDuration)
+	return &retryPolicy
 }