[JENKINS-41759] Provide posibility of having no prefix

jenkinsci · Feb 17, 2017 · fc74039 · fc74039
1 parent ffba650
commit fc74039
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 2 deletions.
diff --git a/...enkinsci/plugins/pipeline/modeldefinition/environment/impl/TrustedPropertiesScript.groovy b/...enkinsci/plugins/pipeline/modeldefinition/environment/impl/TrustedPropertiesScript.groovy
@@ -44,6 +44,8 @@ class TrustedPropertiesScript extends DeclarativeEnvironmentContributorScript<Tr
         String prefix = Util.fixNull(key)
         if (!prefix.isEmpty() && !prefix.endsWith("_")) {
             prefix = prefix.trim() + "_"
+        } else if (prefix == "_") {
+            prefix = ""
         }
         String content = script.readTrusted(describable.path)
         return generateEnvStrings(prefix, content)

diff --git a/...rg/jenkinsci/plugins/pipeline/modeldefinition/environment/impl/TrustedPropertiesTest.java b/...rg/jenkinsci/plugins/pipeline/modeldefinition/environment/impl/TrustedPropertiesTest.java
@@ -26,22 +26,26 @@
 package org.jenkinsci.plugins.pipeline.modeldefinition.environment.impl;
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.AbstractModelDefTest;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
  * Tests {@link TrustedProperties}
  */
 public class TrustedPropertiesTest extends AbstractModelDefTest {
 
-    @Test
-    public void globalAndStage() throws Exception {
+    @Before
+    public void writeMarkers() throws Exception {
         sampleRepo.write("marker.properties", "NAME=Bobby\nNUM=1\n");
         sampleRepo.write("stage/marker.properties", "NAME=Andrew\nNUM=0\n");
         sampleRepo.git("init");
         sampleRepo.git("add", "marker.properties");
         sampleRepo.git("add", "stage/marker.properties");
         sampleRepo.git("commit", "--message=Markers");
+    }
 
+    @Test
+    public void globalAndStage() throws Exception {
         expect("environmentFromProperties")
                 .logContains(
                         "FOO is BAR",
@@ -50,4 +54,13 @@ public void globalAndStage() throws Exception {
                         "P_NAME is Andrew",
                         "P_NUM is 0").go();
     }
+
+    @Test
+    public void emptyPrefixStageOverride() throws Exception {
+        expect("environmentFromPropertiesEmptyPrefix")
+                .logContains(
+                        "FOO is BAR",
+                        "NAME is Andrew",
+                        "NUM is 0").go();
+    }
 }
diff --git a/pipeline-model-definition/src/test/resources/environmentFromPropertiesEmptyPrefix.groovy b/pipeline-model-definition/src/test/resources/environmentFromPropertiesEmptyPrefix.groovy
@@ -0,0 +1,52 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, 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.
+ *
+ */
+
+pipeline {
+    environment {
+        FOO = "BAZ"
+        _ = properties("marker.properties")
+    }
+    agent any
+
+    stages {
+        stage("foo") {
+            environment {
+                FOO = "BAR"
+                _ = properties("stage/marker.properties")
+            }
+
+            steps {
+                sh '''
+echo "FOO is $FOO"
+echo "NAME is $NAME"
+echo "NUM is $NUM"
+'''
+            }
+        }
+    }
+}
+
+
+