TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:27:42 +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

66
internal/query/iam_member.go
View File

@@ -14,41 +14,41 @@ import (
)
var (
iamMemberTable = table{
name: projection.IAMMemberProjectionTable,
instanceMemberTable = table{
name: projection.InstanceMemberProjectionTable,
alias: "members",
}
IAMMemberUserID = Column{
InstanceMemberUserID = Column{
name: projection.MemberUserIDCol,
table: iamMemberTable,
table: instanceMemberTable,
}
IAMMemberRoles = Column{
InstanceMemberRoles = Column{
name: projection.MemberRolesCol,
table: iamMemberTable,
table: instanceMemberTable,
}
IAMMemberCreationDate = Column{
InstanceMemberCreationDate = Column{
name: projection.MemberCreationDate,
table: iamMemberTable,
table: instanceMemberTable,
}
IAMMemberChangeDate = Column{
InstanceMemberChangeDate = Column{
name: projection.MemberChangeDate,
table: iamMemberTable,
table: instanceMemberTable,
}
IAMMemberSequence = Column{
InstanceMemberSequence = Column{
name: projection.MemberSequence,
table: iamMemberTable,
table: instanceMemberTable,
}
IAMMemberResourceOwner = Column{
InstanceMemberResourceOwner = Column{
name: projection.MemberResourceOwner,
table: iamMemberTable,
table: instanceMemberTable,
}
IAMMemberInstanceID = Column{
InstanceMemberInstanceID = Column{
name: projection.MemberInstanceID,
table: iamMemberTable,
table: instanceMemberTable,
}
IAMMemberIAMID = Column{
name: projection.IAMMemberIAMIDCol,
table: iamMemberTable,
InstanceMemberIAMID = Column{
name: projection.InstanceMemberIAMIDCol,
table: instanceMemberTable,
}
)
@@ -62,16 +62,16 @@ func (q *IAMMembersQuery) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
}
func (q *Queries) IAMMembers(ctx context.Context, queries *IAMMembersQuery) (*Members, error) {
query, scan := prepareIAMMembersQuery()
query, scan := prepareInstanceMembersQuery()
stmt, args, err := queries.toQuery(query).
Where(sq.Eq{
IAMMemberInstanceID.identifier(): authz.GetInstance(ctx).ID,
InstanceMemberInstanceID.identifier(): authz.GetInstance(ctx).ID,
}).ToSql()
if err != nil {
return nil, errors.ThrowInvalidArgument(err, "QUERY-USNwM", "Errors.Query.InvalidRequest")
}
currentSequence, err := q.latestSequence(ctx, iamMemberTable)
currentSequence, err := q.latestSequence(ctx, instanceMemberTable)
if err != nil {
return nil, err
}
@@ -88,14 +88,14 @@ func (q *Queries) IAMMembers(ctx context.Context, queries *IAMMembersQuery) (*Me
return members, err
}
func prepareIAMMembersQuery() (sq.SelectBuilder, func(*sql.Rows) (*Members, error)) {
func prepareInstanceMembersQuery() (sq.SelectBuilder, func(*sql.Rows) (*Members, error)) {
return sq.Select(
IAMMemberCreationDate.identifier(),
IAMMemberChangeDate.identifier(),
IAMMemberSequence.identifier(),
IAMMemberResourceOwner.identifier(),
IAMMemberUserID.identifier(),
IAMMemberRoles.identifier(),
InstanceMemberCreationDate.identifier(),
InstanceMemberChangeDate.identifier(),
InstanceMemberSequence.identifier(),
InstanceMemberResourceOwner.identifier(),
InstanceMemberUserID.identifier(),
InstanceMemberRoles.identifier(),
LoginNameNameCol.identifier(),
HumanEmailCol.identifier(),
HumanFirstNameCol.identifier(),
@@ -104,10 +104,10 @@ func prepareIAMMembersQuery() (sq.SelectBuilder, func(*sql.Rows) (*Members, erro
MachineNameCol.identifier(),
HumanAvatarURLCol.identifier(),
countColumn.identifier(),
).From(iamMemberTable.identifier()).
LeftJoin(join(HumanUserIDCol, IAMMemberUserID)).
LeftJoin(join(MachineUserIDCol, IAMMemberUserID)).
LeftJoin(join(LoginNameUserIDCol, IAMMemberUserID)).
).From(instanceMemberTable.identifier()).
LeftJoin(join(HumanUserIDCol, InstanceMemberUserID)).
LeftJoin(join(MachineUserIDCol, InstanceMemberUserID)).
LeftJoin(join(LoginNameUserIDCol, InstanceMemberUserID)).
Where(
sq.Eq{LoginNameIsPrimaryCol.identifier(): true},
).PlaceholderFormat(sq.Dollar),