[incubator-openwhisk-package-alarms] branch master updated: use runtime env var __OW_API_KEY for the api key (#162)

[cs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-alarms.git


The following commit(s) were added to refs/heads/master by this push:
     new 2193ee3  use runtime env var __OW_API_KEY for the api key (#162)
2193ee3 is described below

commit 2193ee38c211dbafcd9fadc20cff0329e95f98c6
Author: Jason Peterson <ja...@us.ibm.com>
AuthorDate: Tue Aug 28 16:14:17 2018 -0400

    use runtime env var __OW_API_KEY for the api key (#162)
---
 action/alarmWebAction.js |  6 ++----
 action/lib/common.js     |  1 +
 action/lib/config.js     | 11 ++++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/action/alarmWebAction.js b/action/alarmWebAction.js
index 8209783..b5dd664 100644
--- a/action/alarmWebAction.js
+++ b/action/alarmWebAction.js
@@ -5,6 +5,7 @@ const CronJob = require('cron').CronJob;
 const moment = require('moment');
 const common = require('./lib/common');
 const Database = require('./lib/Database');
+const config = require('./lib/config');
 
 function main(params) {
 
@@ -19,10 +20,7 @@ function main(params) {
         namespace: triggerParts.namespace,
         additionalData: common.constructObject(params.additionalData),
     };
-    var triggerID = `${triggerData.namespace}/${triggerData.name}`;
-    if (triggerData.apikey) {
-        triggerID = `${triggerData.apikey}/${triggerID}`;
-    }
+    var triggerID = config.constructTriggerID(triggerData);
 
     var workers = params.workers instanceof Array ? params.workers : [];
     var deleteAfterFireArray = ['false', 'true', 'rules'];
diff --git a/action/lib/common.js b/action/lib/common.js
index 9f98fbe..b24e5dd 100644
--- a/action/lib/common.js
+++ b/action/lib/common.js
@@ -50,6 +50,7 @@ function createWebParams(rawParams) {
     delete webparams.apihost;
 
     webparams.triggerName = triggerName;
+    webparams.authKey = process.env.__OW_API_KEY;
     config.addAdditionalData(webparams);
 
     return webparams;
diff --git a/action/lib/config.js b/action/lib/config.js
index 0b58bed..cae4dbf 100644
--- a/action/lib/config.js
+++ b/action/lib/config.js
@@ -5,6 +5,14 @@ function getOpenWhiskConfig(triggerData) {
     return {ignore_certs: true, namespace: triggerData.namespace, api_key: triggerData.apikey};
 }
 
+function constructTriggerID(triggerData) {
+    var triggerID = `${triggerData.namespace}/${triggerData.name}`;
+    if (triggerData.apikey) {
+        triggerID = `${triggerData.apikey}/${triggerID}`;
+    }
+    return triggerID;
+}
+
 function addAdditionalData(params) {
     //insert code here to store additional trigger data in the database
     //for example, params.additionalData = {dateCreated: Date.now()};
@@ -12,5 +20,6 @@ function addAdditionalData(params) {
 
 module.exports = {
     'addAdditionalData': addAdditionalData,
-    'getOpenWhiskConfig': getOpenWhiskConfig
+    'getOpenWhiskConfig': getOpenWhiskConfig,
+    'constructTriggerID': constructTriggerID
 };