mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 21:17:32 +00:00
feat: remove org (#4148)
* feat(command): remove org * refactor: imports, unused code, error handling * reduce org removed in action * add org deletion to projections * add org removal to projections * add org removal to projections * org removed projection * lint import * projections * fix: table names in tests * fix: table names in tests * logging * add org state * fix(domain): add Owner removed to object details * feat(ListQuery): add with owner removed * fix(org-delete): add bool to functions to select with owner removed * fix(org-delete): add bools to user grants with events to determine if dependencies lost owner * fix(org-delete): add unit tests for owner removed and org removed events * fix(org-delete): add handling of org remove for grants and members * fix(org-delete): correction of unit tests for owner removed * fix(org-delete): update projections, unit tests and get functions * fix(org-delete): add change date to authnkeys and owner removed to org metadata * fix(org-delete): include owner removed for login names * fix(org-delete): some column fixes in projections and build for queries with owner removed * indexes * fix(org-delete): include review changes * fix(org-delete): change user projection name after merge * fix(org-delete): include review changes for project grant where no project owner is necessary * fix(org-delete): include auth and adminapi tables with owner removed information * fix(org-delete): cleanup username and orgdomain uniqueconstraints when org is removed * fix(org-delete): add permissions for org.remove * remove unnecessary unique constraints * fix column order in primary keys * fix(org-delete): include review changes * fix(org-delete): add owner removed indexes and chang setup step to create tables * fix(org-delete): move PK order of instance_id and change added user_grant from review * fix(org-delete): no params for prepareUserQuery * change to step 6 * merge main * fix(org-delete): OldUserName rename to private * fix linting * cleanup * fix: remove org test * create prerelease * chore: delete org-delete as prerelease Co-authored-by: Stefan Benz <stefan@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
This commit is contained in:
Silvan
@@ -14,23 +14,23 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
projectGrantsQuery = `SELECT projections.project_grants2.project_id,` +
|
||||
` projections.project_grants2.grant_id,` +
|
||||
` projections.project_grants2.creation_date,` +
|
||||
` projections.project_grants2.change_date,` +
|
||||
` projections.project_grants2.resource_owner,` +
|
||||
` projections.project_grants2.state,` +
|
||||
` projections.project_grants2.sequence,` +
|
||||
` projections.projects2.name,` +
|
||||
` projections.project_grants2.granted_org_id,` +
|
||||
projectGrantsQuery = `SELECT projections.project_grants3.project_id,` +
|
||||
` projections.project_grants3.grant_id,` +
|
||||
` projections.project_grants3.creation_date,` +
|
||||
` projections.project_grants3.change_date,` +
|
||||
` projections.project_grants3.resource_owner,` +
|
||||
` projections.project_grants3.state,` +
|
||||
` projections.project_grants3.sequence,` +
|
||||
` projections.projects3.name,` +
|
||||
` projections.project_grants3.granted_org_id,` +
|
||||
` o.name,` +
|
||||
` projections.project_grants2.granted_role_keys,` +
|
||||
` projections.project_grants3.granted_role_keys,` +
|
||||
` r.name,` +
|
||||
` COUNT(*) OVER () ` +
|
||||
` FROM projections.project_grants2 ` +
|
||||
` LEFT JOIN projections.projects2 ON projections.project_grants2.project_id = projections.projects2.id AND projections.project_grants2.instance_id = projections.projects2.instance_id ` +
|
||||
` LEFT JOIN projections.orgs AS r ON projections.project_grants2.resource_owner = r.id AND projections.project_grants2.instance_id = r.instance_id` +
|
||||
` LEFT JOIN projections.orgs AS o ON projections.project_grants2.granted_org_id = o.id AND projections.project_grants2.instance_id = o.instance_id`
|
||||
` FROM projections.project_grants3 ` +
|
||||
` LEFT JOIN projections.projects3 ON projections.project_grants3.project_id = projections.projects3.id AND projections.project_grants3.instance_id = projections.projects3.instance_id ` +
|
||||
` LEFT JOIN projections.orgs AS r ON projections.project_grants3.resource_owner = r.id AND projections.project_grants3.instance_id = r.instance_id` +
|
||||
` LEFT JOIN projections.orgs AS o ON projections.project_grants3.granted_org_id = o.id AND projections.project_grants3.instance_id = o.instance_id`
|
||||
projectGrantsCols = []string{
|
||||
"project_id",
|
||||
"grant_id",
|
||||
@@ -46,22 +46,22 @@ var (
|
||||
"name",
|
||||
"count",
|
||||
}
|
||||
projectGrantQuery = `SELECT projections.project_grants2.project_id,` +
|
||||
` projections.project_grants2.grant_id,` +
|
||||
` projections.project_grants2.creation_date,` +
|
||||
` projections.project_grants2.change_date,` +
|
||||
` projections.project_grants2.resource_owner,` +
|
||||
` projections.project_grants2.state,` +
|
||||
` projections.project_grants2.sequence,` +
|
||||
` projections.projects2.name,` +
|
||||
` projections.project_grants2.granted_org_id,` +
|
||||
projectGrantQuery = `SELECT projections.project_grants3.project_id,` +
|
||||
` projections.project_grants3.grant_id,` +
|
||||
` projections.project_grants3.creation_date,` +
|
||||
` projections.project_grants3.change_date,` +
|
||||
` projections.project_grants3.resource_owner,` +
|
||||
` projections.project_grants3.state,` +
|
||||
` projections.project_grants3.sequence,` +
|
||||
` projections.projects3.name,` +
|
||||
` projections.project_grants3.granted_org_id,` +
|
||||
` o.name,` +
|
||||
` projections.project_grants2.granted_role_keys,` +
|
||||
` projections.project_grants3.granted_role_keys,` +
|
||||
` r.name` +
|
||||
` FROM projections.project_grants2 ` +
|
||||
` LEFT JOIN projections.projects2 ON projections.project_grants2.project_id = projections.projects2.id AND projections.project_grants2.instance_id = projections.projects2.instance_id ` +
|
||||
` LEFT JOIN projections.orgs AS r ON projections.project_grants2.resource_owner = r.id AND projections.project_grants2.instance_id = r.instance_id` +
|
||||
` LEFT JOIN projections.orgs AS o ON projections.project_grants2.granted_org_id = o.id AND projections.project_grants2.instance_id = o.instance_id`
|
||||
` FROM projections.project_grants3 ` +
|
||||
` LEFT JOIN projections.projects3 ON projections.project_grants3.project_id = projections.projects3.id AND projections.project_grants3.instance_id = projections.projects3.instance_id ` +
|
||||
` LEFT JOIN projections.orgs AS r ON projections.project_grants3.resource_owner = r.id AND projections.project_grants3.instance_id = r.instance_id` +
|
||||
` LEFT JOIN projections.orgs AS o ON projections.project_grants3.granted_org_id = o.id AND projections.project_grants3.instance_id = o.instance_id`
|
||||
projectGrantCols = []string{
|
||||
"project_id",
|
||||
"grant_id",
|
||||
|
||||
Reference in New Issue
Block a user