fix: Clear auto_assign_org last to improve user experience on Grafana (…

…#13)

pkg/reconcile.go

@@ -68,6 +68,18 @@ outAdmins:
 	}
 	klog.Infof("Found %d admin users", len(keycloakAdmins))
 
+	grafanaOrgsMap, err := reconcileAllOrgs(ctx, config, keycloakOrganizations, grafanaClient, dashboards)
+	if err != nil {
+		return err
+	}
+
+	klog.Infof("Checking permissions of normal orgs...")
+	grafanaPermissionsMap := getGrafanaPermissionsMap(keycloakUserGroups, keycloakAdmins, keycloakOrganizations)
+	err = reconcilePermissions(ctx, grafanaPermissionsMap, grafanaOrgsMap, grafanaClient)
+	if err != nil {
+		return err
+	}
+
 	if config.GrafanaClearAutoAssignOrg {
 		klog.Infof("Fetching auto_assign_org_id...")
 		autoAssignOrgId, err := grafanaClient.GetAutoAssignOrgId()
@@ -82,18 +94,6 @@ outAdmins:
 		}
 	}
 
-	grafanaOrgsMap, err := reconcileAllOrgs(ctx, config, keycloakOrganizations, grafanaClient, dashboards)
-	if err != nil {
-		return err
-	}
-
-	klog.Infof("Checking permissions of normal orgs...")
-	grafanaPermissionsMap := getGrafanaPermissionsMap(keycloakUserGroups, keycloakAdmins, keycloakOrganizations)
-	err = reconcilePermissions(ctx, grafanaPermissionsMap, grafanaOrgsMap, grafanaClient)
-	if err != nil {
-		return err
-	}
-
 	grafanaClient.CloseIdleConnections()
 	keycloakClient.CloseIdleConnections()