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:
@@ -32,24 +32,24 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
},
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.actions2.id,`+
|
||||
` projections.actions2.creation_date,`+
|
||||
` projections.actions2.change_date,`+
|
||||
` projections.actions2.resource_owner,`+
|
||||
` projections.actions2.action_state,`+
|
||||
` projections.actions2.sequence,`+
|
||||
` projections.actions2.name,`+
|
||||
` projections.actions2.script,`+
|
||||
` projections.actions2.allowed_to_fail,`+
|
||||
` projections.actions2.timeout,`+
|
||||
` projections.flows_triggers.trigger_type,`+
|
||||
` projections.flows_triggers.trigger_sequence,`+
|
||||
` projections.flows_triggers.flow_type,`+
|
||||
` projections.flows_triggers.change_date,`+
|
||||
` projections.flows_triggers.sequence,`+
|
||||
` projections.flows_triggers.resource_owner`+
|
||||
` FROM projections.flows_triggers`+
|
||||
` LEFT JOIN projections.actions2 ON projections.flows_triggers.action_id = projections.actions2.id`),
|
||||
regexp.QuoteMeta(`SELECT projections.actions3.id,`+
|
||||
` projections.actions3.creation_date,`+
|
||||
` projections.actions3.change_date,`+
|
||||
` projections.actions3.resource_owner,`+
|
||||
` projections.actions3.action_state,`+
|
||||
` projections.actions3.sequence,`+
|
||||
` projections.actions3.name,`+
|
||||
` projections.actions3.script,`+
|
||||
` projections.actions3.allowed_to_fail,`+
|
||||
` projections.actions3.timeout,`+
|
||||
` projections.flow_triggers2.trigger_type,`+
|
||||
` projections.flow_triggers2.trigger_sequence,`+
|
||||
` projections.flow_triggers2.flow_type,`+
|
||||
` projections.flow_triggers2.change_date,`+
|
||||
` projections.flow_triggers2.sequence,`+
|
||||
` projections.flow_triggers2.resource_owner`+
|
||||
` FROM projections.flow_triggers2`+
|
||||
` LEFT JOIN projections.actions3 ON projections.flow_triggers2.action_id = projections.actions3.id`),
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
@@ -66,24 +66,24 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
},
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.actions2.id,`+
|
||||
` projections.actions2.creation_date,`+
|
||||
` projections.actions2.change_date,`+
|
||||
` projections.actions2.resource_owner,`+
|
||||
` projections.actions2.action_state,`+
|
||||
` projections.actions2.sequence,`+
|
||||
` projections.actions2.name,`+
|
||||
` projections.actions2.script,`+
|
||||
` projections.actions2.allowed_to_fail,`+
|
||||
` projections.actions2.timeout,`+
|
||||
` projections.flows_triggers.trigger_type,`+
|
||||
` projections.flows_triggers.trigger_sequence,`+
|
||||
` projections.flows_triggers.flow_type,`+
|
||||
` projections.flows_triggers.change_date,`+
|
||||
` projections.flows_triggers.sequence,`+
|
||||
` projections.flows_triggers.resource_owner`+
|
||||
` FROM projections.flows_triggers`+
|
||||
` LEFT JOIN projections.actions2 ON projections.flows_triggers.action_id = projections.actions2.id`),
|
||||
regexp.QuoteMeta(`SELECT projections.actions3.id,`+
|
||||
` projections.actions3.creation_date,`+
|
||||
` projections.actions3.change_date,`+
|
||||
` projections.actions3.resource_owner,`+
|
||||
` projections.actions3.action_state,`+
|
||||
` projections.actions3.sequence,`+
|
||||
` projections.actions3.name,`+
|
||||
` projections.actions3.script,`+
|
||||
` projections.actions3.allowed_to_fail,`+
|
||||
` projections.actions3.timeout,`+
|
||||
` projections.flow_triggers2.trigger_type,`+
|
||||
` projections.flow_triggers2.trigger_sequence,`+
|
||||
` projections.flow_triggers2.flow_type,`+
|
||||
` projections.flow_triggers2.change_date,`+
|
||||
` projections.flow_triggers2.sequence,`+
|
||||
` projections.flow_triggers2.resource_owner`+
|
||||
` FROM projections.flow_triggers2`+
|
||||
` LEFT JOIN projections.actions3 ON projections.flow_triggers2.action_id = projections.actions3.id`),
|
||||
[]string{
|
||||
"id",
|
||||
"creation_date",
|
||||
@@ -155,24 +155,24 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
},
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.actions2.id,`+
|
||||
` projections.actions2.creation_date,`+
|
||||
` projections.actions2.change_date,`+
|
||||
` projections.actions2.resource_owner,`+
|
||||
` projections.actions2.action_state,`+
|
||||
` projections.actions2.sequence,`+
|
||||
` projections.actions2.name,`+
|
||||
` projections.actions2.script,`+
|
||||
` projections.actions2.allowed_to_fail,`+
|
||||
` projections.actions2.timeout,`+
|
||||
` projections.flows_triggers.trigger_type,`+
|
||||
` projections.flows_triggers.trigger_sequence,`+
|
||||
` projections.flows_triggers.flow_type,`+
|
||||
` projections.flows_triggers.change_date,`+
|
||||
` projections.flows_triggers.sequence,`+
|
||||
` projections.flows_triggers.resource_owner`+
|
||||
` FROM projections.flows_triggers`+
|
||||
` LEFT JOIN projections.actions2 ON projections.flows_triggers.action_id = projections.actions2.id`),
|
||||
regexp.QuoteMeta(`SELECT projections.actions3.id,`+
|
||||
` projections.actions3.creation_date,`+
|
||||
` projections.actions3.change_date,`+
|
||||
` projections.actions3.resource_owner,`+
|
||||
` projections.actions3.action_state,`+
|
||||
` projections.actions3.sequence,`+
|
||||
` projections.actions3.name,`+
|
||||
` projections.actions3.script,`+
|
||||
` projections.actions3.allowed_to_fail,`+
|
||||
` projections.actions3.timeout,`+
|
||||
` projections.flow_triggers2.trigger_type,`+
|
||||
` projections.flow_triggers2.trigger_sequence,`+
|
||||
` projections.flow_triggers2.flow_type,`+
|
||||
` projections.flow_triggers2.change_date,`+
|
||||
` projections.flow_triggers2.sequence,`+
|
||||
` projections.flow_triggers2.resource_owner`+
|
||||
` FROM projections.flow_triggers2`+
|
||||
` LEFT JOIN projections.actions3 ON projections.flow_triggers2.action_id = projections.actions3.id`),
|
||||
[]string{
|
||||
"id",
|
||||
"creation_date",
|
||||
@@ -276,24 +276,24 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
},
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.actions2.id,`+
|
||||
` projections.actions2.creation_date,`+
|
||||
` projections.actions2.change_date,`+
|
||||
` projections.actions2.resource_owner,`+
|
||||
` projections.actions2.action_state,`+
|
||||
` projections.actions2.sequence,`+
|
||||
` projections.actions2.name,`+
|
||||
` projections.actions2.script,`+
|
||||
` projections.actions2.allowed_to_fail,`+
|
||||
` projections.actions2.timeout,`+
|
||||
` projections.flows_triggers.trigger_type,`+
|
||||
` projections.flows_triggers.trigger_sequence,`+
|
||||
` projections.flows_triggers.flow_type,`+
|
||||
` projections.flows_triggers.change_date,`+
|
||||
` projections.flows_triggers.sequence,`+
|
||||
` projections.flows_triggers.resource_owner`+
|
||||
` FROM projections.flows_triggers`+
|
||||
` LEFT JOIN projections.actions2 ON projections.flows_triggers.action_id = projections.actions2.id`),
|
||||
regexp.QuoteMeta(`SELECT projections.actions3.id,`+
|
||||
` projections.actions3.creation_date,`+
|
||||
` projections.actions3.change_date,`+
|
||||
` projections.actions3.resource_owner,`+
|
||||
` projections.actions3.action_state,`+
|
||||
` projections.actions3.sequence,`+
|
||||
` projections.actions3.name,`+
|
||||
` projections.actions3.script,`+
|
||||
` projections.actions3.allowed_to_fail,`+
|
||||
` projections.actions3.timeout,`+
|
||||
` projections.flow_triggers2.trigger_type,`+
|
||||
` projections.flow_triggers2.trigger_sequence,`+
|
||||
` projections.flow_triggers2.flow_type,`+
|
||||
` projections.flow_triggers2.change_date,`+
|
||||
` projections.flow_triggers2.sequence,`+
|
||||
` projections.flow_triggers2.resource_owner`+
|
||||
` FROM projections.flow_triggers2`+
|
||||
` LEFT JOIN projections.actions3 ON projections.flow_triggers2.action_id = projections.actions3.id`),
|
||||
[]string{
|
||||
"id",
|
||||
"creation_date",
|
||||
@@ -350,24 +350,24 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
},
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(`SELECT projections.actions2.id,`+
|
||||
` projections.actions2.creation_date,`+
|
||||
` projections.actions2.change_date,`+
|
||||
` projections.actions2.resource_owner,`+
|
||||
` projections.actions2.action_state,`+
|
||||
` projections.actions2.sequence,`+
|
||||
` projections.actions2.name,`+
|
||||
` projections.actions2.script,`+
|
||||
` projections.actions2.allowed_to_fail,`+
|
||||
` projections.actions2.timeout,`+
|
||||
` projections.flows_triggers.trigger_type,`+
|
||||
` projections.flows_triggers.trigger_sequence,`+
|
||||
` projections.flows_triggers.flow_type,`+
|
||||
` projections.flows_triggers.change_date,`+
|
||||
` projections.flows_triggers.sequence,`+
|
||||
` projections.flows_triggers.resource_owner`+
|
||||
` FROM projections.flows_triggers`+
|
||||
` LEFT JOIN projections.actions2 ON projections.flows_triggers.action_id = projections.actions2.id`),
|
||||
regexp.QuoteMeta(`SELECT projections.actions3.id,`+
|
||||
` projections.actions3.creation_date,`+
|
||||
` projections.actions3.change_date,`+
|
||||
` projections.actions3.resource_owner,`+
|
||||
` projections.actions3.action_state,`+
|
||||
` projections.actions3.sequence,`+
|
||||
` projections.actions3.name,`+
|
||||
` projections.actions3.script,`+
|
||||
` projections.actions3.allowed_to_fail,`+
|
||||
` projections.actions3.timeout,`+
|
||||
` projections.flow_triggers2.trigger_type,`+
|
||||
` projections.flow_triggers2.trigger_sequence,`+
|
||||
` projections.flow_triggers2.flow_type,`+
|
||||
` projections.flow_triggers2.change_date,`+
|
||||
` projections.flow_triggers2.sequence,`+
|
||||
` projections.flow_triggers2.resource_owner`+
|
||||
` FROM projections.flow_triggers2`+
|
||||
` LEFT JOIN projections.actions3 ON projections.flow_triggers2.action_id = projections.actions3.id`),
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
@@ -384,18 +384,18 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
prepare: prepareTriggerActionsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.actions2.id,`+
|
||||
` projections.actions2.creation_date,`+
|
||||
` projections.actions2.change_date,`+
|
||||
` projections.actions2.resource_owner,`+
|
||||
` projections.actions2.action_state,`+
|
||||
` projections.actions2.sequence,`+
|
||||
` projections.actions2.name,`+
|
||||
` projections.actions2.script,`+
|
||||
` projections.actions2.allowed_to_fail,`+
|
||||
` projections.actions2.timeout`+
|
||||
` FROM projections.flows_triggers`+
|
||||
` LEFT JOIN projections.actions2 ON projections.flows_triggers.action_id = projections.actions2.id`),
|
||||
regexp.QuoteMeta(`SELECT projections.actions3.id,`+
|
||||
` projections.actions3.creation_date,`+
|
||||
` projections.actions3.change_date,`+
|
||||
` projections.actions3.resource_owner,`+
|
||||
` projections.actions3.action_state,`+
|
||||
` projections.actions3.sequence,`+
|
||||
` projections.actions3.name,`+
|
||||
` projections.actions3.script,`+
|
||||
` projections.actions3.allowed_to_fail,`+
|
||||
` projections.actions3.timeout`+
|
||||
` FROM projections.flow_triggers2`+
|
||||
` LEFT JOIN projections.actions3 ON projections.flow_triggers2.action_id = projections.actions3.id`),
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
@@ -407,18 +407,18 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
prepare: prepareTriggerActionsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.actions2.id,`+
|
||||
` projections.actions2.creation_date,`+
|
||||
` projections.actions2.change_date,`+
|
||||
` projections.actions2.resource_owner,`+
|
||||
` projections.actions2.action_state,`+
|
||||
` projections.actions2.sequence,`+
|
||||
` projections.actions2.name,`+
|
||||
` projections.actions2.script,`+
|
||||
` projections.actions2.allowed_to_fail,`+
|
||||
` projections.actions2.timeout`+
|
||||
` FROM projections.flows_triggers`+
|
||||
` LEFT JOIN projections.actions2 ON projections.flows_triggers.action_id = projections.actions2.id`),
|
||||
regexp.QuoteMeta(`SELECT projections.actions3.id,`+
|
||||
` projections.actions3.creation_date,`+
|
||||
` projections.actions3.change_date,`+
|
||||
` projections.actions3.resource_owner,`+
|
||||
` projections.actions3.action_state,`+
|
||||
` projections.actions3.sequence,`+
|
||||
` projections.actions3.name,`+
|
||||
` projections.actions3.script,`+
|
||||
` projections.actions3.allowed_to_fail,`+
|
||||
` projections.actions3.timeout`+
|
||||
` FROM projections.flow_triggers2`+
|
||||
` LEFT JOIN projections.actions3 ON projections.flow_triggers2.action_id = projections.actions3.id`),
|
||||
[]string{
|
||||
"id",
|
||||
"creation_date",
|
||||
@@ -467,18 +467,18 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
prepare: prepareTriggerActionsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.actions2.id,`+
|
||||
` projections.actions2.creation_date,`+
|
||||
` projections.actions2.change_date,`+
|
||||
` projections.actions2.resource_owner,`+
|
||||
` projections.actions2.action_state,`+
|
||||
` projections.actions2.sequence,`+
|
||||
` projections.actions2.name,`+
|
||||
` projections.actions2.script,`+
|
||||
` projections.actions2.allowed_to_fail,`+
|
||||
` projections.actions2.timeout`+
|
||||
` FROM projections.flows_triggers`+
|
||||
` LEFT JOIN projections.actions2 ON projections.flows_triggers.action_id = projections.actions2.id`),
|
||||
regexp.QuoteMeta(`SELECT projections.actions3.id,`+
|
||||
` projections.actions3.creation_date,`+
|
||||
` projections.actions3.change_date,`+
|
||||
` projections.actions3.resource_owner,`+
|
||||
` projections.actions3.action_state,`+
|
||||
` projections.actions3.sequence,`+
|
||||
` projections.actions3.name,`+
|
||||
` projections.actions3.script,`+
|
||||
` projections.actions3.allowed_to_fail,`+
|
||||
` projections.actions3.timeout`+
|
||||
` FROM projections.flow_triggers2`+
|
||||
` LEFT JOIN projections.actions3 ON projections.flow_triggers2.action_id = projections.actions3.id`),
|
||||
[]string{
|
||||
"id",
|
||||
"creation_date",
|
||||
@@ -551,18 +551,18 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
prepare: prepareTriggerActionsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(`SELECT projections.actions2.id,`+
|
||||
` projections.actions2.creation_date,`+
|
||||
` projections.actions2.change_date,`+
|
||||
` projections.actions2.resource_owner,`+
|
||||
` projections.actions2.action_state,`+
|
||||
` projections.actions2.sequence,`+
|
||||
` projections.actions2.name,`+
|
||||
` projections.actions2.script,`+
|
||||
` projections.actions2.allowed_to_fail,`+
|
||||
` projections.actions2.timeout`+
|
||||
` FROM projections.flows_triggers`+
|
||||
` LEFT JOIN projections.actions2 ON projections.flows_triggers.action_id = projections.actions2.id`),
|
||||
regexp.QuoteMeta(`SELECT projections.actions3.id,`+
|
||||
` projections.actions3.creation_date,`+
|
||||
` projections.actions3.change_date,`+
|
||||
` projections.actions3.resource_owner,`+
|
||||
` projections.actions3.action_state,`+
|
||||
` projections.actions3.sequence,`+
|
||||
` projections.actions3.name,`+
|
||||
` projections.actions3.script,`+
|
||||
` projections.actions3.allowed_to_fail,`+
|
||||
` projections.actions3.timeout`+
|
||||
` FROM projections.flow_triggers2`+
|
||||
` LEFT JOIN projections.actions3 ON projections.flow_triggers2.action_id = projections.actions3.id`),
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
@@ -579,8 +579,8 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
prepare: prepareFlowTypesQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.flows_triggers.flow_type`+
|
||||
` FROM projections.flows_triggers`),
|
||||
regexp.QuoteMeta(`SELECT projections.flow_triggers2.flow_type`+
|
||||
` FROM projections.flow_triggers2`),
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
@@ -592,8 +592,8 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
prepare: prepareFlowTypesQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.flows_triggers.flow_type`+
|
||||
` FROM projections.flows_triggers`),
|
||||
regexp.QuoteMeta(`SELECT projections.flow_triggers2.flow_type`+
|
||||
` FROM projections.flow_triggers2`),
|
||||
[]string{
|
||||
"flow_type",
|
||||
},
|
||||
@@ -613,8 +613,8 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
prepare: prepareFlowTypesQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.flows_triggers.flow_type`+
|
||||
` FROM projections.flows_triggers`),
|
||||
regexp.QuoteMeta(`SELECT projections.flow_triggers2.flow_type`+
|
||||
` FROM projections.flow_triggers2`),
|
||||
[]string{
|
||||
"flow_type",
|
||||
},
|
||||
@@ -638,8 +638,8 @@ func Test_FlowPrepares(t *testing.T) {
|
||||
prepare: prepareFlowTypesQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(`SELECT projections.flows_triggers.flow_type`+
|
||||
` FROM projections.flows_triggers`),
|
||||
regexp.QuoteMeta(`SELECT projections.flow_triggers2.flow_type`+
|
||||
` FROM projections.flow_triggers2`),
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
|
Reference in New Issue
Block a user