fix: added wait and polling logic to the tgw

Author: burythehammer

provider/datasource_rediscloud_active_active_transit_gateway.go

@@ -80,22 +80,13 @@ func dataSourceActiveActiveTransitGatewayRead(ctx context.Context, d *schema.Res
 		return diag.FromErr(err)
 	}
 	regionId := d.Get("region_id").(int)
-	tgwTask, err := api.Client.TransitGatewayAttachments.GetActiveActive(ctx, subId, regionId)
+
+	// Wait for Transit Gateway resource to become available (handles subscription provisioning delays)
+	tgwTask, err := utils.WaitForActiveActiveTransitGatewayResourceToBeAvailable(ctx, subId, regionId, api)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	// Check for nil response structure
-	if tgwTask == nil {
-		return diag.Errorf("Transit Gateway API returned nil task for subscription %d, region %d", subId, regionId)
-	}
-	if tgwTask.Response == nil {
-		return diag.Errorf("Transit Gateway API returned nil response for subscription %d, region %d", subId, regionId)
-	}
-	if tgwTask.Response.Resource == nil {
-		return diag.Errorf("Transit Gateway API returned nil resource for subscription %d, region %d - subscription may not be fully provisioned yet", subId, regionId)
-	}
-
 	var filters []func(db *attachments.TransitGatewayAttachment) bool
 
 	if v, ok := d.GetOk("tgw_id"); ok {

provider/resource_rediscloud_active_active_transit_gateway_attachment.go

@@ -123,7 +123,8 @@ func resourceRedisCloudActiveActiveTransitGatewayAttachmentRead(ctx context.Cont
 	}
 	tgwId := d.Get("tgw_id").(int)
 
-	tgwTask, err := api.Client.TransitGatewayAttachments.GetActiveActive(ctx, subId, regionId)
+	// Wait for Transit Gateway resource to become available (handles subscription provisioning delays)
+	tgwTask, err := utils.WaitForActiveActiveTransitGatewayResourceToBeAvailable(ctx, subId, regionId, api)
 	if err != nil {
 		return diag.FromErr(err)
 	}

provider/utils/get_set.go

@@ -12,6 +12,10 @@ import (
 // Unfortunately there's no "time-remaining-before-timeout" utility, or we could use that in the wait blocks.
 const SafetyTimeout = 6 * time.Hour
 
+// TransitGatewayProvisioningTimeout is used when waiting for Transit Gateway resources to become available during
+// subscription provisioning. This is shorter than SafetyTimeout as tests typically complete within 45 minutes.
+const TransitGatewayProvisioningTimeout = 40 * time.Minute
+
 // GetString safely retrieves a string value from schema.ResourceData.
 func GetString(d *schema.ResourceData, key string) *string {
 	if v, ok := d.GetOk(key); ok {

provider/utils/wait.go

@@ -2,7 +2,9 @@ package utils
 
 import (
 	"context"
+	"fmt"
 	"github.com/RedisLabs/rediscloud-go-api/service/databases"
+	"github.com/RedisLabs/rediscloud-go-api/service/transit_gateway/attachments"
 	"log"
 	"time"
 
@@ -77,3 +79,40 @@ func WaitForDatabaseToBeActive(ctx context.Context, subId, id int, api *client.A
 
 	return nil
 }
+
+// WaitForActiveActiveTransitGatewayResourceToBeAvailable waits for Active-Active Transit Gateway API resources
+// to become available. This handles the case where Response.Resource is nil during initial subscription provisioning.
+func WaitForActiveActiveTransitGatewayResourceToBeAvailable(ctx context.Context, subId int, regionId int, api *client.ApiClient) (*attachments.GetAttachmentsTask, error) {
+	wait := &retry.StateChangeConf{
+		Pending:      []string{"provisioning"},
+		Target:       []string{"available"},
+		Timeout:      TransitGatewayProvisioningTimeout,
+		Delay:        10 * time.Second,
+		PollInterval: 30 * time.Second,
+
+		Refresh: func() (result interface{}, state string, err error) {
+			log.Printf("[DEBUG] Waiting for Active-Active Transit Gateway resource to be available for subscription %d, region %d", subId, regionId)
+
+			tgwTask, err := api.Client.TransitGatewayAttachments.GetActiveActive(ctx, subId, regionId)
+			if err != nil {
+				return nil, "", err
+			}
+
+			// Check for nil response structure during provisioning
+			if tgwTask == nil || tgwTask.Response == nil || tgwTask.Response.Resource == nil {
+				return nil, "provisioning", nil
+			}
+
+			return tgwTask, "available", nil
+		},
+	}
+
+	result, err := wait.WaitForStateContext(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("timeout waiting for Active-Active Transit Gateway resource to become available for subscription %d, region %d. "+
+			"This may indicate the subscription is still provisioning or there's an issue with the subscription setup. "+
+			"Original error: %w", subId, regionId, err)
+	}
+
+	return result.(*attachments.GetAttachmentsTask), nil
+}