Merge pull request #1 from illuminateeducation/DEVO-4239

Add support for Concourse metadata interpolation in summary, text fields and comments

src/addComments.js

@@ -2,6 +2,7 @@ const async = require('async');
 const debug = require('debug')('jira-resource');
 const request = require('request');
 const replaceTextFileString = require('./utils/replaceTextFileString.js');
+const replaceEnvVarString = require('./utils/replaceEnvVarString.js');
 const debugResponse = require('./utils/debugResponse.js');
 
 module.exports = (baseFileDir, issue, source, params, callback) => {
@@ -20,7 +21,7 @@ module.exports = (baseFileDir, issue, source, params, callback) => {
   async.each(
     params.comments,
     (comment, next) => {
-      const content = replaceTextFileString(baseFileDir, comment.content);
+      const content = replaceEnvVarString(replaceTextFileString(baseFileDir, comment.content));
       debug('Adding: %s', content);
 
       request(

src/searchIssues.js

@@ -4,6 +4,7 @@ const request = require('request');
 
 const debugResponse = require('./utils/debugResponse.js');
 const replaceTextFileString = require('./utils/replaceTextFileString.js');
+const replaceEnvVarString = require('./utils/replaceEnvVarString.js');
 
 
 function generateFilterStr(params) {
@@ -49,7 +50,7 @@ function searchByIssueKey(baseFileDir, source, params, custom_filter_str) {
 }
 
 function searchBySummary(baseFileDir, source, params, custom_filter_str) {
-  const summary = replaceTextFileString(baseFileDir, params.summary);
+  const summary = replaceEnvVarString(replaceTextFileString(baseFileDir, params.summary));
   debug('Searching for issue by summary: %s', summary);
 
   let jql = util.format(

src/utils/replaceEnvVarString.js

@@ -0,0 +1,22 @@
+module.exports = (value) => {
+  value = String(value);
+
+  const replacements = [
+    'BUILD_ID',
+    'BUILD_NAME',
+    'BUILD_JOB_NAME',
+    'BUILD_PIPELINE_NAME',
+    'BUILD_PIPELINE_INSTANCE_VARS',
+    'BUILD_TEAM_NAME',
+    'ATC_EXTERNAL_URL'
+  ];
+
+  for (const r of replacements) {
+    if (r in process.env) {
+      const regex = new RegExp(`\\\$${r}`, 'i');
+      value = value.replace(regex, process.env[r]);
+    }
+  }
+
+  return value;
+};

src/utils/requestIssue.js

@@ -5,6 +5,7 @@ const request = require('request');
 
 const debugResponse = require('./debugResponse.js');
 const replaceTextFileString = require('./replaceTextFileString.js');
+const replaceEnvVarString = require('./replaceEnvVarString.js');
 const customFieldFactory = require('./customFieldFactory.js')();
 
 module.exports = (baseFileDir, source, params, issueUrl, method, callback) => {
@@ -60,6 +61,9 @@ module.exports = (baseFileDir, source, params, issueUrl, method, callback) => {
         return replaceTextFileString(baseFileDir, value);
       })
       .mapValues(replaceNowString)
+      .mapValues((value) => {
+        return replaceEnvVarString(value);
+      })
       .value();
 
     const fields = _.merge(nonExpandableCustomFields, expandedFields);