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

Author: BartoszBlizniak

cloudsmith/resource_entitlement_control.go

@@ -4,11 +4,33 @@ import (
 	"context"
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
+// waitForEntitlementControlEnabledResource polls until the entitlement token's enabled state matches wantEnabled or times out.
+func waitForEntitlementControlEnabledResource(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
+			}
+		}
+		if time.Now().After(deadline) {
+			return fmt.Errorf("timeout waiting for entitlement control enabled=%v", wantEnabled)
+		}
+		time.Sleep(1 * time.Second)
+	}
+}
+
 func entitlementControlImport(ctx context.Context, d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
 	idParts := strings.Split(d.Id(), ".")
 	if len(idParts) != 3 {
@@ -46,6 +68,9 @@ func entitlementControlCreate(d *schema.ResourceData, m interface{}) error {
 	}
 
 	d.SetId(identifier)
+	if err := waitForEntitlementControlEnabledResource(pc, namespace, repository, identifier, enabled, 15); err != nil {
+		return err
+	}
 	return entitlementControlRead(d, m)
 }
 
@@ -89,7 +114,10 @@ func entitlementControlUpdate(d *schema.ResourceData, m interface{}) error {
 			return err
 		}
 	}
-
+	// Wait for the entitlement to reach the desired state
+	if err := waitForEntitlementControlEnabledResource(pc, namespace, repository, d.Id(), enabled, 30); err != nil {
+		return err
+	}
 	return entitlementControlRead(d, m)
 }
 
@@ -104,7 +132,10 @@ func entitlementControlDelete(d *schema.ResourceData, m interface{}) error {
 	if err != nil {
 		return err
 	}
-
+	// Wait for the entitlement to be disabled
+	if err := waitForEntitlementControlEnabledResource(pc, namespace, repository, d.Id(), false, 30); err != nil {
+		return err
+	}
 	return nil
 }
 

cloudsmith/resource_repository_upstream_test.go

@@ -1377,11 +1377,11 @@ func testAccRepositoryUpstreamCheckDestroy(resourceName string) resource.TestChe
 	}
 }
 
-// waitForIsActiveTrue waits up to 2 minutes for the resource's is_active attribute to become "true", checking every 10 seconds.
+// waitForIsActiveTrue waits up to 4 minutes for the resource's is_active attribute to become "true", checking every 10 seconds.
 func waitForIsActiveTrue(resourceName string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		const (
-			maxWait  = 2 * time.Minute
+			maxWait  = 4 * time.Minute
 			interval = 10 * time.Second
 		)
 		start := time.Now()

cloudsmith/resource_saml_auth.go

@@ -162,19 +162,34 @@ func setSAMLAuthFields(d *schema.ResourceData, organization string, samlAuth *cl
 		return err
 	}
 
-	// Handle inline metadata - only set if non-empty
-	if inlineMetadata := samlAuth.GetSamlMetadataInline(); inlineMetadata != "" {
+	inlineMetadata := samlAuth.GetSamlMetadataInline()
+	url, hasURL := samlAuth.GetSamlMetadataUrlOk()
+
+	if inlineMetadata != "" {
 		if err := setField("saml_metadata_inline", inlineMetadata); err != nil {
 			return err
 		}
+		if err := setField("saml_metadata_url", ""); err != nil {
+			return err
+		}
+	} else if hasURL && url != nil && *url != "" {
+		if err := setField("saml_metadata_url", url); err != nil {
+			return err
+		}
+		if err := setField("saml_metadata_inline", ""); err != nil {
+			return err
+		}
+	} else {
+		// Neither present, clear both
+		if err := setField("saml_metadata_inline", ""); err != nil {
+			return err
+		}
+		if err := setField("saml_metadata_url", ""); err != nil {
+			return err
+		}
 	}
 
-	// Handle URL metadata with null handling
-	url, hasURL := samlAuth.GetSamlMetadataUrlOk()
-	if !hasURL || url == nil || *url == "" {
-		return setField("saml_metadata_url", nil)
-	}
-	return setField("saml_metadata_url", url)
+	return nil
 }
 
 // generateSAMLAuthID creates a unique identifier for the SAML authentication resource

cloudsmith/resource_saml_auth_test.go

@@ -24,7 +24,6 @@ func TestAccSAMLAuth_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("cloudsmith_saml_auth.test", "saml_auth_enabled", "true"),
 					resource.TestCheckResourceAttr("cloudsmith_saml_auth.test", "saml_auth_enforced", "false"),
 					resource.TestCheckResourceAttr("cloudsmith_saml_auth.test", "saml_metadata_url", "https://test.idp.example.com/metadata.xml"),
-					resource.TestCheckNoResourceAttr("cloudsmith_saml_auth.test", "saml_metadata_inline"),
 				),
 			},
 			{