p85947160
/
Gitee-Jenkins-Plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed connection check from global configuration 

add variables gitlabSourceRepoName and gitlabSourceRepoURL to
MergeRequest builds
get source project data through gitlab api
implement #4
This commit is contained in:
Dimitris Stafylarakis 2014-08-06 14:15:31 +02:00
parent 33a177a043
commit c3ee86a34e
3 changed files with 69 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/dabsquared/gitlabjenkins/GitLab.java
View File

@ -10,9 +10,14 @@ public class GitLab {
private static final Logger LOGGER = Logger.getLogger(GitLab.class.getName()); private static final Logger LOGGER = Logger.getLogger(GitLab.class.getName());
private GitlabAPI api; private GitlabAPI api;
public GitlabAPI get() throws IOException { public GitlabAPI instance() {
if (api == null) { if (api == null) {
connect(); String token = GitLabPushTrigger.getDesc().getGitlabApiToken();
String url = GitLabPushTrigger.getDesc().getGitlabHostUrl();
boolean ignoreCertificateErrors = GitLabPushTrigger.getDesc().getIgnoreCertificateErrors();
LOGGER.log(Level.FINE, "Connecting to Gitlab server ({0})", url);
api = GitlabAPI.connect(url, token);
api.ignoreCertificateErrors(ignoreCertificateErrors);
} }
return api; return api;
@ -30,11 +35,4 @@ public class GitLab {
return false; return false;
} }
} }
private void connect() throws IOException {
String token = GitLabPushTrigger.getDesc().getGitlabApiToken();
String url = GitLabPushTrigger.getDesc().getGitlabHostUrl();
LOGGER.log(Level.FINE, "Connecting to Gitlab server ({0})", url);
api = GitlabAPI.connect(url, token);
}
} }

30
src/main/java/com/dabsquared/gitlabjenkins/GitLabMergeRequest.java
View File

@ -1,18 +1,15 @@
package com.dabsquared.gitlabjenkins; package com.dabsquared.gitlabjenkins;
import java.io.IOException;
import java.util.Date;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import org.gitlab.api.models.GitlabProject;
import com.google.gson.FieldNamingPolicy; import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
import net.sf.json.util.JavaIdentifierTransformer;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* Represents for WebHook payload * Represents for WebHook payload
@ -27,7 +24,9 @@ public class GitLabMergeRequest {
} }
Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).setDateFormat("yyyy-MM-dd HH:mm:ss Z").create(); Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).setDateFormat("yyyy-MM-dd HH:mm:ss Z").create();
return gson.fromJson(payload, GitLabMergeRequest.class); GitLabMergeRequest mergeRequest = gson.fromJson(payload, GitLabMergeRequest.class);
return mergeRequest;
} }
@ -35,10 +34,17 @@ public class GitLabMergeRequest {
public GitLabMergeRequest() { public GitLabMergeRequest() {
} }
private String object_kind; private String object_kind;
private ObjectAttributes objectAttributes; private ObjectAttributes objectAttributes;
private GitlabProject sourceProject = null;
public GitlabProject getSourceProject (GitLab api) throws IOException {
if (sourceProject == null) {
sourceProject = api.instance().getProject(objectAttributes.sourceProjectId);
}
return sourceProject;
}
public String getObject_kind() { public String getObject_kind() {
return object_kind; return object_kind;

61
src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
View File

@ -9,6 +9,8 @@ import hudson.model.AbstractProject;
import hudson.model.ParametersAction; import hudson.model.ParametersAction;
import hudson.model.StringParameterValue; import hudson.model.StringParameterValue;
import hudson.plugins.git.RevisionParameterAction; import hudson.plugins.git.RevisionParameterAction;
import hudson.plugins.git.GitSCM;
import hudson.scm.SCM;
import hudson.triggers.Trigger; import hudson.triggers.Trigger;
import hudson.triggers.TriggerDescriptor; import hudson.triggers.TriggerDescriptor;
import hudson.util.FormValidation; import hudson.util.FormValidation;
@ -26,7 +28,8 @@ import java.util.logging.Logger;
import jenkins.model.Jenkins; import jenkins.model.Jenkins;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.gitlab.api.models.GitlabProject; import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.URIish;
import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerRequest;
@ -131,6 +134,21 @@ public class GitLabPushTrigger extends Trigger<AbstractProject<?, ?>> {
values.put("gitlabSourceBranch", new StringParameterValue("gitlabSourceBranch", String.valueOf(req.getObjectAttribute().getSourceBranch()))); values.put("gitlabSourceBranch", new StringParameterValue("gitlabSourceBranch", String.valueOf(req.getObjectAttribute().getSourceBranch())));
values.put("gitlabTargetBranch", new StringParameterValue("gitlabTargetBranch", String.valueOf(req.getObjectAttribute().getTargetBranch()))); values.put("gitlabTargetBranch", new StringParameterValue("gitlabTargetBranch", String.valueOf(req.getObjectAttribute().getTargetBranch())));
// Get source repository if communication to Gitlab is possible
String sourceRepoName = "origin";
String sourceRepoURL = null;
try {
sourceRepoName = req.getSourceProject(getDesc().getGitlab()).getPathWithNamespace();
sourceRepoURL = req.getSourceProject(getDesc().getGitlab()).getSshUrl();
} catch (IOException ex) {
LOGGER.log(Level.WARNING, "Could not fetch source project''s data from Gitlab. '('{0}':' {1}')'", new String[]{ex.toString(), ex.getMessage()});
sourceRepoURL = getSourceRepoURLDefault();
} finally {
values.put("gitlabSourceRepoName", new StringParameterValue("gitlabSourceRepoName", sourceRepoName));
values.put("gitlabSourceRepoURL", new StringParameterValue("gitlabSourceRepoURL", sourceRepoURL));
}
List<ParameterValue> listValues = new ArrayList<ParameterValue>(values.values()); List<ParameterValue> listValues = new ArrayList<ParameterValue>(values.values());
ParametersAction parametersAction = new ParametersAction(listValues); ParametersAction parametersAction = new ParametersAction(listValues);
@ -140,6 +158,29 @@ public class GitLabPushTrigger extends Trigger<AbstractProject<?, ?>> {
return actionsArray; return actionsArray;
} }
/**
* Get the URL of the first declared repository in the project configuration.
* Use this as default source repository url.
*
* @return String the default value of the source repository url
*/
private String getSourceRepoURLDefault() {
String url = null;
SCM scm = job.getScm();
if (scm instanceof GitSCM) {
List<RemoteConfig> repositories = ((GitSCM) scm).getRepositories();
if (!repositories.isEmpty()){
RemoteConfig defaultRepository = repositories.get(repositories.size()-1);
List<URIish> uris = defaultRepository.getURIs();
if (!uris.isEmpty()) {
URIish defaultUri = uris.get(uris.size());
url = defaultUri.toString();
}
}
}
return url;
}
}); });
} }
@ -215,36 +256,22 @@ public class GitLabPushTrigger extends Trigger<AbstractProject<?, ?>> {
ignoreCertificateErrors = formData.getBoolean("ignoreCertificateErrors"); ignoreCertificateErrors = formData.getBoolean("ignoreCertificateErrors");
save(); save();
gitlab = new GitLab(); gitlab = new GitLab();
try {
gitlab.get().ignoreCertificateErrors(ignoreCertificateErrors);
} catch (IOException ex) {
LOGGER.log(Level.WARNING, "Connection to Gitlab failed, reason {0}", ex.getMessage());
}
return super.configure(req, formData); return super.configure(req, formData);
} }
public FormValidation doCheckGitlabHostUrl(@QueryParameter String value) { public FormValidation doCheckGitlabHostUrl(@QueryParameter String value) {
if (value == null || value.isEmpty()) { if (value == null || value.isEmpty()) {
return FormValidation.error("Gitlab host URL required"); return FormValidation.error("Gitlab host URL required.");
} }
return FormValidation.ok(); return FormValidation.ok();
} }
public FormValidation doCheckGitlabApiToken(@QueryParameter String gitlabHostUrl, public FormValidation doCheckGitlabApiToken(@QueryParameter String value) {
@QueryParameter boolean ignoreCertificateErrors,
@QueryParameter String value) {
if (value == null || value.isEmpty()) { if (value == null || value.isEmpty()) {
return FormValidation.error("API Token for Gitlab access required"); return FormValidation.error("API Token for Gitlab access required");
} }
if (gitlabHostUrl != null && !gitlabHostUrl.isEmpty()
&& !GitLab.checkConnection(value, gitlabHostUrl, ignoreCertificateErrors)){
return FormValidation.error("Could not connect to Gitlab with provided configuration");
}
return FormValidation.ok(); return FormValidation.ok();
} }