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

Move admin endpoints into separate files #6308

Merged

Conversation

@awesome-manuel
Copy link
Contributor

awesome-manuel commented Oct 31, 2019

@richvdh @erikjohnston this is a prerequisite for #5925

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file
  • Pull request includes a sign off
@awesome-manuel awesome-manuel changed the base branch from master to develop Oct 31, 2019
@anoadragon453 anoadragon453 self-assigned this Nov 5, 2019
@anoadragon453 anoadragon453 added this to In progress in Homeserver Task Board via automation Nov 5, 2019
@anoadragon453 anoadragon453 moved this from In progress to Community PRs in Homeserver Task Board Nov 5, 2019
Copy link
Member

anoadragon453 left a comment

Looks good. You'll need to do a couple changes to fix the CI though.

First, you'll need to pull in the latest changes from develop to fix a pep 517 issue with python on the sample config script.

Next, you'll want to run ./scripts-dev/lint.sh to correct isort and any other linting issues. Make sure you've got your linting tools up to date as well. For instance, the version of black that we use is 19.10b0 (I don't think the others have changed recently).

Finally, you'll need to include a changelog file. I recommend a .misc extension for it.

@anoadragon453

This comment has been minimized.

Copy link
Member

anoadragon453 commented Nov 18, 2019

@awesome-manuel are you still around?

@awesome-manuel

This comment has been minimized.

Copy link
Contributor Author

awesome-manuel commented Nov 19, 2019

@awesome-manuel are you still around?

Yes. The PR was rebased to develop when I updated it. There also were no linting issues at that time.
But I can update it again to the latest develop, hopefully this week.

@awesome-manuel awesome-manuel force-pushed the Awesome-Technologies:move_admin_endpoints branch from ea1e168 to 9bb6e87 Nov 19, 2019
@awesome-manuel

This comment has been minimized.

Copy link
Contributor Author

awesome-manuel commented Nov 19, 2019

@anoadragon453 can you trigger buildkite please?

@richvdh

This comment has been minimized.

Copy link
Member

richvdh commented Nov 20, 2019

@awesome-manuel I triggered it; it should run automatically in future. Looks like the CI is very unhappy about something - could you investigate?

@richvdh

This comment has been minimized.

Copy link
Member

richvdh commented Nov 20, 2019

mostly builtins.ImportError: cannot import name 'assert_user_is_admin' apparently.

@awesome-manuel

This comment has been minimized.

Copy link
Contributor Author

awesome-manuel commented Nov 20, 2019

mostly builtins.ImportError: cannot import name 'assert_user_is_admin' apparently.

Strange, since assert_requester_is_admin is imported the same way and has no problems...

@awesome-manuel awesome-manuel force-pushed the Awesome-Technologies:move_admin_endpoints branch 2 times, most recently from 0b0e53d to 9b03f7c Nov 20, 2019
Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
@awesome-manuel awesome-manuel force-pushed the Awesome-Technologies:move_admin_endpoints branch from 9b03f7c to 0ac3a26 Nov 20, 2019
@awesome-manuel

This comment has been minimized.

Copy link
Contributor Author

awesome-manuel commented Nov 20, 2019

@richvdh @anoadragon453 everything is fixed now.

Copy link
Member

anoadragon453 left a comment

Looks good to me. Thank you for you contribution!

@anoadragon453 anoadragon453 merged commit 4f5ca45 into matrix-org:develop Nov 20, 2019
22 checks passed
22 checks passed
buildkite/synapse Build #5573 passed (20 minutes, 13 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 33 seconds)
Details
buildkite/synapse/check-style Passed (1 minute, 50 seconds)
Details
buildkite/synapse/isort Passed (28 seconds)
Details
buildkite/synapse/mypy Passed (34 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (17 seconds)
Details
buildkite/synapse/packaging Passed (20 seconds)
Details
buildkite/synapse/pipeline Passed (3 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (17 minutes, 28 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (6 minutes, 59 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (8 minutes, 39 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (6 minutes, 17 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (18 minutes, 8 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (17 minutes, 40 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (6 minutes, 19 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-5-slash-postgres-9-dot-5 Passed (1 minute, 53 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-7-slash-postgres-11 Passed (1 minute, 48 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Passed (13 minutes, 58 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Passed (13 minutes, 53 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (13 minutes, 57 seconds)
Details
buildkite/synapse/sytest-python-3-dot-7-slash-postgres-11-slash-monolith Passed (12 minutes, 18 seconds)
Details
buildkite/synapse/sytest-python-3-dot-7-slash-postgres-11-slash-workers Passed (11 minutes, 37 seconds)
Details
Homeserver Task Board automation moved this from Community PRs to Done Nov 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
3 participants
You can’t perform that action at this time.