TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 00:47:33 +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

20
internal/query/user_membership.go
View File

@@ -107,7 +107,7 @@ func (q *Queries) Memberships(ctx context.Context, queries *MembershipSearchQuer
if err != nil {
return nil, errors.ThrowInvalidArgument(err, "QUERY-T84X9", "Errors.Query.InvalidRequest")
}
latestSequence, err := q.latestSequence(ctx, orgMemberTable, iamMemberTable, projectMemberTable, projectGrantMemberTable)
latestSequence, err := q.latestSequence(ctx, orgMemberTable, instanceMemberTable, projectMemberTable, projectGrantMemberTable)
if err != nil {
return nil, err
}
@@ -162,7 +162,7 @@ var (
table: membershipAlias,
}
membershipIAMID = Column{
name: projection.IAMMemberIAMIDCol,
name: projection.InstanceMemberIAMIDCol,
table: membershipAlias,
}
membershipProjectID = Column{
@@ -299,17 +299,17 @@ func prepareOrgMember() string {
func prepareIAMMember() string {
stmt, _ := sq.Select(
IAMMemberUserID.identifier(),
IAMMemberRoles.identifier(),
IAMMemberCreationDate.identifier(),
IAMMemberChangeDate.identifier(),
IAMMemberSequence.identifier(),
IAMMemberResourceOwner.identifier(),
InstanceMemberUserID.identifier(),
InstanceMemberRoles.identifier(),
InstanceMemberCreationDate.identifier(),
InstanceMemberChangeDate.identifier(),
InstanceMemberSequence.identifier(),
InstanceMemberResourceOwner.identifier(),
"NULL::STRING AS "+membershipOrgID.name,
IAMMemberIAMID.identifier(),
InstanceMemberIAMID.identifier(),
"NULL::STRING AS "+membershipProjectID.name,
"NULL::STRING AS "+membershipGrantID.name,
).From(iamMemberTable.identifier()).MustSql()
).From(instanceMemberTable.identifier()).MustSql()
return stmt
}