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

pom.xml

@@ -45,8 +45,7 @@
     <connectorHost />
     <jenkins.host.address />
     <slaveAgentPort />
-    <!-- TODO fix KubernetesCloudTest todos once past 2.414 -->
-    <jenkins.version>2.401.1</jenkins.version>
+    <jenkins.version>2.415</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,6 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.servlet.ServletException;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
@@ -34,12 +33,17 @@
 import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuth;
 import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthException;
 import org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 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;
@@ -58,7 +62,9 @@
 import hudson.security.ACL;
 import hudson.slaves.Cloud;
 import hudson.slaves.NodeProvisioner;
+import hudson.util.FormApply;
 import hudson.util.FormValidation;
+import hudson.util.HttpResponses;
 import hudson.util.ListBoxModel;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientException;
@@ -100,6 +106,10 @@ public class KubernetesCloud extends Cloud {
 
     @NonNull
     private List<PodTemplate> templates = new ArrayList<>();
+
+    public boolean hasTemplates() {
+        return !templates.isEmpty();
+    }
     private String serverUrl;
     private boolean useJenkinsProxy;
     @CheckForNull
@@ -600,6 +610,34 @@ 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);
+    }
+
+    // TODO: Remove when JENKINS-71737 is fixed
+    @POST
+    public HttpResponse doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+
+        Jenkins j = Jenkins.get();
+        j.checkPermission(Jenkins.ADMINISTER);
+        Cloud cloud = j.getCloud(this.name);
+        if (cloud == null) {
+            return HttpResponses.notFound();
+        }
+        KubernetesCloud result = (KubernetesCloud) cloud.reconfigure(req, req.getSubmittedForm());
+        String proposedName = result.name;
+        if (!proposedName.equals(this.name)
+                && j.getCloud(proposedName) != null) {
+            throw new Descriptor.FormException(Messages.cloudAlreadyExists(proposedName), "name");
+        }
+        result.templates = this.templates;
+        j.clouds.replace(this, result);
+        j.save();
+        // take the user back to the cloud top page.
+        return FormApply.success("../..");
+    }
 
     @CheckForNull
     public PodTemplate getTemplateById(@NonNull String id) {
@@ -716,6 +754,25 @@ public void setWaitForPodSec(Integer waitForPodSec) {
         this.waitForPodSec = waitForPodSec;
     }
 
+    @Restricted(NoExternalUse.class)
+    public PodTemplate.DescriptorImpl getTemplateDescriptor() {
+        return (PodTemplate.DescriptorImpl) Jenkins.get().getDescriptorOrDie(PodTemplate.class);
+    }
+
+    /**
+     * Creating a new template.
+     */
+    @POST
+    public HttpResponse doCreate(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+        Jenkins j = Jenkins.get();
+        j.checkPermission(Jenkins.ADMINISTER);
+        PodTemplate newTemplate = getTemplateDescriptor().newInstance(req, req.getSubmittedForm());
+        addTemplate(newTemplate);
+        j.save();
+        // take the user back.
+        return FormApply.success("templates");
+    }
+
     @Extension
     public static class DescriptorImpl extends Descriptor<Cloud> {
         @Override
@@ -985,4 +1042,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,7 @@
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
+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;
@@ -37,18 +38,25 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.AncestorInPath;
 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.verb.POST;
 import hudson.Extension;
 import hudson.Util;
 import hudson.model.labels.LabelAtom;
 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 +639,42 @@ public void addEnvVars(List<TemplateEnvVar> envVars) {
         }
     }
 
+    /**
+     * Deletes the template.
+     */
+    @POST
+    public HttpResponse doDoDelete(@AncestorInPath KubernetesCloud kubernetesCloud) throws IOException {
+        Jenkins j = Jenkins.get();
+        j.checkPermission(Jenkins.ADMINISTER);
+        if (kubernetesCloud == null) {
+            throw new IllegalStateException("Cloud could not be found");
+        }
+        kubernetesCloud.removeTemplate(this);
+        j.save();
+        // take the user back.
+        return new HttpRedirect("../../templates");
+    }
+
+    @POST
+    public HttpResponse doConfigSubmit(StaplerRequest req, @AncestorInPath KubernetesCloud kubernetesCloud) throws IOException, ServletException, Descriptor.FormException {
+        Jenkins j = Jenkins.get();
+        j.checkPermission(Jenkins.ADMINISTER);
+        if (kubernetesCloud == null) {
+            throw new IllegalStateException("Cloud could not be found");
+        }
+        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/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud/config.jelly

@@ -1,3 +1,22 @@
+<!--
+The MIT License
+Copyright (c) 2023, CloudBees 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:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials">
 
@@ -104,18 +123,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,44 @@
+<!--
+The MIT License
+Copyright (c) 2023, CloudBees 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:f="/lib/form">
+  <l:layout permission="${app.SYSTEM_READ}" title="${%New pod template}">
+    <j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}"/>
+    <l:breadcrumb title="${%New pod template }"/>
+    <st:include page="sidepanel.jelly" it="${it}"/>
+    <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 -->
+
+        <j:set var="descriptor" value="${it.templateDescriptor}"/>
+        <st:include class="${descriptor.clazz}" page="config.jelly"/>
+        <l:isAdmin>
+          <f:bottomButtonBar>
+            <f:submit value="${%Create}"/>
+          </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/sidepanel.jelly

@@ -0,0 +1,37 @@
+<!--
+The MIT License
+Copyright (c) 2023, CloudBees 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-details" title="${%Pod 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>

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud/sidepanel.properties

@@ -0,0 +1 @@
+delete.cloud=Delete the cloud?