fix: trying to fix tests

castai · Nov 14, 2023 · aeee917 · aeee917
1 parent deed807
commit aeee917
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/castai/cluster.go b/castai/cluster.go
@@ -51,7 +51,7 @@ func resourceCastaiClusterDelete(ctx context.Context, data *schema.ResourceData,
 			return retry.RetryableError(fmt.Errorf("triggered cluster deletion"))
 		}
 
-		if agentStatus == sdk.ClusterAgentStatusDisconnected {
+		if agentStatus == sdk.ClusterAgentStatusDisconnected || agentStatus == "connecting" {
 			return triggerDelete()
 		}
 
@@ -66,11 +66,11 @@ func resourceCastaiClusterDelete(ctx context.Context, data *schema.ResourceData,
 		}
 
 		if agentStatus == sdk.ClusterAgentStatusDisconnecting {
-			return retry.RetryableError(fmt.Errorf("agent is disconnecting"))
+			return retry.RetryableError(fmt.Errorf("agent is disconnecting cluster status %s agent status %s", clusterStatus, agentStatus))
 		}
 
 		if clusterStatus == sdk.ClusterStatusDeleting {
-			return retry.RetryableError(fmt.Errorf("cluster is deleting"))
+			return retry.RetryableError(fmt.Errorf("cluster is deleting cluster status %s agent status", clusterStatus, agentStatus))
 		}
 
 		if toString(clusterResponse.JSON200.CredentialsId) != "" && agentStatus != sdk.ClusterAgentStatusDisconnected {
@@ -83,7 +83,7 @@ func resourceCastaiClusterDelete(ctx context.Context, data *schema.ResourceData,
 				return retry.NonRetryableError(err)
 			}
 
-			return retry.RetryableError(fmt.Errorf("triggered agent disconnection"))
+			return retry.RetryableError(fmt.Errorf("triggered agent disconnection cluster status %s agent status %s", clusterStatus, agentStatus))
 		}
 
 		if agentStatus == sdk.ClusterAgentStatusDisconnected && clusterStatus != sdk.ClusterStatusDeleted {

diff --git a/castai/resource_aks_cluster.go b/castai/resource_aks_cluster.go
@@ -36,7 +36,7 @@ func resourceAKSCluster() *schema.Resource {
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(5 * time.Minute),
 			Update: schema.DefaultTimeout(1 * time.Minute),
-			Delete: schema.DefaultTimeout(2 * time.Minute),
+			Delete: schema.DefaultTimeout(6 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/castai/resource_eks_cluster.go b/castai/resource_eks_cluster.go
@@ -33,7 +33,7 @@ func resourceEKSCluster() *schema.Resource {
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(5 * time.Minute),
 			Update: schema.DefaultTimeout(1 * time.Minute),
-			Delete: schema.DefaultTimeout(5 * time.Minute),
+			Delete: schema.DefaultTimeout(6 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{