Skip to content

[JENKINS-45534] Bug Remove External sites #10

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
tlenaic wants to merge 3 commits into
base: development-2.0.0
Choose a base branch
from
Open

[JENKINS-45534] Bug Remove External sites #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8212bbf
Merge pull request #1 from jenkinsci/master
tlenaic Apr 11, 2017
628c8db
Merge pull request #6 from jenkinsci/master
tlenaic Jul 12, 2017
e9a2c73
Minors Bugs fixed - Remove external sites
tlenaic Jul 12, 2017
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
7 changes: 5 additions & 2 deletions src/main/java/org/jenkinsci/plugins/zap/ZAPDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,9 +1043,11 @@ private void jiraCreate(BuildListener listener, ClientApi clientApi, String jira
private boolean deleteExternalSites (BuildListener listener, ClientApi clientApi, boolean removeExternalSites, String internalSites, boolean buildSuccess) throws ClientApiException {
Utils.loggerMessage(listener, 0, "[{0}] REMOVE EXTERNAL SITES [ {1} ]", Utils.ZAP, String.valueOf(removeExternalSites).toUpperCase());
Utils.loggerMessage(listener, 1, "INTERNAL SITES: [ {1} ]", Utils.ZAP, internalSites.trim().replace("\n", ", "));

if(this.removeExternalSites){
Utils.loggerMessage(listener, 1, "GET SITES");
String[] urls = internalSites.split("\n");

ApiResponseList apiSites = null;
apiSites = (ApiResponseList) clientApi.core.sites();
if (apiSites.getItems().size() > 0) for (int i = 0; i < apiSites.getItems().size(); i++) {
Expand All @@ -1060,7 +1062,7 @@ private boolean deleteExternalSites (BuildListener listener, ClientApi clientApi
}
}
if (delete) {
Utils.loggerMessage(listener, 2, "SITE: [ {0} ] [ EXTENERAL ]", apiSite.getValue());
Utils.loggerMessage(listener, 2, "SITE: [ {0} ] [ EXTERNAL ]", apiSite.getValue());
try {
clientApi.core.deleteSiteNode(apiSite.getValue(), null, null);
Utils.loggerMessage(listener, 3, "DELETED", apiSite.getValue());
Expand All @@ -1073,6 +1075,7 @@ private boolean deleteExternalSites (BuildListener listener, ClientApi clientApi
break;
}
}
}
}
return buildSuccess;
}
Expand Down