Merge pull request #115 from electric-cloud/ECPLUGINS-15

ECPLUGINS-15
electric-cloud · Mar 11, 2019 · 443fb8c · 443fb8c
2 parents a420c16 + ed7923b
commit 443fb8c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -9,5 +9,5 @@
   <key>EC-Docker</key>
   <configure>ec_config</configure>
   <label>EC-Docker</label>
-  <version>1.5.0</version>
+  <version>1.5.1</version>
 </plugin>
diff --git a/dev/build.sh b/dev/build.sh
@@ -17,5 +17,5 @@ if [ $DEPLOY -eq 1 ]; then
   echo "Installing plugin ..."
   ectool --server localhost login admin changeme
   ectool installPlugin ./EC-Docker.jar --force 1
-  ectool promotePlugin EC-Docker-1.2.0
+  ectool promotePlugin EC-Docker-1.5.1
 fi  
diff --git a/dsl/procedures/createConfiguration/steps/createAndAttachCredential.pl b/dsl/procedures/createConfiguration/steps/createAndAttachCredential.pl
@@ -26,17 +26,17 @@
 };
 
 ## get an EC object
-my $ec = new ElectricCommander();
+my $ec = ElectricCommander->new();
 $ec->abortOnError(0);
 
-my $credName = "$[/myJob/config]";
+my $credName = '$[/myJob/config]';
 
 my $xpath = $ec->getFullCredential("credential");
 my $errors = $ec->checkAllErrors($xpath);
 my $clientID = $xpath->findvalue("//userName");
 my $clientSecret = $xpath->findvalue("//password");
 
-my $projName = "$[/myProject/projectName]";
+my $projName = '$[/myProject/projectName]';
 
 # Create credential
 $ec->deleteCredential($projName, $credName);
@@ -49,7 +49,7 @@
 $errors .= $ec->checkAllErrors($xpath);
 
 # Give job launcher full permissions on the credential
-my $user = "$[/myJob/launchedByUser]";
+my $user = '$[/myJob/launchedByUser]';
 $xpath = $ec->createAclEntry("user", $user,
     {projectName => $projName,
      credentialName => $credName,

diff --git a/dsl/procedures/deleteConfiguration/steps/deleteConfiguration.pl b/dsl/procedures/deleteConfiguration/steps/deleteConfiguration.pl
@@ -15,10 +15,17 @@
 #
 
 use ElectricCommander;
+my $ec = ElectricCommander->new();
+my $config = '$[config]';
 
-my $ec = new ElectricCommander();
-my $configName = "$[config]";
+if (!defined $config || $config eq "" ) {
+    my $errMsg = "config parameter must exist and be non-blank";
+    print $errMsg . "\n";
+    $ec->setProperty("/myJob/configError", $errMsg);
+    exit 1;
+}
 
-$ec->deleteProperty("/myProject/ec_plugin_cfgs/$[config]");
-$ec->deleteCredential("$[/myProject/projectName]", $configName);
-exit 0;
+$ec->deleteProperty("/myProject/ec_plugin_cfgs/$config");
+$ec->deleteCredential('$[/myProject/projectName]', $config);
+
+exit 0;
diff --git a/pages/help.xml b/pages/help.xml
@@ -14,7 +14,7 @@
     <h1>@PLUGIN_KEY@</h1>
     <p>Plugin version @PLUGIN_VERSION@</p>
 
-    <p>Revised on December 07, 2018</p>
+    <p>Revised on March 06, 2019</p>
 
     <hr style="margin-left: -10px; margin-top: 10px; height: 1px; width: 100%; color: #5981BD;" noshade="noshade"/>
     <h1>Contents</h1>
@@ -1051,11 +1051,14 @@ For more information on docker networking, see <a href="https://docs.docker.com/
 
     <h1 id="releaseNotes">Release Notes</h1>
 
+    <h3>@PLUGIN_KEY@ 1.5.1</h3>
+    <ul>
+        <li>Configurations can be created by users with "@" sign in a name.</li>
+    </ul>
+
     <h3>@PLUGIN_KEY@ 1.5.0</h3>
     <ul>
-
         <li>Plugin promotion time has been improved.</li>
-
     </ul>
 
     <h3>@PLUGIN_KEY@ 1.4.0</h3>