Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(/internal): Add User Resource Owner #9168

Merged
merged 3 commits into from
Jan 15, 2025

Conversation

MAHANTH-wq
Copy link
Contributor

@MAHANTH-wq MAHANTH-wq commented Jan 12, 2025

Update the ../proto/zitadel/member.proto to
include the UserResourceOwner as part of member.

Update the queries to include UserResourceOwner
for the following :
zitadel/internal/query/iam_member.go
zitadel/internal/query/org_member.go
zitadel/internal/query/project_member.go
zitadel/internal/query/project_grant_member.go

Non Breaking Changes

Which Problems Are Solved

#5062

How the Problems Are Solved

  • Updated the member.proto file to include user_resource_owner. I have compiled using make compile command .
  • Changed the queries to include the userResourceOwner as part of Member.
  • Then, updated the converter to map the userResourceOwner.

Additional Changes

Replace this example text with a concise list of additional changes that this PR introduces, that are not directly solving the initial problem but are related.
For example:

  • The docs explicitly describe that the property XY is mandatory
  • Adds missing translations for validations.

Additional Context

Copy link

vercel bot commented Jan 12, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
docs ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 14, 2025 5:40pm

@hifabienne hifabienne added the os-contribution This is a contribution from our open-source community label Jan 12, 2025
@MAHANTH-wq MAHANTH-wq changed the title Feat(/internal): Add User Resource : Issue 5062 Feat(/internal): Add User Resource Jan 12, 2025
@MAHANTH-wq MAHANTH-wq changed the title Feat(/internal): Add User Resource Feat(/internal): Add User Resource Owner Jan 12, 2025
@MAHANTH-wq MAHANTH-wq changed the title Feat(/internal): Add User Resource Owner feat(/internal): Add User Resource Owner Jan 12, 2025
@muhlemmer muhlemmer requested review from muhlemmer and stebenz and removed request for muhlemmer January 14, 2025 10:31
Copy link
Collaborator

@stebenz stebenz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also change the unit tests for the queries in iam_member_test.go, org_member_test.go, project_member_test.go and project_grant_member_test.go.
Have a look at the makefile under 'core_integration_test'.

With that the PR looks good, and should be able to merge.
Thank you for the effort.

proto/zitadel/member.proto Outdated Show resolved Hide resolved
@MAHANTH-wq
Copy link
Contributor Author

Please also change the unit tests for the queries in iam_member_test.go, org_member_test.go, project_member_test.go and project_grant_member_test.go. Have a look at the makefile under 'core_integration_test'.

With that the PR looks good, and should be able to merge. Thank you for the effort.

Okay , I will change the unit tests

@MAHANTH-wq
Copy link
Contributor Author

I think , i made a mistake the commits were not signed with verified status . Will the changes still get's merged?

@stebenz
Copy link
Collaborator

stebenz commented Jan 14, 2025

I think , i made a mistake the commits were not signed with verified status . Will the changes still get's merged?

Unfortunate, but it should still be possible to merge.

@MAHANTH-wq
Copy link
Contributor Author

The core_integration_test is failing which i have not changed

@MAHANTH-wq MAHANTH-wq closed this Jan 14, 2025
@MAHANTH-wq MAHANTH-wq reopened this Jan 14, 2025
@MAHANTH-wq MAHANTH-wq closed this Jan 14, 2025
@MAHANTH-wq MAHANTH-wq reopened this Jan 14, 2025
Owner

Update the  ../proto/zitadel/member.proto to
include the UserResourceOwner as part of member.

Update the queries to include UserResourceOwner
for the following :
zitadel/internal/query/iam_member.go
zitadel/internal/query/org_member.go
zitadel/internal/query/project_member.go
zitadel/internal/query/project_grant_member.go

Non Breaking Changes
@MAHANTH-wq MAHANTH-wq force-pushed the AddUserResourceOwner branch from de09fe1 to b5b2a3b Compare January 14, 2025 17:15
@MAHANTH-wq
Copy link
Contributor Author

@stebenz Updated the PR with signed commits,
Sorry for the in-convenience i forgot to add the zitadel to the trusted repositories

@MAHANTH-wq
Copy link
Contributor Author

--- FAIL: TestServer_QuotaNotification_Limit (79.13s)
quota_test.go:15 is failing as part of checks, i have not modified it

@stebenz
Copy link
Collaborator

stebenz commented Jan 14, 2025

--- FAIL: TestServer_QuotaNotification_Limit (79.13s) quota_test.go:15 is failing as part of checks, i have not modified it

No worries, has nothing to do with your changes.

@stebenz stebenz merged commit b664ffe into zitadel:main Jan 15, 2025
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
os-contribution This is a contribution from our open-source community
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Provide resourceowner of members as resourceowner of the user not of the membership
3 participants