Revert "Allowing empty valued global variables in config file (#2657)" (#2663)

This reverts commit 506f96a.

Author: timja

integrations/src/test/java/io/jenkins/plugins/casc/GlobalNodePropertiesTest.java

@@ -7,19 +7,15 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import hudson.node_monitors.DiskSpaceMonitorNodeProperty;
 import hudson.slaves.EnvironmentVariablesNodeProperty;
 import hudson.slaves.NodeProperty;
 import hudson.slaves.NodePropertyDescriptor;
-import hudson.tools.ToolLocationNodeProperty;
 import hudson.util.DescribableList;
 import io.jenkins.plugins.casc.misc.ConfiguredWithCode;
 import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
 import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode;
 import io.jenkins.plugins.casc.model.CNode;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import jenkins.model.Jenkins;
 import org.junit.jupiter.api.Test;
@@ -34,37 +30,14 @@ void configure(JenkinsConfiguredWithCodeRule j) {
 
         DescribableList<NodeProperty<?>, NodePropertyDescriptor> nodeProperties = jenkins.getGlobalNodeProperties();
 
-        assertEquals(3, nodeProperties.size());
-
-        Set<Map.Entry<String, String>> envVars = ((EnvironmentVariablesNodeProperty)
-                        nodeProperties.get(EnvironmentVariablesNodeProperty.class))
+        Set<Map.Entry<String, String>> entries = ((EnvironmentVariablesNodeProperty) nodeProperties.get(0))
                 .getEnvVars()
                 .entrySet();
-        assertEquals(3, envVars.size());
+        assertEquals(1, entries.size());
 
-        Iterator<Entry<String, String>> iterator = envVars.iterator();
-        Map.Entry<String, String> envVar = iterator.next();
+        Map.Entry<String, String> envVar = entries.iterator().next();
         assertEquals("FOO", envVar.getKey());
         assertEquals("BAR", envVar.getValue());
-
-        envVar = iterator.next();
-        assertEquals("FOO2", envVar.getKey());
-        assertEquals("", envVar.getValue());
-
-        envVar = iterator.next();
-        assertEquals("FOO3", envVar.getKey());
-        assertEquals("", envVar.getValue());
-
-        DiskSpaceMonitorNodeProperty diskSpace = nodeProperties.get(DiskSpaceMonitorNodeProperty.class);
-        assertEquals("1GiB", diskSpace.getFreeDiskSpaceThreshold());
-        assertEquals("2GiB", diskSpace.getFreeDiskSpaceWarningThreshold());
-        assertEquals("1GiB", diskSpace.getFreeTempSpaceThreshold());
-        assertEquals("2GiB", diskSpace.getFreeTempSpaceWarningThreshold());
-
-        ToolLocationNodeProperty toolLocations = nodeProperties.get(ToolLocationNodeProperty.class);
-        assertEquals(1, toolLocations.getLocations().size());
-        assertEquals("Default", toolLocations.getLocations().get(0).getName());
-        assertEquals("/home/user/bin/git", toolLocations.getLocations().get(0).getHome());
     }
 
     @Test

integrations/src/test/resources/io/jenkins/plugins/casc/GlobalNodePropertiesTest.yml

@@ -1,18 +1,6 @@
 jenkins:
   globalNodeProperties:
-    - diskSpaceMonitor:
-        freeDiskSpaceThreshold: "1GiB"
-        freeDiskSpaceWarningThreshold: "2GiB"
-        freeTempSpaceThreshold: "1GiB"
-        freeTempSpaceWarningThreshold: "2GiB"
     - envVars:
         env:
           - key: FOO
             value: BAR
-          - key: FOO2
-            value: ""
-          - key: FOO3
-    - toolLocation:
-        locations:
-          - home: "/home/user/bin/git"
-            key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"

integrations/src/test/resources/io/jenkins/plugins/casc/GlobalNodePropertiesTestExpected.yml

@@ -1,15 +1,4 @@
-- diskSpaceMonitor:
-    freeDiskSpaceThreshold: "1GiB"
-    freeDiskSpaceWarningThreshold: "2GiB"
-    freeTempSpaceThreshold: "1GiB"
-    freeTempSpaceWarningThreshold: "2GiB"
 - envVars:
     env:
     - key: "FOO"
       value: "BAR"
-    - key: "FOO2"
-    - key: "FOO3"
-- toolLocation:
-    locations:
-    - home: "/home/user/bin/git"
-      key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"