Address failing CI checks

Author: suntala

internal/resources/grafana/resource_organization_preferences.go

@@ -79,9 +79,13 @@ func (v weekStartValidator) ValidateString(ctx context.Context, req validator.St
 }
 
 // Grafana may return 401 briefly after creating a new org until the creating user's membership is propagated.
-// We use an initial delay on Create and retry on 401.
-const orgPrefsRetryAttempts = 25
-const orgPrefsRetryDelay = 6 * time.Second
+// On Create we poll GetOrgPreferences until it succeeds; UpdateOrgPreferences retries on 401 as a fallback.
+const (
+	orgPrefsReadinessTimeout = 3 * time.Minute
+	orgPrefsReadinessPoll    = 2 * time.Second
+	orgPrefsRetryAttempts    = 12
+	orgPrefsRetryDelay       = 5 * time.Second
+)
 
 func isRetryableOrgPrefs401(err error) bool {
 	if err == nil {
@@ -96,8 +100,30 @@ func isRetryableOrgPrefs401(err error) bool {
 	return strings.Contains(errStr, "401") || strings.Contains(errStr, "Unauthorized")
 }
 
+// waitForOrgPreferencesReadable polls GET /org/preferences until it succeeds or a non-retryable error occurs.
+// 401 means the org context is not ready yet (membership propagation).
+func waitForOrgPreferencesReadable(ctx context.Context, client *goapi.GrafanaHTTPAPI) error {
+	deadline := time.Now().Add(orgPrefsReadinessTimeout)
+	var lastErr error
+	for time.Now().Before(deadline) {
+		_, err := client.OrgPreferences.GetOrgPreferences()
+		if err == nil {
+			return nil
+		}
+		lastErr = err
+		if !isRetryableOrgPrefs401(err) {
+			return err
+		}
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		case <-time.After(orgPrefsReadinessPoll):
+		}
+	}
+	return lastErr
+}
+
 // updateOrgPreferencesWithRetryWithDelay calls UpdateOrgPreferences with optional initial delay and retries on 401.
-// initialDelay is used on Create to give new orgs time for membership to propagate before the first attempt.
 func updateOrgPreferencesWithRetryWithDelay(ctx context.Context, client *goapi.GrafanaHTTPAPI, body *models.UpdatePrefsCmd, initialDelay time.Duration) error {
 	if initialDelay > 0 {
 		select {
@@ -185,13 +211,16 @@ func (r *organizationPreferencesResource) Create(ctx context.Context, req resour
 	timezone := data.Timezone.ValueString()
 	weekStart := data.WeekStart.ValueString()
 
-	// Initial delay for new orgs so Grafana can propagate membership before first API call.
+	if err := waitForOrgPreferencesReadable(ctx, client); err != nil {
+		resp.Diagnostics.AddError("Organization is not ready to update preferences yet", err.Error())
+		return
+	}
 	err = updateOrgPreferencesWithRetryWithDelay(ctx, client, &models.UpdatePrefsCmd{
 		Theme:            theme,
 		HomeDashboardUID: homeDashboardUID,
 		Timezone:         timezone,
 		WeekStart:        weekStart,
-	}, 15*time.Second)
+	}, 0)
 	if err != nil {
 		resp.Diagnostics.AddError("Failed to update organization preferences", err.Error())
 		return

internal/resources/grafana/resource_organization_preferences_test.go

@@ -80,7 +80,7 @@ func TestAccResourceOrganizationPreferences(t *testing.T) {
 
 	testRandName := acctest.RandString(10)
 
-	resource.ParallelTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProtoV5ProviderFactories: testutils.ProtoV5ProviderFactories,
 		CheckDestroy:             orgCheckExists.destroyed(&org, nil),
 		Steps: []resource.TestStep{

pkg/generate/postprocessing/replace_references.go

@@ -44,6 +44,7 @@ var knownReferences = []string{
 	"grafana_contact_point.org_id=grafana_organization.id",
 	"grafana_dashboard.folder=grafana_folder.id",
 	"grafana_dashboard.folder=grafana_folder.uid",
+	"grafana_dashboard.home_dashboard_uid=grafana_dashboard.uid",
 	"grafana_dashboard.name=grafana_library_panel.name",
 	"grafana_dashboard.org_id=grafana_organization.id",
 	"grafana_dashboard.org_id=grafana_organization.org_id",