CENG-507: Add sleep timeout for control/upstream tests to battle flakes

Author: BartoszBlizniak

cloudsmith/resource_entitlement_control_test.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
@@ -27,6 +28,20 @@ func TestAccEntitlementControl_basic(t *testing.T) {
 				Config: testAccEntitlementControlConfigBasic,
 				Check: resource.ComposeTestCheckFunc(
 					testAccEntitlementControlCheckExists("cloudsmith_entitlement_control.test"),
+					func(s *terraform.State) error {
+						resourceState, ok := s.RootModule().Resources["cloudsmith_entitlement_control.test"]
+						if !ok {
+							return fmt.Errorf("resource not found: %s", "cloudsmith_entitlement_control.test")
+						}
+						if resourceState.Primary.ID == "" {
+							return fmt.Errorf("resource id not set")
+						}
+						pc := testAccProvider.Meta().(*providerConfig)
+						namespace := os.Getenv("CLOUDSMITH_NAMESPACE")
+						repository := resourceState.Primary.Attributes["repository"]
+						identifier := resourceState.Primary.ID
+						return waitForEntitlementControlEnabled(pc, namespace, repository, identifier, true, 15)
+					},
 					resource.TestCheckResourceAttr("cloudsmith_entitlement_control.test", "namespace", os.Getenv("CLOUDSMITH_NAMESPACE")),
 					resource.TestCheckResourceAttr("cloudsmith_entitlement_control.test", "enabled", "true"),
 				),
@@ -35,6 +50,20 @@ func TestAccEntitlementControl_basic(t *testing.T) {
 				Config: testAccEntitlementControlConfigBasicUpdate,
 				Check: resource.ComposeTestCheckFunc(
 					testAccEntitlementControlCheckExists("cloudsmith_entitlement_control.test"),
+					func(s *terraform.State) error {
+						resourceState, ok := s.RootModule().Resources["cloudsmith_entitlement_control.test"]
+						if !ok {
+							return fmt.Errorf("resource not found: %s", "cloudsmith_entitlement_control.test")
+						}
+						if resourceState.Primary.ID == "" {
+							return fmt.Errorf("resource id not set")
+						}
+						pc := testAccProvider.Meta().(*providerConfig)
+						namespace := os.Getenv("CLOUDSMITH_NAMESPACE")
+						repository := resourceState.Primary.Attributes["repository"]
+						identifier := resourceState.Primary.ID
+						return waitForEntitlementControlEnabled(pc, namespace, repository, identifier, false, 15)
+					},
 					resource.TestCheckResourceAttr("cloudsmith_entitlement_control.test", "namespace", os.Getenv("CLOUDSMITH_NAMESPACE")),
 					resource.TestCheckResourceAttr("cloudsmith_entitlement_control.test", "enabled", "false"),
 				),
@@ -120,6 +149,28 @@ func testAccEntitlementControlCheckExists(resourceName string) resource.TestChec
 	}
 }
 
+func waitForEntitlementControlEnabled(pc *providerConfig, namespace, repository, identifier string, wantEnabled bool, timeoutSec int) error {
+	deadline := time.Now().Add(time.Duration(timeoutSec) * time.Second)
+	for {
+		req := pc.APIClient.EntitlementsApi.EntitlementsRead(pc.Auth, namespace, repository, identifier)
+		entitlement, resp, err := pc.APIClient.EntitlementsApi.EntitlementsReadExecute(req)
+		if resp != nil {
+			defer resp.Body.Close()
+		}
+		if err == nil {
+			if entitlement.GetIsActive() == wantEnabled {
+				return nil
+			}
+		} else if is404(resp) {
+			return fmt.Errorf("entitlement not found while waiting for enabled=%v", wantEnabled)
+		}
+		if time.Now().After(deadline) {
+			return fmt.Errorf("timeout waiting for entitlement control enabled=%v", wantEnabled)
+		}
+		time.Sleep(1 * time.Second)
+	}
+}
+
 var testAccEntitlementControlConfigBasic = fmt.Sprintf(`
 resource "cloudsmith_repository" "test" {
 	name      = "terraform-acc-test-ent-ctrl"

cloudsmith/resource_repository_upstream.go

@@ -158,6 +158,23 @@ func readCertificateFiles(d *schema.ResourceData) (cert, key *string, err error)
 	return cert, key, nil
 }
 
+func waitForUpstreamActive(getUpstreamFn func() (Upstream, *http.Response, error), timeout time.Duration) error {
+	deadline := time.Now().Add(timeout)
+	for {
+		upstream, _, err := getUpstreamFn()
+		if err != nil {
+			return fmt.Errorf("error fetching upstream: %w", err)
+		}
+		if upstream.GetIsActive() {
+			return nil
+		}
+		if time.Now().After(deadline) {
+			return fmt.Errorf("timeout waiting for upstream to become active")
+		}
+		time.Sleep(1 * time.Second)
+	}
+}
+
 func resourceRepositoryUpstreamCreate(d *schema.ResourceData, m interface{}) error {
 	pc := m.(*providerConfig)
 
@@ -468,6 +485,13 @@ func resourceRepositoryUpstreamCreate(d *schema.ResourceData, m interface{}) err
 		return fmt.Errorf("error waiting for upstream (%s) to be created: %w", d.Id(), err)
 	}
 
+	// After creation, wait for is_active to be true (max 15s)
+	if err := waitForUpstreamActive(func() (Upstream, *http.Response, error) {
+		return getUpstream(d, m)
+	}, 15*time.Second); err != nil {
+		return err
+	}
+
 	return resourceRepositoryUpstreamRead(d, m)
 }