[server] Extract ScmService to be used by both APIs #19098
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AlexTugarev
changed the title
AlexTugarev
commented
Nov 21, 2023
AlexTugarev
commented
Nov 21, 2023
AlexTugarev
commented
Nov 21, 2023
AlexTugarev
commented
Nov 21, 2023
| // (AT) when it comes to token renewal, the awaited http requests may | ||
| // cause "parallel" calls to repeat the renewal, which will fail. | ||
| // Caching for pending operations should solve this issue. | ||
| const key = `${host}-${user.id}`; | ||
| const key = `${host}-${userId}`; |
There was a problem hiding this comment.
🙈 Caching tokens for the sake of deduplication of renewal requests?! EXP-950
AlexTugarev
commented
Nov 21, 2023
| @@ -891,13 +891,6 @@ export interface GuessGitTokenScopesParams { | |||
| host: string; | |||
| repoUrl: string; | |||
| gitCommand: string; | |||
| currentToken: GitToken; | |||
There was a problem hiding this comment.
Removing this on purpose. 'Should avoid sending sensitive information if not needed.
Here we'd be in the position to obtain the token from DB to perform the write permissions check if required.
|
@AlexTugarev if you can fill in how to test section to what to pay attention in the dashboard it would help. |
akosyakov
reviewed
Nov 21, 2023
akosyakov
reviewed
Nov 21, 2023
akosyakov
reviewed
Nov 21, 2023
akosyakov
reviewed
Nov 21, 2023
akosyakov
reviewed
Nov 21, 2023
akosyakov
reviewed
Nov 21, 2023
15 tasks
akosyakov
approved these changes
Nov 21, 2023
There was a problem hiding this comment.
I did following tests:
- created a new project
- during creation check that I see suggested repositories and can search them
- use a repository which is not suggested for the project
- then created a workspace for such project, checked that i still can see and search suggested repositories with a project repository
- in the workspace try
git push - seen that it failed and showed me that public_repo permission is missing
- then to User -> Preferences and updated permissions, close UI and reopen to confirmed that it applied
- after that went back to thw worksapce and did
git pushagaint, it worked
@AlexTugarev anything else to test?
I pre approved, please take time to add tests and address comments as you find it fit.
Should I test #19101 already in the same way? Or better to wait till this PR is merged and another is rebased?
AlexTugarev
force-pushed
the
at/scm-service
branch
from
29bd7a0 to
003b804
Compare
AlexTugarev
force-pushed
the
at/scm-service
branch
2 times, most recently
from
254a607 to
54798af
Compare
AlexTugarev
force-pushed
the
at/scm-service
branch
from
54798af to
baaadc3
Compare
|
/unhold |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR extracts (actually consolidates) an internal ScmService to be used by the API services (gRPC and WS).
This also implements the SCMService from #19075.
Summary generated by Copilot
🤖[deprecated] Generated by Copilot at 563b5eb
Refactored the server-side code to use a new
ScmServiceclass for all source control management operations, and exposed it to the public API via a newScmServiceAPIclass. Removed unused or redundant code and improved error handling and dependency injection. Updated theGitpodServerImplclass to use the newScmServiceclass.Related Issue(s)
Fixes #
How to test
This PR refactors code paths used for
This UI parts should have the same behavior as before.
Documentation
Preview status
Gitpod was successfully deployed to your preview environment.
Build Options
Build
Run the build with werft instead of GHA
Run Leeway with
--dont-testPublish
Installer
Add desired feature flags to the end of the line above, space separated
Preview Environment / Integration Tests
If enabled this will build
install/previewIf enabled this will create the environment on GCE infra
Saves cost. Untick this only if you're really sure you need a non-preemtible machine.
Valid options are
all,workspace,webapp,ide,jetbrains,vscode,ssh. If enabled,with-previewandwith-large-vmwill be enabled./hold