Cloud Stacks: Better "wait for readiness" (#1545)

Author: julienduchesne

internal/resources/cloud/resource_cloud_stack.go

@@ -263,7 +263,14 @@ func createStack(ctx context.Context, d *schema.ResourceData, client *gcom.APICl
 		return diag
 	}
 
-	return waitForStackReadiness(ctx, d)
+	if d.Get("wait_for_readiness").(bool) {
+		timeout := defaultReadinessTimeout
+		if timeoutVal := d.Get("wait_for_readiness_timeout").(string); timeoutVal != "" {
+			timeout, _ = time.ParseDuration(timeoutVal)
+		}
+		return waitForStackReadiness(ctx, timeout, d.Get("url").(string))
+	}
+	return nil
 }
 
 func updateStack(ctx context.Context, d *schema.ResourceData, client *gcom.APIClient) diag.Diagnostics {
@@ -295,7 +302,14 @@ func updateStack(ctx context.Context, d *schema.ResourceData, client *gcom.APICl
 		return diag
 	}
 
-	return waitForStackReadiness(ctx, d)
+	if d.Get("wait_for_readiness").(bool) {
+		timeout := defaultReadinessTimeout
+		if timeoutVal := d.Get("wait_for_readiness_timeout").(string); timeoutVal != "" {
+			timeout, _ = time.ParseDuration(timeoutVal)
+		}
+		return waitForStackReadiness(ctx, timeout, d.Get("url").(string))
+	}
+	return nil
 }
 
 func deleteStack(ctx context.Context, d *schema.ResourceData, client *gcom.APIClient) diag.Diagnostics {
@@ -422,17 +436,13 @@ func appendPath(baseURL, path string) (string, error) {
 }
 
 // waitForStackReadiness retries until the stack is ready, verified by querying the Grafana URL
-func waitForStackReadiness(ctx context.Context, d *schema.ResourceData) diag.Diagnostics {
-	if wait := d.Get("wait_for_readiness").(bool); !wait {
-		return nil
-	}
-
-	timeout := defaultReadinessTimeout
-	if timeoutVal := d.Get("wait_for_readiness_timeout").(string); timeoutVal != "" {
-		timeout, _ = time.ParseDuration(timeoutVal)
+func waitForStackReadiness(ctx context.Context, timeout time.Duration, stackURL string) diag.Diagnostics {
+	healthURL, joinErr := url.JoinPath(stackURL, "api", "health")
+	if joinErr != nil {
+		return diag.FromErr(joinErr)
 	}
 	err := retry.RetryContext(ctx, timeout, func() *retry.RetryError {
-		req, err := http.NewRequestWithContext(ctx, http.MethodHead, d.Get("url").(string), nil)
+		req, err := http.NewRequestWithContext(ctx, http.MethodGet, healthURL, nil)
 		if err != nil {
 			return retry.NonRetryableError(err)
 		}
@@ -456,12 +466,21 @@ func waitForStackReadiness(ctx context.Context, d *schema.ResourceData) diag.Dia
 		return nil
 	})
 	if err != nil {
-		return diag.Errorf("error waiting for stack to be ready: %v", err)
+		return diag.Errorf("error waiting for stack (URL: %s) to be ready: %v", healthURL, err)
 	}
 
 	return nil
 }
 
+func waitForStackReadinessFromSlug(ctx context.Context, timeout time.Duration, slug string, client *gcom.APIClient) diag.Diagnostics {
+	stack, _, err := client.InstancesAPI.GetInstance(ctx, slug).Execute()
+	if err != nil {
+		return apiError(err)
+	}
+
+	return waitForStackReadiness(ctx, timeout, stack.Url)
+}
+
 func defaultStackURL(slug string) string {
 	return fmt.Sprintf("https://%s.grafana.net", slug)
 }

internal/resources/cloud/resource_cloud_stack_service_account.go

@@ -81,6 +81,10 @@ Required access policy scopes:
 }
 
 func createStackServiceAccount(ctx context.Context, d *schema.ResourceData, cloudClient *gcom.APIClient) diag.Diagnostics {
+	if err := waitForStackReadinessFromSlug(ctx, 1*time.Minute, d.Get("stack_slug").(string), cloudClient); err != nil {
+		return err
+	}
+
 	stackSlug := d.Get("stack_slug").(string)
 	req := gcom.PostInstanceServiceAccountsRequest{
 		Name:       d.Get("name").(string),
@@ -116,6 +120,10 @@ func readStackServiceAccount(ctx context.Context, d *schema.ResourceData, cloudC
 		stackSlug, serviceAccountID = split[0].(string), split[1].(int64)
 	}
 
+	if err := waitForStackReadinessFromSlug(ctx, 1*time.Minute, stackSlug, cloudClient); err != nil {
+		return err
+	}
+
 	resp, httpResp, err := cloudClient.InstancesAPI.GetInstanceServiceAccount(ctx, stackSlug, strconv.FormatInt(serviceAccountID, 10)).Execute()
 	if httpResp != nil && httpResp.StatusCode == 404 {
 		d.SetId("")
@@ -135,6 +143,10 @@ func readStackServiceAccount(ctx context.Context, d *schema.ResourceData, cloudC
 }
 
 func deleteStackServiceAccount(ctx context.Context, d *schema.ResourceData, cloudClient *gcom.APIClient) diag.Diagnostics {
+	if err := waitForStackReadinessFromSlug(ctx, 1*time.Minute, d.Get("stack_slug").(string), cloudClient); err != nil {
+		return err
+	}
+
 	split, err := resourceStackServiceAccountID.Split(d.Id())
 	if err != nil {
 		return diag.FromErr(err)

internal/resources/cloud/resource_cloud_stack_service_account_token.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"strconv"
+	"time"
 
 	"github.com/grafana/grafana-com-public-clients/go/gcom"
 	"github.com/grafana/terraform-provider-grafana/v2/internal/common"
@@ -81,6 +82,10 @@ Required access policy scopes:
 }
 
 func stackServiceAccountTokenCreate(ctx context.Context, d *schema.ResourceData, cloudClient *gcom.APIClient) diag.Diagnostics {
+	if err := waitForStackReadinessFromSlug(ctx, 1*time.Minute, d.Get("stack_slug").(string), cloudClient); err != nil {
+		return err
+	}
+
 	stackSlug := d.Get("stack_slug").(string)
 	serviceAccountID, err := getStackServiceAccountID(d.Get("service_account_id").(string))
 	if err != nil {
@@ -117,6 +122,10 @@ func stackServiceAccountTokenRead(ctx context.Context, d *schema.ResourceData, c
 		return diag.FromErr(err)
 	}
 
+	if err := waitForStackReadinessFromSlug(ctx, 1*time.Minute, stackSlug, cloudClient); err != nil {
+		return err
+	}
+
 	response, _, err := cloudClient.InstancesAPI.GetInstanceServiceAccountTokens(ctx, stackSlug, strconv.FormatInt(serviceAccountID, 10)).Execute()
 	if err != nil {
 		return diag.FromErr(err)
@@ -152,6 +161,10 @@ func stackServiceAccountTokenRead(ctx context.Context, d *schema.ResourceData, c
 }
 
 func stackServiceAccountTokenDelete(ctx context.Context, d *schema.ResourceData, cloudClient *gcom.APIClient) diag.Diagnostics {
+	if err := waitForStackReadinessFromSlug(ctx, 1*time.Minute, d.Get("stack_slug").(string), cloudClient); err != nil {
+		return err
+	}
+
 	stackSlug := d.Get("stack_slug").(string)
 	serviceAccountID, err := getStackServiceAccountID(d.Get("service_account_id").(string))
 	if err != nil {