fixes for cli config download

main.go

@@ -326,8 +326,8 @@ func setup() {
 
 	// users and role management services
 	cc := common.CliConfigDownloadData{
-		RestEndpoint: apiAddr,
-		OpsEndpoint:  apiAddr,
+		RestEndpoint: sentryBootstrapAddr,
+		OpsEndpoint:  sentryBootstrapAddr,
 	}
 	if dev {
 		cc.Profile = "staging"

persistence/migrations/admindb/000021_sentry_account_permission.up.sql

@@ -27,6 +27,22 @@ FROM (
         ga.trash = FALSE
         AND gr.trash = FALSE
     UNION
+    SELECT
+        ga.account_id,
+        gr.group_id,
+	p.id,
+        gr.role_id,
+        gr.organization_id,
+        gr.partner_id
+    FROM
+        authsrv_groupaccount ga
+        INNER JOIN authsrv_grouprole gr ON ga.group_id = gr.group_id
+        INNER JOIN authsrv_resourcerole rr ON rr.id = gr.role_id AND rr.scope = 'organization'
+        INNER JOIN authsrv_project p ON p.organization_id = gr.organization_id AND p.partner_id = gr.partner_id
+    WHERE
+        ga.trash = FALSE
+        AND gr.trash = FALSE
+    UNION
     SELECT
         account_id,
         uuid_nil() as group_id,