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

[master] Disable creating service users in domains #5077

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 29, 2024

This is an automatic copy of pull request #5076 done by Mergify.


🆔 Reference related issue.

AM-4194

✏️ A description of the changes proposed in the pull request

This PR removes the serviceAccount field from new user model to disallow creating service accounts on domain level.
Service accoutns should only be used in organisation context.


Cherry-pick of b5ef44e has failed:

On branch mergify/bp/master/pr-5076
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit b5ef44e807.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-am-management-api/gravitee-am-management-api-service/src/main/java/io/gravitee/am/management/service/impl/AbstractUserService.java
	modified:   gravitee-am-management-api/gravitee-am-management-api-service/src/main/java/io/gravitee/am/management/service/impl/OrganizationUserServiceImpl.java
	modified:   gravitee-am-service/src/main/java/io/gravitee/am/service/model/AbstractNewUser.java
	modified:   gravitee-am-service/src/main/java/io/gravitee/am/service/model/NewOrganizationUser.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-am-management-api/gravitee-am-management-api-rest/src/test/java/io/gravitee/am/management/handlers/management/api/resources/UsersResourceTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from a team as a code owner October 29, 2024 12:51
@mergify mergify bot added the conflicts label Oct 29, 2024
Copy link
Contributor Author

mergify bot commented Oct 29, 2024

Cherry-pick of b5ef44e has failed:

On branch mergify/bp/master/pr-5076
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit b5ef44e807.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-am-management-api/gravitee-am-management-api-service/src/main/java/io/gravitee/am/management/service/impl/AbstractUserService.java
	modified:   gravitee-am-management-api/gravitee-am-management-api-service/src/main/java/io/gravitee/am/management/service/impl/OrganizationUserServiceImpl.java
	modified:   gravitee-am-service/src/main/java/io/gravitee/am/service/model/AbstractNewUser.java
	modified:   gravitee-am-service/src/main/java/io/gravitee/am/service/model/NewOrganizationUser.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-am-management-api/gravitee-am-management-api-rest/src/test/java/io/gravitee/am/management/handlers/management/api/resources/UsersResourceTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

mregulski-gravitee and others added 2 commits October 31, 2024 13:59
(cherry picked from commit b5ef44e)

# Conflicts:
#	gravitee-am-management-api/gravitee-am-management-api-rest/src/test/java/io/gravitee/am/management/handlers/management/api/resources/UsersResourceTest.java
Copy link

sonarcloud bot commented Nov 6, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
33.33% Condition Coverage on New Code (required ≥ 50%)

See analysis details on SonarCloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant