Merge pull request #26 from vaibsaraswat/remove_token_from_properties

#25 Remove Slack token form runner properties file

Author: vaibsaraswat

heimdall.application/pom.xml

@@ -98,6 +98,7 @@
                         <environment>${environment}</environment>
                         <tags>${tags}</tags>
                         <viewName>${viewName}</viewName>
+                        <HeimdallSlackToken>${HeimdallSlackToken}</HeimdallSlackToken>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

heimdall.application/src/main/java/com/miqdigital/reporting/HeimdallReporting.java

@@ -111,15 +111,22 @@ public void updateStatusInS3AndNotifySlack()
     ExecutionInfo executionInfo =
         executionInfoGenerator.getBuildExecutionDetails(readProperties, executionOutputPath);
 
-    if (StringUtils.isNullOrEmpty(readProperties.getChannelName()) || StringUtils
-        .isNullOrEmpty(readProperties.getHeimdallBotToken())) {
-      throw new NullPointerException(
-          "Please specify Channel name and Slack bot token in runner properties file");
+    String heimdallSlackToken = System.getProperty("HeimdallSlackToken");
+
+    if (StringUtils.isNullOrEmpty(readProperties.getChannelName())) {
+      throw new NullPointerException("Please specify Slack Channel name in runner properties file");
+
+    } else if (StringUtils.isNullOrEmpty(heimdallSlackToken)) {
+      heimdallSlackToken = readProperties.getHeimdallBotToken();
+      if (StringUtils.isNullOrEmpty(heimdallSlackToken)) {
+        throw new NullPointerException(
+            "Please assign Slack bot token as system property in Jenkins or in runner properties "
+                + "file");
+      }
     }
     final SlackChannelInfo slackChannelInfo =
         SlackChannelInfo.builder().channelName(readProperties.getChannelName())
-            .token(readProperties.getHeimdallBotToken())
-            .isNotifySlack(readProperties.isNotifySlack()).build();
+            .token(heimdallSlackToken).isNotifySlack(readProperties.isNotifySlack()).build();
 
     LOGGER.info("Execution info generated Successfully");
     if (slackChannelInfo.isNotifySlack) {