From 50e52becdf2da85f96459de947ce208f37444f58 Mon Sep 17 00:00:00 2001 From: armab Date: Wed, 20 Mar 2019 22:31:49 +0100 Subject: [PATCH] v0.9.2 hotfix for previous v0.9.1 erroneous version --- CHANGELOG.rst | 6 +++++- package.json | 2 +- scripts/stackstorm.js | 12 ++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 93499fe..5a8aa48 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,10 +4,14 @@ Changelog in development -------------- -0.9.1 +0.9.2 ----- * Rename ENV variable `ST2_API` -> `ST2_API_URL` for consistency, keep `ST2_API` for backwards compatibility (improvement) +0.9.1 +----- +* Erroneous version + 0.9.0 ----- * Remove support for Yammer (removal) diff --git a/package.json b/package.json index 742dffd..fd2ba74 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "hubot-stackstorm", "description": "A hubot plugin for integrating with StackStorm event-driven infrastructure automation platform.", - "version": "0.9.1", + "version": "0.9.2", "author": "StackStorm, Inc. ", "license": "Apache-2.0", "keywords": [ diff --git a/scripts/stackstorm.js b/scripts/stackstorm.js index 835e5c5..cf0e1dc 100644 --- a/scripts/stackstorm.js +++ b/scripts/stackstorm.js @@ -45,14 +45,7 @@ var _ = require('lodash'), ; // Setup the Environment -env.ST2_API_URL = env.ST2_API_URL || null; -if (!env.ST2_API_URL) { - if (env.ST2_API) { - robot.logger.warning("ST2_API is now deprecated and will be removed in a future release. Instead, please use the ST2_API_URL environment variable."); - } - env.ST2_API_URL = env.ST2_API || 'http://localhost:9101'; -} - +env.ST2_API_URL = env.ST2_API || env.ST2_API_URL || 'http://localhost:9101'; env.ST2_ROUTE = env.ST2_ROUTE || null; env.ST2_WEBUI_URL = env.ST2_WEBUI_URL || null; @@ -111,6 +104,9 @@ module.exports = function(robot) { var promise = Promise.resolve(); + if (env.ST2_API) { + robot.logger.warning("ST2_API is deprecated and will be removed in a future releases. Instead, please use the ST2_API_URL environment variable."); + } var url = utils.parseUrl(env.ST2_API_URL); var opts = {