miqdigital#25 Remove Slack token form runner properties file

Author: vaibhav.s

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,19 @@ public void updateStatusInS3AndNotifySlack()
     ExecutionInfo executionInfo =
         executionInfoGenerator.getBuildExecutionDetails(readProperties, executionOutputPath);
 
-    if (StringUtils.isNullOrEmpty(readProperties.getChannelName()) || StringUtils
-        .isNullOrEmpty(readProperties.getHeimdallBotToken())) {
+    final 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)) {
       throw new NullPointerException(
-          "Please specify Channel name and Slack bot token in runner properties file");
+          "Please assign Slack bot token as system property in Jenkins or your machine");
+
     }
     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) {

heimdall.application/src/main/java/com/miqdigital/utility/ReadProperties.java

@@ -21,10 +21,6 @@ public class ReadProperties {
    */
   private static final Logger LOGGER = LoggerFactory.getLogger(ReadProperties.class);
 
-  /**
-   * The constant heimdallBotToken.
-   */
-  private String heimdallBotToken;
   /**
    * The constant channelName.
    */
@@ -62,7 +58,6 @@ public ReadProperties(final String filepath) throws IOException {
   private void initFields() {
     channelName = properties.getProperty("CHANNEL_NAME");
     isNotifySlack = Boolean.parseBoolean(properties.getProperty("ISNOTIFYSLACK"));
-    heimdallBotToken = properties.getProperty("HEIMDALL_BOT_TOKEN");
     jiraPrefix = properties.getProperty("JIRA_PREFIX");
     s3BucketName = properties.getProperty("S3_BUCKETNAME");
   }

heimdall.sample-client/src/test/resources/properties/runner.properties

@@ -1,4 +1,3 @@
-HEIMDALL_BOT_TOKEN=add slack token
 CHANNEL_NAME=add channel name
 ISNOTIFYSLACK=true
 JIRA_PREFIX=add Jira prefix