Fix a few bugs (#134)

Author: posriniv

managed/resource_allow_list.go

@@ -332,13 +332,24 @@ func findNetworkAllowList(nals []openapiclient.NetworkAllowListData, name string
 }
 
 func getNetworkAllowListIdByName(ctx context.Context, accountId string, projectId string, networkAllowListName string, apiClient openapiclient.APIClient) (string, error) {
-	nalResp, resp, err := apiClient.NetworkApi.ListNetworkAllowLists(ctx, accountId, projectId).Execute()
-	if err != nil {
-		errMsg := getErrorMessage(resp, err)
-		return "", fmt.Errorf("Unable to read the Network allow list %s: %s", networkAllowListName, errMsg)
-	}
-	if nalData, ok := findNetworkAllowList(nalResp.Data, networkAllowListName); ok {
-		return nalData.Info.GetId(), nil
+	var continuationToken string
+	for {
+		request := apiClient.NetworkApi.ListNetworkAllowLists(ctx, accountId, projectId)
+		if continuationToken != "" {
+			request = request.ContinuationToken(continuationToken)
+		}
+		nalResp, resp, err := request.Execute()
+		if err != nil {
+			errMsg := getErrorMessage(resp, err)
+			return "", fmt.Errorf("Unable to read the Network allow list %s: %s", networkAllowListName, errMsg)
+		}
+		if nalData, ok := findNetworkAllowList(nalResp.Data, networkAllowListName); ok {
+			return nalData.Info.GetId(), nil
+		}
+		continuationToken = nalResp.Metadata.GetContinuationToken()
+		if continuationToken == "" {
+			break
+		}
 	}
 
 	return "", fmt.Errorf("NetworkAllowList %s not found", networkAllowListName)

managed/resource_associate_me_cluster.go

@@ -294,7 +294,6 @@ func getTaskState(accountId string, projectId string, entityId string, entityTyp
 
 	if v, ok := taskList.GetDataOk(); ok && v != nil {
 		c := taskList.GetData()
-
 		if len(c) == 0 {
 			tflog.Info(ctx, "No task found for this operation")
 			return "TASK_NOT_FOUND", true, ""

managed/resource_cluster.go

@@ -610,6 +610,7 @@ func createClusterSpec(ctx context.Context, apiClient *openapiclient.APIClient,
 	clusterRegionInfo := []openapiclient.ClusterRegionInfo{}
 	totalNodes := 0
 	clusterType := plan.ClusterType.Value
+	isDefaultSet := false
 	for _, regionInfo := range plan.ClusterRegionInfo {
 		regionNodes := regionInfo.NumNodes.Value
 		totalNodes += int(regionNodes)
@@ -694,7 +695,11 @@ func createClusterSpec(ctx context.Context, apiClient *openapiclient.APIClient,
 			info.SetIsAffinitized(regionInfo.IsPreferred.Value)
 		}
 		if !regionInfo.IsDefault.IsUnknown() && !regionInfo.IsDefault.IsNull() {
+			if isDefaultSet {
+				return nil, false, "Cluster must have exactly one default region."
+			}
 			info.SetIsDefault(regionInfo.IsDefault.Value)
+			isDefaultSet = true
 		}
 		clusterRegionInfo = append(clusterRegionInfo, info)
 	}
@@ -2013,7 +2018,6 @@ func (r resourceCluster) Update(ctx context.Context, req tfsdk.UpdateResourceReq
 		return
 	}
 	clusterSpec.ClusterInfo.SetVersion(int32(clusterVersion))
-
 	_, response, err := apiClient.ClusterApi.EditCluster(context.Background(), accountId, projectId, clusterId).ClusterSpec(*clusterSpec).Execute()
 	if err != nil {
 		errMsg := getErrorMessage(response, err)
@@ -2041,6 +2045,7 @@ func (r resourceCluster) Update(ctx context.Context, req tfsdk.UpdateResourceReq
 	// Something similar will happen if changing the backup schedule or the CMK spec.
 	retries := 0
 	readClusterRetries := 0
+	checkNewTaskSpawned := true
 	retryPolicy := retry.NewConstant(10 * time.Second)
 	retryPolicy = retry.WithMaxDuration(3600*time.Second, retryPolicy)
 	err = retry.Do(ctx, retryPolicy, func(ctx context.Context) error {
@@ -2049,12 +2054,6 @@ func (r resourceCluster) Update(ctx context.Context, req tfsdk.UpdateResourceReq
 		tflog.Info(ctx, "Cluster edit operation in progress, state: "+asState)
 
 		if readInfoOK {
-			if asState == string(openapiclient.TASKACTIONSTATEENUM_SUCCEEDED) {
-				return nil
-			}
-			if asState == string(openapiclient.TASKACTIONSTATEENUM_FAILED) {
-				return ErrFailedTask
-			}
 			if asState == "TASK_NOT_FOUND" {
 				// We try for a minute waiting for the tasks to be spawned. If edit cluster responded with a success
 				// without creating a task for about a minute, we can safely assume that a task is not required to be spawned.
@@ -2068,6 +2067,24 @@ func (r resourceCluster) Update(ctx context.Context, req tfsdk.UpdateResourceReq
 					return nil
 				}
 			}
+			// There are cases this code flow checks for the state of previously spawned tasks instead of checking for new tasks.
+			// Hence, we check whether a new task is spawned.
+			if checkNewTaskSpawned {
+				if asState == string(openapiclient.TASKACTIONSTATEENUM_IN_PROGRESS) {
+					checkNewTaskSpawned = false
+					return retry.RetryableError(errors.New("Cluster edit operation in progress"))
+				} else {
+					tflog.Info(ctx, "Cluster edit task not found, the change would not have required a task creation")
+					return nil
+				}
+			}
+			if asState == string(openapiclient.TASKACTIONSTATEENUM_SUCCEEDED) {
+				return nil
+			}
+			if asState == string(openapiclient.TASKACTIONSTATEENUM_FAILED) {
+				return ErrFailedTask
+			}
+
 		} else {
 			return handleReadFailureWithRetries(ctx, &readClusterRetries, 2, message)
 		}