Skip to content
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

Jump to bottom

commiting fix to SECURITY-1058 #42

Merged
merged 3 commits into from
Apr 5, 2019
Merged

commiting fix to SECURITY-1058 #42

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a2dab6
commiting fix to SECURITY-1058
aphill70 Apr 4, 2019
bc9f857
Update src/main/java/org/jenkinsci/plugins/nomad/NomadCloud.java
phedoreanu Apr 5, 2019
93123b1
updating per code review
aphill70 Apr 5, 2019
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
31 changes: 17 additions & 14 deletions src/main/java/org/jenkinsci/plugins/nomad/NomadCloud.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
package org.jenkinsci.plugins.nomad;

import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
import hudson.Extension;

import hudson.slaves.*;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import hudson.Extension;
import hudson.model.Descriptor;
import hudson.util.FormValidation;
import hudson.model.Label;
import hudson.model.Node;
import hudson.slaves.AbstractCloudImpl;
import hudson.slaves.NodeProperty;
import hudson.slaves.NodeProvisioner;
import hudson.util.FormValidation;
import jenkins.model.Jenkins;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.interceptor.RequirePOST;

import java.util.*;
import java.util.concurrent.*;
import java.util.logging.Level;
import java.util.logging.Logger;

public class NomadCloud extends AbstractCloudImpl {

private static final Logger LOGGER = Logger.getLogger(NomadCloud.class.getName());
Expand Down Expand Up @@ -83,7 +82,7 @@ public Collection<NodeProvisioner.PlannedNode> provision(Label label, int excess
if (template != null) {
try {
while (excessWorkload > 0) {

LOGGER.log(Level.INFO, "Excess workload of " + excessWorkload + ", provisioning new Jenkins slave on Nomad cluster");

final String slaveName = template.createSlaveName();
Expand Down Expand Up @@ -202,7 +201,9 @@ public String getDisplayName() {
return "Nomad";
}

@RequirePOST
public FormValidation doTestConnection(@QueryParameter("nomadUrl") String nomadUrl) {
Objects.requireNonNull(Jenkins.getInstance()).checkPermission(Jenkins.ADMINISTER);
try {
Request request = new Request.Builder()
.url(nomadUrl + "/v1/agent/self")
Expand All @@ -217,7 +218,9 @@ public FormValidation doTestConnection(@QueryParameter("nomadUrl") String nomadU
}
}

@RequirePOST
public FormValidation doCheckName(@QueryParameter String name) {
Objects.requireNonNull(Jenkins.getInstance()).checkPermission(Jenkins.ADMINISTER);
if (Strings.isNullOrEmpty(name)) {
return FormValidation.error("Name must be set");
} else {
Expand Down