TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rename iam to instance (#3345)

Browse Source 
* fix: rename iam command side to instance

* fix: rename iam command side to instance

* fix: rename iam command side to instance

* fix: rename iam command side to instance

* fix: rename orgiampolicy to domain policy

* fix: merge conflicts

* fix: protos

* fix: md files

* implement deprecated org iam policy again

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
2022-03-24 17:21:34 +01:00
committed by GitHub
parent 504fe5b761
commit 9d4f296c62
274 changed files with 12073 additions and 11853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/query/user_membership_test.go
View File

@@ -20,7 +20,7 @@ var (
", memberships.sequence" +
", memberships.resource_owner" +
", memberships.org_id" +
", memberships.iam_id" +
", memberships.instance_id" +
", memberships.project_id" +
", memberships.grant_id" +
", projections.projects.name" +
@@ -34,7 +34,7 @@ var (
", members.sequence" +
", members.resource_owner" +
", members.org_id" +
", NULL::STRING AS iam_id" +
", NULL::STRING AS instance_id" +
", NULL::STRING AS project_id" +
", NULL::STRING AS grant_id" +
" FROM projections.org_members as members" +
@@ -46,10 +46,10 @@ var (
", members.sequence" +
", members.resource_owner" +
", NULL::STRING AS org_id" +
", members.iam_id" +
", members.instance_id" +
", NULL::STRING AS project_id" +
", NULL::STRING AS grant_id" +
" FROM projections.iam_members as members" +
" FROM projections.instance_members as members" +
" UNION ALL " +
"SELECT members.user_id" +
", members.roles" +
@@ -58,7 +58,7 @@ var (
", members.sequence" +
", members.resource_owner" +
", NULL::STRING AS org_id" +
", NULL::STRING AS iam_id" +
", NULL::STRING AS instance_id" +
", members.project_id" +
", NULL::STRING AS grant_id" +
" FROM projections.project_members as members" +
@@ -70,7 +70,7 @@ var (
", members.sequence" +
", members.resource_owner" +
", NULL::STRING AS org_id" +
", NULL::STRING AS iam_id" +
", NULL::STRING AS instance_id" +
", members.project_id" +
", members.grant_id" +
" FROM projections.project_grant_members as members" +
@@ -85,7 +85,7 @@ var (
"sequence",
"resource_owner",
"org_id",
"iam_id",
"instance_id",
"project_id",
"grant_id",
"name", //project name
@@ -160,7 +160,7 @@ func Test_MembershipPrepares(t *testing.T) {
},
},
{
name: "prepareMembershipsQuery one iam member",
name: "prepareMembershipsQuery one instance member",
prepare: prepareMembershipsQuery,
want: want{
sqlExpectations: mockQueries(