Add Retry Logic for network and instance create

civo/instances/resource_instance.go

@@ -276,13 +276,19 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m inter
 	config.Tags = tags
 
 	log.Printf("[INFO] creating the instance %s", d.Get("hostname").(string))
-	instance, err := apiClient.CreateInstance(config)
+	err := utils.RetryUntilSuccessOrTimeout(func() error {
+		instance, err := apiClient.CreateInstance(config)
+		if err != nil {
+			return err
+		}
+		d.SetId(instance.ID)
+		return nil
+	}, 10*time.Second, 2*time.Minute)
+
 	if err != nil {
-		return diag.Errorf("[ERR] failed to create instance: %s", err)
+		return diag.Errorf("[ERR] failed to create instance after multiple attempts: %s", err)
 	}
 
-	d.SetId(instance.ID)
-
 	createStateConf := &resource.StateChangeConf{
 		Pending: []string{"BUILDING"},
 		Target:  []string{"ACTIVE"},

civo/network/resource_network.go

@@ -125,13 +125,22 @@ func resourceNetworkCreate(ctx context.Context, d *schema.ResourceData, m interf
 	if vlanConfig.VlanID > 0 {
 		configs.VLanConfig = &vlanConfig
 	}
-	network, err := apiClient.CreateNetwork(configs)
+
+	// Retry the network creation using the utility function
+	err := utils.RetryUntilSuccessOrTimeout(func() error {
+		log.Printf("[INFO] Attempting to create the network %s", d.Get("label").(string))
+		network, err := apiClient.CreateNetwork(configs)
+		if err != nil {
+			return err
+		}
+		d.SetId(network.ID)
+		return nil
+	}, 10*time.Second, 2*time.Minute)
+
 	if err != nil {
-		return diag.Errorf("[ERR] failed to create a new network: %s", err)
+		return diag.Errorf("[ERR] failed to create a new network after multiple attempts: %s", err)
 	}
 
-	d.SetId(network.ID)
-
 	return resourceNetworkRead(ctx, d, m)
 }
 

internal/utils/utils.go

@@ -4,11 +4,14 @@ package utils
 // func ValidateNameSize
 
 import (
+	"errors"
 	"fmt"
+	"log"
 	"regexp"
 	"sort"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/civo/civogo"
 	"github.com/hashicorp/go-cty/cty"
@@ -171,3 +174,23 @@ func InPool(id string, list []civogo.KubernetesClusterPoolConfig) bool {
 	}
 	return false
 }
+
+// FunctionWithError is a type that defines a function returning an error.
+type FunctionWithError func() error
+
+// RetryUntilSuccessOrTimeout calls the provided function repeatedly until it returns no error or the timeout has passed.
+func RetryUntilSuccessOrTimeout(fn FunctionWithError, interval time.Duration, timeout time.Duration) error {
+	start := time.Now()
+	for {
+		err := fn()
+		if err != nil {
+			if time.Since(start) > timeout {
+				return errors.New("timeout reached")
+			}
+			log.Printf("[INFO] Retrying after error: %s", err)
+			time.Sleep(interval)
+			continue
+		}
+		return nil
+	}
+}