[JENKINS-72176] Split cloud management page into multiple pages

pom.xml

@@ -46,7 +46,7 @@
     <jenkins.host.address />
     <slaveAgentPort />
     <!-- TODO fix KubernetesCloudTest todos once past 2.414 -->
-    <jenkins.version>2.401.1</jenkins.version>
+    <jenkins.version>2.414.2</jenkins.version>
     <bom>2.401.x</bom>
     <bom.version>2357.v1043f8578392</bom.version>
     <no-test-jar>false</no-test-jar>

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java

@@ -19,7 +19,8 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.servlet.ServletException;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
@@ -37,9 +38,12 @@
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
+import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.interceptor.RequirePOST;
-
+import org.kohsuke.stapler.verb.POST;
 import com.cloudbees.plugins.credentials.CredentialsMatchers;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
 import com.cloudbees.plugins.credentials.common.StandardListBoxModel;
@@ -48,16 +52,19 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
+import hudson.Functions;
 import hudson.TcpSlaveAgentListener;
 import hudson.Util;
 import hudson.init.InitMilestone;
 import hudson.init.Initializer;
 import hudson.model.Descriptor;
 import hudson.model.DescriptorVisibilityFilter;
+import hudson.model.Failure;
 import hudson.model.Label;
 import hudson.security.ACL;
 import hudson.slaves.Cloud;
 import hudson.slaves.NodeProvisioner;
+import hudson.util.FormApply;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -70,6 +77,7 @@
 import static org.csanchez.jenkins.plugins.kubernetes.MetricNames.metricNameForLabel;
 
 import jenkins.websocket.WebSockets;
+import net.sf.json.JSONObject;
 
 /**
  * Kubernetes cloud provider.
@@ -100,6 +108,10 @@ public class KubernetesCloud extends Cloud {
 
     @NonNull
     private List<PodTemplate> templates = new ArrayList<>();
+
+    public boolean hasTemplates() {
+        return templates.size() > 0;
+    }
     private String serverUrl;
     private boolean useJenkinsProxy;
     @CheckForNull
@@ -600,7 +612,40 @@ public boolean canProvision(@NonNull Cloud.CloudState state) {
     public PodTemplate getTemplate(@CheckForNull Label label) {
         return PodTemplateUtils.getTemplateByLabel(label, getAllTemplates());
     }
+
+    @CheckForNull
+    public PodTemplate getTemplate(@NonNull String id) {
+        return getTemplateById(id);
+    }
+
+    public PodTemplate currentTemplate;
+
+    public void doTemplates(StaplerRequest req, StaplerResponse rsp, @QueryParameter String id)
+            throws IOException, ServletException {
+        if (id != null) {
+            currentTemplate = getTemplateById(id);
+        } else {
+            currentTemplate = null;
+        }
+        req.getView(this, "templates.jelly").forward(req, rsp);
+    }
 
+    @POST
+    public HttpResponse doUpdateTemplate(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+        Jenkins j = Jenkins.get();
+        removeTemplate(currentTemplate);
+        PodTemplate newTemplate = reconfigureTemplate(req, req.getSubmittedForm());
+        addTemplate(newTemplate); 
+        j.save();
+        // take the user back.
+        return FormApply.success("./templates");
+    }
+
+    private PodTemplate reconfigureTemplate(@NonNull final StaplerRequest req, JSONObject form) throws Descriptor.FormException {
+        if (form == null)     return null;
+        return currentTemplate.getDescriptor().newInstance(req, form);
+    }
+
     @CheckForNull
     public PodTemplate getTemplateById(@NonNull String id) {
         return getAllTemplates().stream().filter(t -> id.equals(t.getId())).findFirst().orElse(null);
@@ -716,6 +761,23 @@ public void setWaitForPodSec(Integer waitForPodSec) {
         this.waitForPodSec = waitForPodSec;
     }
 
+    /**
+     * Creating a new template.
+     */
+    @POST
+    public HttpResponse doCreate(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+        PodTemplate newTemplate=new PodTemplate().getDescriptor().newInstance(req, req.getSubmittedForm());
+        addTemplate(newTemplate);
+        Jenkins j = Jenkins.get();
+        j.save();
+        // take the user back.
+        return FormApply.success("templates");
+    }
+
+    public PodTemplate getNewTemplate(){
+        return new PodTemplate();
+    }
+
     @Extension
     public static class DescriptorImpl extends Descriptor<Cloud> {
         @Override
@@ -985,4 +1047,5 @@ public static void hpiRunInit() {
             }
         }
     }
+
 }

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java

@@ -1,5 +1,6 @@
 package org.csanchez.jenkins.plugins.kubernetes;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
@@ -15,7 +16,9 @@
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.servlet.ServletException;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -39,16 +42,25 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
-
+import org.kohsuke.stapler.HttpRedirect;
+import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.interceptor.RequirePOST;
+import org.kohsuke.stapler.verb.POST;
 import hudson.Extension;
+import hudson.Functions;
 import hudson.Util;
 import hudson.model.labels.LabelAtom;
+import hudson.slaves.Cloud;
 import hudson.slaves.NodeProperty;
+import hudson.util.FormApply;
 import hudson.util.XStream2;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import java.io.StringReader;
 import jenkins.model.Jenkins;
+import net.sf.json.JSONObject;
 
 /**
  * Kubernetes Pod Template
@@ -631,6 +643,65 @@ public void addEnvVars(List<TemplateEnvVar> envVars) {
         }
     }
 
+    /**
+     * Deletes the cloud.
+     */
+    @RequirePOST
+    public HttpResponse doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        String context = Functions.getNearestAncestorUrl(req, this);
+        // Define regular expressions to match the desired substrings
+        // there maybe a better way to do this, but I don't know how to do it.
+        String regex1 = ".*/cloud/(.*)/template/(.*)";
+        Pattern pattern = Pattern.compile(regex1);
+        Matcher matcher = pattern.matcher(context);
+        // Find and extract the substrings
+        if (matcher.find()) {
+            String cloudName = matcher.group(1);  // cloud name
+            Jenkins j = Jenkins.get();
+            Cloud cloud = j.getCloud(cloudName);
+            if (cloud instanceof KubernetesCloud) {
+                KubernetesCloud kubernetesCloud = (KubernetesCloud) cloud;
+                // maybe there is a smarter way to modify? 
+                kubernetesCloud.removeTemplate(this);
+                j.save();
+            }
+        }
+        // take the user back.
+        return new HttpRedirect("../../templates");
+    }
+
+    @POST
+    public HttpResponse doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+        String context = Functions.getNearestAncestorUrl(req, this);
+        // Define regular expressions to match the desired substrings
+        // there maybe a better way to do this, but I don't know how to do it.
+        String regex1 = ".*/cloud/(.*)/template/(.*)";
+        Pattern pattern = Pattern.compile(regex1);
+        Matcher matcher = pattern.matcher(context);
+
+        // Find and extract the substrings
+        if (matcher.find()) {
+            String cloudName = matcher.group(1);  // cloud name
+            Jenkins j = Jenkins.get();
+            Cloud cloud = j.getCloud(cloudName);
+            if (cloud instanceof KubernetesCloud) {
+                KubernetesCloud kubernetesCloud = (KubernetesCloud) cloud;
+                // maybe there is a smarter way to modify? 
+                kubernetesCloud.removeTemplate(this);
+                PodTemplate newTemplate = reconfigure(req, req.getSubmittedForm());
+                kubernetesCloud.addTemplate(newTemplate);
+                j.save();
+            }
+        }
+        // take the user back.
+        return FormApply.success("../../templates");
+    }
+
+    private PodTemplate reconfigure(@NonNull final StaplerRequest req, JSONObject form) throws Descriptor.FormException {
+        if (form == null)     return null;
+        return getDescriptor().newInstance(req, form);
+    }
+
     @DataBoundSetter
     public void setEnvVars(List<TemplateEnvVar> envVars) {
         if (envVars != null) {

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateAction.java

@@ -0,0 +1,39 @@
+package org.csanchez.jenkins.plugins.kubernetes;
+
+import hudson.Extension;
+import hudson.model.Action;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import jenkins.model.TransientActionFactory;
+
+@Extension
+public class PodTemplateAction extends TransientActionFactory<KubernetesCloud> implements Action{
+
+    @Override
+    public String getIconFileName() {
+        return "symbol-copy-outline plugin-ionicons-api";
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "Pod templates";
+    }
+
+    @Override
+    public String getUrlName() {
+        return "templates";
+    }
+
+    @Override
+    public Class<KubernetesCloud> type() {
+        return KubernetesCloud.class;
+    }
+
+    @Override
+    public Collection<? extends Action> createFor(KubernetesCloud target) {
+    List<Action> actions = new ArrayList<>();
+    actions.add(new PodTemplateAction());
+    return actions;
+    }
+}

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud/config.jelly

@@ -104,18 +104,6 @@
           <f:textbox default=""/>
         </f:entry>
       </f:advanced>
-    </f:advanced> 
-
-    <f:advanced title="${%Pod Templates}">
-      <f:entry title="${%Pod Templates}" description="${%List of Pods to be launched as agents}">
-        <f:repeatableProperty field="templates" add="${%Add Pod Template}" header="${%Pod Template}">
-          <f:block>
-            <div align="right">
-              <f:repeatableDeleteButton value="${%Delete Pod Template}"/>
-            </div>
-          </f:block>
-        </f:repeatableProperty>
-      </f:entry>
     </f:advanced>
 
 </j:jelly>

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud/new.jelly

@@ -0,0 +1,26 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+  <l:layout permission="${app.SYSTEM_READ}" title="${%title(it.name)}" type="one-column">
+    <j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}"/>
+        <j:set var="instance" value="${it.newTemplate}"/>
+        <j:set var="descriptor" value="${instance.descriptor}"/>
+    <l:breadcrumb title="${%New Template }"/>
+    <l:main-panel>
+      <h1>${%New Pod template settings}</h1>
+      <f:form method="post" action="create" name="config" class="jenkins-form">
+        <!-- main body of the configuration -->
+
+        <st:include it="${instance}" page="config.jelly"/>
+        <l:isAdmin>
+          <f:bottomButtonBar>
+            <f:submit value="${%Create}"/>
+            <f:apply value="${%Apply}"/>
+          </f:bottomButtonBar>
+        </l:isAdmin>
+      </f:form>
+      <l:isAdmin>
+        <st:adjunct includes="lib.form.confirm"/>
+      </l:isAdmin>
+    </l:main-panel>
+  </l:layout>
+</j:jelly>

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud/sidepanelx.jelly

@@ -0,0 +1,41 @@
+<!--
+The MIT License
+
+Copyright (c) 2017 Red Hat, inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
+    <l:header />
+    <l:side-panel>
+        <l:tasks>
+            <l:task contextMenu="false" href="." icon="symbol-computer" title="${%Status}"/>
+            <l:task href="templates" icon="symbol-copy" title="${%Templates}"/>
+            <l:task href="configure" icon="symbol-settings"
+                    title="${app.hasPermission(app.ADMINISTER) ? '%Configure' : '%View Configuration'}"/>
+            <l:delete permission="${app.ADMINISTER}" title="${%Delete Cloud}" message="${%delete.cloud(it.displayName)}"/>
+            <t:actions />
+        </l:tasks>
+        <j:forEach var="action" items="${it.allActions}">
+            <st:include it="${action}" page="box.jelly" optional="true"/>
+        </j:forEach>
+    </l:side-panel>
+</j:jelly>