mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 11:34:26 +00:00
f3e6f3b23b
* 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>
384 lines
11 KiB
Go
384 lines
11 KiB
Go
package query
|
|
|
|
import (
|
|
"database/sql"
|
|
"database/sql/driver"
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"testing"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
errs "github.com/zitadel/zitadel/internal/errors"
|
|
)
|
|
|
|
var (
|
|
projectCols = []string{
|
|
"id",
|
|
"creation_date",
|
|
"change_date",
|
|
"resource_owner",
|
|
"state",
|
|
"sequence",
|
|
"name",
|
|
"project_role_assertion",
|
|
"project_role_check",
|
|
"has_project_check",
|
|
"private_labeling_setting",
|
|
}
|
|
)
|
|
|
|
func Test_ProjectPrepares(t *testing.T) {
|
|
type want struct {
|
|
sqlExpectations sqlExpectation
|
|
err checkErr
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
prepare interface{}
|
|
want want
|
|
object interface{}
|
|
}{
|
|
{
|
|
name: "prepareProjectsQuery no result",
|
|
prepare: prepareProjectsQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
regexp.QuoteMeta(`SELECT projections.projects3.id,`+
|
|
` projections.projects3.creation_date,`+
|
|
` projections.projects3.change_date,`+
|
|
` projections.projects3.resource_owner,`+
|
|
` projections.projects3.state,`+
|
|
` projections.projects3.sequence,`+
|
|
` projections.projects3.name,`+
|
|
` projections.projects3.project_role_assertion,`+
|
|
` projections.projects3.project_role_check,`+
|
|
` projections.projects3.has_project_check,`+
|
|
` projections.projects3.private_labeling_setting,`+
|
|
` COUNT(*) OVER ()`+
|
|
` FROM projections.projects3`),
|
|
nil,
|
|
nil,
|
|
),
|
|
},
|
|
object: &Projects{Projects: []*Project{}},
|
|
},
|
|
{
|
|
name: "prepareProjectsQuery one result",
|
|
prepare: prepareProjectsQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
regexp.QuoteMeta(`SELECT projections.projects3.id,`+
|
|
` projections.projects3.creation_date,`+
|
|
` projections.projects3.change_date,`+
|
|
` projections.projects3.resource_owner,`+
|
|
` projections.projects3.state,`+
|
|
` projections.projects3.sequence,`+
|
|
` projections.projects3.name,`+
|
|
` projections.projects3.project_role_assertion,`+
|
|
` projections.projects3.project_role_check,`+
|
|
` projections.projects3.has_project_check,`+
|
|
` projections.projects3.private_labeling_setting,`+
|
|
` COUNT(*) OVER ()`+
|
|
` FROM projections.projects3`),
|
|
[]string{
|
|
"id",
|
|
"creation_date",
|
|
"change_date",
|
|
"resource_owner",
|
|
"state",
|
|
"sequence",
|
|
"name",
|
|
"project_role_assertion",
|
|
"project_role_check",
|
|
"has_project_check",
|
|
"private_labeling_setting",
|
|
"count",
|
|
},
|
|
[][]driver.Value{
|
|
{
|
|
"id",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
domain.ProjectStateActive,
|
|
uint64(20211108),
|
|
"project-name",
|
|
true,
|
|
true,
|
|
true,
|
|
domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Projects{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
Projects: []*Project{
|
|
{
|
|
ID: "id",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
State: domain.ProjectStateActive,
|
|
Sequence: 20211108,
|
|
Name: "project-name",
|
|
ProjectRoleAssertion: true,
|
|
ProjectRoleCheck: true,
|
|
HasProjectCheck: true,
|
|
PrivateLabelingSetting: domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareProjectsQuery multiple result",
|
|
prepare: prepareProjectsQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
regexp.QuoteMeta(`SELECT projections.projects3.id,`+
|
|
` projections.projects3.creation_date,`+
|
|
` projections.projects3.change_date,`+
|
|
` projections.projects3.resource_owner,`+
|
|
` projections.projects3.state,`+
|
|
` projections.projects3.sequence,`+
|
|
` projections.projects3.name,`+
|
|
` projections.projects3.project_role_assertion,`+
|
|
` projections.projects3.project_role_check,`+
|
|
` projections.projects3.has_project_check,`+
|
|
` projections.projects3.private_labeling_setting,`+
|
|
` COUNT(*) OVER ()`+
|
|
` FROM projections.projects3`),
|
|
[]string{
|
|
"id",
|
|
"creation_date",
|
|
"change_date",
|
|
"resource_owner",
|
|
"state",
|
|
"sequence",
|
|
"name",
|
|
"project_role_assertion",
|
|
"project_role_check",
|
|
"has_project_check",
|
|
"private_labeling_setting",
|
|
"count",
|
|
},
|
|
[][]driver.Value{
|
|
{
|
|
"id-1",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
domain.ProjectStateActive,
|
|
uint64(20211108),
|
|
"project-name-1",
|
|
true,
|
|
true,
|
|
true,
|
|
domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy,
|
|
},
|
|
{
|
|
"id-2",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
domain.ProjectStateActive,
|
|
uint64(20211108),
|
|
"project-name-2",
|
|
false,
|
|
false,
|
|
false,
|
|
domain.PrivateLabelingSettingAllowLoginUserResourceOwnerPolicy,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Projects{
|
|
SearchResponse: SearchResponse{
|
|
Count: 2,
|
|
},
|
|
Projects: []*Project{
|
|
{
|
|
ID: "id-1",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
State: domain.ProjectStateActive,
|
|
Sequence: 20211108,
|
|
Name: "project-name-1",
|
|
ProjectRoleAssertion: true,
|
|
ProjectRoleCheck: true,
|
|
HasProjectCheck: true,
|
|
PrivateLabelingSetting: domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy,
|
|
},
|
|
{
|
|
ID: "id-2",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
State: domain.ProjectStateActive,
|
|
Sequence: 20211108,
|
|
Name: "project-name-2",
|
|
ProjectRoleAssertion: false,
|
|
ProjectRoleCheck: false,
|
|
HasProjectCheck: false,
|
|
PrivateLabelingSetting: domain.PrivateLabelingSettingAllowLoginUserResourceOwnerPolicy,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareProjectsQuery sql err",
|
|
prepare: prepareProjectsQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
regexp.QuoteMeta(`SELECT projections.projects3.id,`+
|
|
` projections.projects3.creation_date,`+
|
|
` projections.projects3.change_date,`+
|
|
` projections.projects3.resource_owner,`+
|
|
` projections.projects3.state,`+
|
|
` projections.projects3.sequence,`+
|
|
` projections.projects3.name,`+
|
|
` projections.projects3.project_role_assertion,`+
|
|
` projections.projects3.project_role_check,`+
|
|
` projections.projects3.has_project_check,`+
|
|
` projections.projects3.private_labeling_setting,`+
|
|
` COUNT(*) OVER ()`+
|
|
` FROM projections.projects3`),
|
|
sql.ErrConnDone,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errors.Is(err, sql.ErrConnDone) {
|
|
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: nil,
|
|
},
|
|
{
|
|
name: "prepareProjectQuery no result",
|
|
prepare: prepareProjectQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
`SELECT projections.projects3.id,`+
|
|
` projections.projects3.creation_date,`+
|
|
` projections.projects3.change_date,`+
|
|
` projections.projects3.resource_owner,`+
|
|
` projections.projects3.state,`+
|
|
` projections.projects3.sequence,`+
|
|
` projections.projects3.name,`+
|
|
` projections.projects3.project_role_assertion,`+
|
|
` projections.projects3.project_role_check,`+
|
|
` projections.projects3.has_project_check,`+
|
|
` projections.projects3.private_labeling_setting`+
|
|
` FROM projections.projects3`,
|
|
nil,
|
|
nil,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errs.IsNotFound(err) {
|
|
return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: (*Project)(nil),
|
|
},
|
|
{
|
|
name: "prepareProjectQuery found",
|
|
prepare: prepareProjectQuery,
|
|
want: want{
|
|
sqlExpectations: mockQuery(
|
|
regexp.QuoteMeta(`SELECT projections.projects3.id,`+
|
|
` projections.projects3.creation_date,`+
|
|
` projections.projects3.change_date,`+
|
|
` projections.projects3.resource_owner,`+
|
|
` projections.projects3.state,`+
|
|
` projections.projects3.sequence,`+
|
|
` projections.projects3.name,`+
|
|
` projections.projects3.project_role_assertion,`+
|
|
` projections.projects3.project_role_check,`+
|
|
` projections.projects3.has_project_check,`+
|
|
` projections.projects3.private_labeling_setting`+
|
|
` FROM projections.projects3`),
|
|
[]string{
|
|
"id",
|
|
"creation_date",
|
|
"change_date",
|
|
"resource_owner",
|
|
"state",
|
|
"sequence",
|
|
"name",
|
|
"project_role_assertion",
|
|
"project_role_check",
|
|
"has_project_check",
|
|
"private_labeling_setting",
|
|
},
|
|
[]driver.Value{
|
|
"id",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
domain.ProjectStateActive,
|
|
uint64(20211108),
|
|
"project-name",
|
|
true,
|
|
true,
|
|
true,
|
|
domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy,
|
|
},
|
|
),
|
|
},
|
|
object: &Project{
|
|
ID: "id",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
State: domain.ProjectStateActive,
|
|
Sequence: 20211108,
|
|
Name: "project-name",
|
|
ProjectRoleAssertion: true,
|
|
ProjectRoleCheck: true,
|
|
HasProjectCheck: true,
|
|
PrivateLabelingSetting: domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy,
|
|
},
|
|
},
|
|
{
|
|
name: "prepareProjectQuery sql err",
|
|
prepare: prepareProjectQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
regexp.QuoteMeta(`SELECT projections.projects3.id,`+
|
|
` projections.projects3.creation_date,`+
|
|
` projections.projects3.change_date,`+
|
|
` projections.projects3.resource_owner,`+
|
|
` projections.projects3.state,`+
|
|
` projections.projects3.sequence,`+
|
|
` projections.projects3.name,`+
|
|
` projections.projects3.project_role_assertion,`+
|
|
` projections.projects3.project_role_check,`+
|
|
` projections.projects3.has_project_check,`+
|
|
` projections.projects3.private_labeling_setting`+
|
|
` FROM projections.projects3`),
|
|
sql.ErrConnDone,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errors.Is(err, sql.ErrConnDone) {
|
|
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: nil,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err)
|
|
})
|
|
}
|
|
}
|