Skip to content

Do not reset URI path for Checks API #59

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.

Sign up for GitHub

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

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

Do not reset URI path for Checks API #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bce987
Do not reset URI path for Checks API
Dec 22, 2021
c07dca1
Fix Gerrit Check tests
Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/com/google/gerrit/plugins/checks/client/Checkers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ private URI buildRequestUrl() throws URISyntaxException {

private URI buildRequestUrl(String suffixPath) throws URISyntaxException {
return uriBuilder
.setPath(String.format("%splugins/checks/checkers/%s", getPrefix(), suffixPath))
.setPath(
String.format(
"%splugins/checks/checkers/%s", uriBuilder.getPath() + getPrefix(), suffixPath))
.build();
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/google/gerrit/plugins/checks/client/Checks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private URI buildRequestUrl(String suffixPath) throws URISyntaxException {
.setPath(
String.format(
"%schanges/%d/revisions/%d/checks/%s",
getPrefix(), changeNumber, patchSetNumber, suffixPath))
uriBuilder.getPath() + getPrefix(), changeNumber, patchSetNumber, suffixPath))
.build();
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/google/gerrit/plugins/checks/client/PendingChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@ private URI buildRequestUrl() throws URISyntaxException {
}
uriBuilder.setParameter("query", queryString.toString());
}
return uriBuilder.setPath(getPrefix() + PENDING_CHECKS_PATH).build();
return uriBuilder.setPath(uriBuilder.getPath() + getPrefix() + PENDING_CHECKS_PATH).build();
}
}
8 changes: 4 additions & 4 deletions src/test/java/jenkins/plugins/gerrit/workflow/GerritCheckStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void gerritCheckStepInvokeFailSSLValidationTest() throws Exception {
""
+ "node {\n"
+ " withEnv([\n"
+ " 'GERRIT_API_URL=https://%s:%s/a/project',\n"
+ " 'GERRIT_API_URL=https://%s:%s',\n"
+ " 'GERRIT_CREDENTIALS_ID=cid',\n"
+ " 'BRANCH_NAME=%s',\n"
+ " ]) {\n"
Expand Down Expand Up @@ -125,7 +125,7 @@ public void gerritCheckStepInvokeTest() throws Exception {
""
+ "node {\n"
+ " withEnv([\n"
+ " 'GERRIT_API_URL=https://%s:%s/a/project',\n"
+ " 'GERRIT_API_URL=https://%s:%s',\n"
+ " 'GERRIT_API_INSECURE_HTTPS=true',\n"
+ " 'GERRIT_CREDENTIALS_ID=cid',\n"
+ " 'BRANCH_NAME=%s',\n"
Expand Down Expand Up @@ -184,7 +184,7 @@ public void gerritCheckStepTestWithUrlSet() throws Exception {
""
+ "node {\n"
+ " withEnv([\n"
+ " 'GERRIT_API_URL=https://%s:%s/a/project',\n"
+ " 'GERRIT_API_URL=https://%s:%s',\n"
+ " 'GERRIT_API_INSECURE_HTTPS=true',\n"
+ " 'GERRIT_CREDENTIALS_ID=cid',\n"
+ " 'BRANCH_NAME=%s',\n"
Expand Down Expand Up @@ -242,7 +242,7 @@ public void gerritCheckStepTestProducesUtcTimestamps() throws Exception {
""
+ "node {\n"
+ " withEnv([\n"
+ " 'GERRIT_API_URL=https://%s:%s/a/project',\n"
+ " 'GERRIT_API_URL=https://%s:%s',\n"
+ " 'GERRIT_API_INSECURE_HTTPS=true',\n"
+ " 'GERRIT_CREDENTIALS_ID=cid',\n"
+ " 'BRANCH_NAME=%s',\n"
Expand Down