Add Azure DevOps Server support #754
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: vinokurig The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest |
1 similar comment
|
/retest |
| } | ||
|
|
||
| protected AzureDevOpsUrl withDevfileFilenames(List<String> devfileFilenames) { | ||
| this.devfileFilenames.addAll(devfileFilenames); | ||
| return this; | ||
| } | ||
|
|
||
| public AzureDevOpsUrl withServerUrl(String serverUrl) { | ||
| this.serverUrl = serverUrl; |
There was a problem hiding this comment.
When use set serverUrl, then hostname is null, which is used later in getRepositoryLocation
There was a problem hiding this comment.
The hostName does not rely on serverUrl, we set it independently:
| @@ -172,8 +172,19 @@ public Optional<Boolean> isValid(PersonalAccessToken personalAccessToken) { | |||
| public Optional<Pair<Boolean, String>> isValid(PersonalAccessTokenParams params) | |||
| throws ScmCommunicationException { | |||
| if (!isValidScmServerUrl(params.getScmProviderUrl())) { | |||
| LOG.debug("not a valid url {} for current fetcher ", params.getScmProviderUrl()); | |||
| return Optional.empty(); | |||
| if (OAUTH_PROVIDER_NAME.equals(params.getScmProviderName())) { | |||
There was a problem hiding this comment.
Can we refactor this fuction?
For instance, move if (OAUTH_PROVIDER_NAME.equals(params.getScmProviderName())) { before if (!isValidScmServerUrl(params.getScmProviderUrl())) {
There was a problem hiding this comment.
We need to check if the token belongs to Azure DevOps SAAS or Server first. The isValidScmServerUrl function name is a bit misleading, so I renamed it.
| azureDevOpsApiClient.getUserWithPAT( | ||
| personalAccessToken.getToken(), personalAccessToken.getScmOrganization()); | ||
| return new GitUserData(user.getDisplayName(), user.getEmailAddress()); | ||
| if (personalAccessToken.getScmProviderUrl().equals("https://dev.azure.com")) { |
There was a problem hiding this comment.
We have AzureDevOps class for contants
| @@ -112,7 +112,8 @@ private boolean isApiRequestRelevant(String repositoryUrl) { | |||
| // belongs to Gitlab. | |||
| gitlabApiClient.getOAuthTokenInfo(""); | |||
| } catch (ScmUnauthorizedException e) { | |||
| return true; | |||
| // the error message is a JSON if it is a response from Gitlab. | |||
| return e.getMessage().startsWith("{"); | |||
There was a problem hiding this comment.
Do we really need this changes in context of azure?
There was a problem hiding this comment.
Yes, we need to specify the unauthorized exception as Azure also returns an unauthorized exception in this case.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
|
|
||
| private Optional<Matcher> getPatternMatcherByUrl(String url) { | ||
| String host = URI.create(url).getHost(); | ||
| Matcher matcher = compile(format(azureDevOpsPatternTemplate, host)).matcher(url); |
Check failure
Code scanning / CodeQL
Regular expression injection High
| if (matcher.matches()) { | ||
| return Optional.of(matcher); | ||
| } else { | ||
| matcher = compile(format(azureSSHDevOpsPatternTemplate, host)).matcher(url); |
Check failure
Code scanning / CodeQL
Regular expression injection High
| if (matcher.matches()) { | ||
| return Optional.of(matcher); | ||
| } else { | ||
| matcher = compile(format(azureSSHDevOpsServerPatternTemplate, host)).matcher(url); |
Check failure
Code scanning / CodeQL
Regular expression injection High
|
@vinokurig: The following tests failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
What does this PR do?
Add Azure DevOps Server support to use with PAT ONLY, as the azure Devops Api does not support oauth2, see: eclipse-che/che#23306 (comment)
Screenshot/screencast of this PR
What issues does this PR fix or reference?
fixes eclipse-che/che#23306
How to test this PR?
quay.io/eclipse/che-server:pr-754Organizationinput to enter theCollectionname.See: workspace starts with the devfile resolve.
PR Checklist
As the author of this Pull Request I made sure that:
What issues does this PR fix or referenceandHow to test this PRcompletedRelease Notes
Reviewers
Reviewers, please comment how you tested the PR when approving it.