From eb22d095474e1e5bba26332603f6e64ba7a84888 Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Thu, 6 Feb 2020 00:07:33 -0500 Subject: [PATCH 01/10] initial commit extender-scenario Signed-off-by: Nakul Manchanda --- README.md | 111 +------------ bin/configure-2.sh | 24 +++ bin/configure.sh | 43 +++++ bin/env.sh | 3 + bin/start.sh | 17 ++ package-lock.json | 252 +++++++++++++++++++++++++++++ package.json | 6 +- scripts/register-sample-api.sh | 40 ----- scripts/restart-sample-node-api.sh | 8 - scripts/start-sample-node-api.sh | 25 --- scripts/stop-sample-node-api.sh | 5 - scripts/testNodeAPI.js | 4 - server/app.js | 114 ++++++++++++- server/config.json | 6 +- test/features/endpoint.feature | 61 ------- test/support/steps.js | 21 --- 16 files changed, 463 insertions(+), 277 deletions(-) create mode 100644 bin/configure-2.sh create mode 100644 bin/configure.sh create mode 100644 bin/env.sh create mode 100644 bin/start.sh delete mode 100644 scripts/register-sample-api.sh delete mode 100644 scripts/restart-sample-node-api.sh delete mode 100644 scripts/start-sample-node-api.sh delete mode 100644 scripts/stop-sample-node-api.sh delete mode 100644 scripts/testNodeAPI.js delete mode 100644 test/features/endpoint.feature delete mode 100644 test/support/steps.js diff --git a/README.md b/README.md index 3edf9a3..1946556 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,13 @@ # sample-node-api A sample node js api for finding cars and accounts for a dealership,its used here to demonstrate the steps to extend API/ML with your own rest api. -## Manual Installation - ## Steps **Note** `Only rest api with https support can be deployed behind API/ML, make sure to enable https support in your rest api. -` - - -**Note** -Replace `/u/zowe/ibmuser/1.0.0/` with your zowe installation folder -Replace `ibmuser@my.mainframe.com` with your username and mainframe-ip - - +` This sample express app, has https enabled already. -# Download and transfer project files - ### 1) Clone the repository, install node packages and verify routes locally ``` @@ -41,103 +30,19 @@ Open your local browser and try accessing Don't transfer `node_modules` folder, we can do install npm install later on remote server itself to pull down required node packages ``` -// on remote - Create placeholder directory for your node app -ssh ibmuser@my.mainframe.com -cd /u/zowe/ibmuser/1.0.0/ -mkdir sample-node-api - +scp -r sample-node-api ibmuser@my.mainframe.com:/sample-node-api ``` -``` -//on local - use scp to transfer project files -scp data.js ibmuser@my.mainframe.com:/u/zowe/ibmuser/1.0.0/sample-node-api -scp package.json ibmuser@my.mainframe.com:/u/zowe/ibmuser/1.0.0/sample-node-api -scp package-lock.json ibmuser@my.mainframe.com:/u/zowe/ibmuser/1.0.0/sample-node-api -scp sample-node-api.yml ibmuser@my.mainframe.com:/u/zowe/ibmuser/1.0.0/sample-node-api/sample-node-api.yml.1047 - -scp -r scripts ibmuser@my.mainframe.com:/u/zowe/ibmuser/1.0.0/sample-node-api/scripts -scp -r server ibmuser@my.mainframe.com:/u/zowe/ibmuser/1.0.0/sample-node-api/server -scp -r sslcert ibmuser@my.mainframe.com:/u/zowe/ibmuser/1.0.0/sample-node-api/sslcert -``` - - -# Setup and Register API on host - -### 1) Install node packages required by project +### 3) Register as External Component +Append to EXTERNAL_COMPONENT /sample-node-api in INSTANCE_DIR/instance.env ``` -// on remote -cd /u/zowe/ibmuser/1.0.0/sample-node-api -npm install + vi INSTANCE_DIR/instance.env + EXTERNAL_COMPONENTS=/sample-node-api ``` +It expects `bin` folder with `start.sh`, `configure.sh` and `validate.sh`, provide lifecycle hooks to configure and start your api component with rest rest of zowe. -### 2) Modify startup script permission -Change unix permission of start up shell script `start-sample-node-api.sh`, so `run-zowe.sh` script can start a API - -``` -// on remote -cd /u/zowe/ibmuser/1.0.0/sample-node-api/scripts -chmod 755 start-sample-node-api.sh -chmod 755 restart-sample-node-api.sh -``` - -### 3) Register a plugin API/ML layer using yml file - -**Note** -Require encoding for `sample-node-api.yml` is `IBM-850`, use `iconv` utility to convert it to correct format - -Yaml config file needs to be present in api-defs folder along-with other statically discovered API example jobs.yml, uss.yml etc - -``` -// on remote -cd /u/zowe/ibmuser/1.0.0/sample-node-api -iconv -t IBM-850 -f IBM-1047 sample-node-api.yml.1047 > sample-node-api.yml -mv sample-node-api.yml ../api-mediation/api-defs/ -``` - -### 4) Modify zowe startup script to include API startup script -Edit `run-zowe.sh` on remote append node app startup script - -``` -// on remote -cd /u/zowe/ibmuser/1.0.0/scripts/internal/ -vi run-zowe.sh -``` -Append following start command for sample-node-api, among similar command from another services - -``` -`dirname $0`/../../sample-node-api/scripts/start-sample-node-api.sh -``` - -# Run Project - -### 1) Restart Zowe - - -**Note** -Replace `ZOWESVR` below with name of your installed zowe instance - -from TN3270 terminal -``` -# stop/cancel -/c ZOWESVR - -# start/restart -/s ZOWESVR -``` - -Or, we can use zowe helper scripts to restart zowe -``` -ssh ibmuser@my.mainframe.com -cd /u/zowe/ibmuser/1.0.0/scripts -./zowe-stop.sh -./zowe-start.sh -``` - -### 2) Access newly deployed webservice behind api/v1 +### 4) Access newly deployed webservice behind api/v1 `https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/` `https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/1/` `https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/1/cars/` - - - diff --git a/bin/configure-2.sh b/bin/configure-2.sh new file mode 100644 index 0000000..1da697b --- /dev/null +++ b/bin/configure-2.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +################################################################################ +# This program and the accompanying materials are made available under the terms of the +# Eclipse Public License v2.0 which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-v20.html +# +# SPDX-License-Identifier: EPL-2.0 +# +# Copyright IBM Corporation 2019 +################################################################################ + +. env.sh +COMPONENT_DIR="${ROOT_DIR}/components/${MY_API_NAME}" + +# copy static definition for sample-node-api to make fresh copy on every start +cp ${COMPONENT_DIR}/${MY_API_NAME}.yml ${COMPONENT_DIR}/${MY_API_NAME}.ebcidic.yml + +#configure based on env.sh +sed -i 's/mymainframe.ibm.com/${ZOWE_EXPLORER_HOST}/g' ${COMPONENT_DIR}/${MY_API_NAME}.ebcidic.yml +sed -i 's/18000/${MY_API_PORT}/g' ${COMPONENT_DIR}/${MY_API_NAME}.ebcidic.yml + +iconv -f IBM-1047 -t IBM-850 ${COMPONENT_DIR}/${MY_API_NAME}.ebcidic.yml > $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml +chmod 770 $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml \ No newline at end of file diff --git a/bin/configure.sh b/bin/configure.sh new file mode 100644 index 0000000..959f16f --- /dev/null +++ b/bin/configure.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +################################################################################ +# This program and the accompanying materials are made available under the terms of the +# Eclipse Public License v2.0 which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-v20.html +# +# SPDX-License-Identifier: EPL-2.0 +# +# Copyright IBM Corporation 2019 +################################################################################ + +. env.sh +COMPONENT_DIR="${ROOT_DIR}/components/${MY_API_NAME}" + + +# Add static definition for sample-node-api +cat <${STATIC_DEF_CONFIG_DIR}/${MY_API_NAME}.ebcidic.yml +# +services: + - serviceId: ${MY_API_NAME} + title: ${MY_API_NAME} + description: Example ${MY_API_NAME} Application + catalogUiTileId: ${MY_API_NAME} + instanceBaseUrls: + - https://${ZOWE_EXPLORER_HOST}:${MY_API_PORT}/ + homePageRelativeUrl: # Home page is at the same URL + routedServices: + - gatewayUrl: api/v1 # [api/ui/ws]/v{majorVersion} + serviceRelativeUrl: + apiInfo: + - apiId: com.ibm.${MY_API_NAME} + gatewayUrl: api/v1 + version: 0.0.1 + +catalogUiTiles: + ${MY_API_NAME}: + title: ${MY_API_NAME} + description: Example ${MY_API_NAME} Application +EOF +iconv -f IBM-1047 -t IBM-850 ${STATIC_DEF_CONFIG_DIR}/${MY_API_NAME}.ebcidic.yml > $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml +rm ${STATIC_DEF_CONFIG_DIR}/${MY_API_NAME}.ebcidic.yml +chmod 770 $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml \ No newline at end of file diff --git a/bin/env.sh b/bin/env.sh new file mode 100644 index 0000000..9820a61 --- /dev/null +++ b/bin/env.sh @@ -0,0 +1,3 @@ +MY_API_NAME='sample-node-api' +MY_API_PORT='18000' + diff --git a/bin/start.sh b/bin/start.sh new file mode 100644 index 0000000..5d4c442 --- /dev/null +++ b/bin/start.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# find node bin +NODE_BIN=${NODE_HOME}/bin/node + +#load component config +. env.sh + +COMPONENT_DIR="${ROOT_DIR}/components/${MY_API_NAME}" + +#start component +$NODE_BIN $COMPONENT_DIR/server/app.js \ + --service ${MY_API_NAME} \ + --port ${MY_API_PORT} \ + --key ${KEYSTORE_KEY} \ + --cert ${KEYSTORE_CERTIFICATE} \ + -v & \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 81e67de..3e44176 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,11 @@ "regenerator-runtime": "^0.12.0" } }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha1-HBJhu+qhCoBVu8XYq4S3sq/IRqA=" + }, "abbrev": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", @@ -38,6 +43,15 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha1-kK51xCTQCNJiTFvynq0xd+v881k=", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, "any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", @@ -135,6 +149,11 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=" + }, "cli-table3": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", @@ -145,6 +164,59 @@ "string-width": "^2.1.1" } }, + "cliui": { + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha1-UR1wLAxOQcoVbX0OlgIfI+EyJbE=", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha1-lSGCxGzHssMT0VluYjmSvRY7crU=", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=" + }, "colors": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", @@ -294,6 +366,11 @@ "ms": "2.0.0" } }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", @@ -333,6 +410,11 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc=" + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -502,6 +584,15 @@ "unpipe": "~1.0.0" } }, + "find-up": { + "version": "4.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk=", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", @@ -532,6 +623,11 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34=" + }, "gherkin": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/gherkin/-/gherkin-5.1.0.tgz", @@ -722,6 +818,14 @@ "type-check": "~0.3.2" } }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha1-Gvujlq/WdqbUJQTQpno6frn2KqA=", + "requires": { + "p-locate": "^4.1.0" + } + }, "lodash": { "version": "4.17.11", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", @@ -895,6 +999,27 @@ "wordwrap": "~1.0.0" } }, + "p-limit": { + "version": "2.2.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/p-limit/-/p-limit-2.2.2.tgz", + "integrity": "sha1-YSebZ3IfUoeqHBOpp/u8SMkpGx4=", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha1-o0KLtwiLOmApL2aRkni3wpetTwc=", + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY=" + }, "pad-right": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz", @@ -908,6 +1033,11 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=" }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha1-UTvb4tO5XXdi6METfvoZXGxhtbM=" + }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -997,6 +1127,16 @@ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs=" + }, "resolve": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz", @@ -1061,6 +1201,11 @@ "send": "0.16.2" } }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, "setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", @@ -1339,15 +1484,122 @@ "isexe": "^2.0.0" } }, + "which-module": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha1-6Tk7oHEC5skaOyIUePAlfNKFblM=", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha1-lSGCxGzHssMT0VluYjmSvRY7crU=", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "y18n": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms=" + }, + "yargs": { + "version": "15.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/yargs/-/yargs-15.1.0.tgz", + "integrity": "sha1-4RE4H1gw6GOolVC9SxNrtqXzchk=", + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^16.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha1-lSGCxGzHssMT0VluYjmSvRY7crU=", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "yargs-parser": { + "version": "16.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/yargs-parser/-/yargs-parser-16.1.0.tgz", + "integrity": "sha1-c3R9U64YfnuNvjM/lXFMduoA7PE=", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } } diff --git a/package.json b/package.json index b11fd71..ec3906d 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,7 @@ "description": "", "main": "index.js", "scripts": { - "start": "node server/app.js", - "test": "istanbul cover ./node_modules/cucumber/bin/cucumber-js -- test/features/*feature --require test/support/ --report cobertura --report html --tags \"not @leave\"" + "start": "node server/app.js" }, "author": "", "license": "ISC", @@ -15,7 +14,8 @@ "cucumber": "^5.1.0", "express": "^4.16.4", "istanbul": "^0.4.5", - "supertest": "^3.4.2" + "supertest": "^3.4.2", + "yargs": "^15.1.0" }, "devDependencies": { "node-fetch": "^2.3.0" diff --git a/scripts/register-sample-api.sh b/scripts/register-sample-api.sh deleted file mode 100644 index 0851dc9..0000000 --- a/scripts/register-sample-api.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -# pre-req -# 1. sample-node-api root should be directly under zowe installation directory eg /u/zowe/ibmuser/1.0.1/sample-node-api/ -# 2. register-sample-api.sh make this executable chmod 755 - -echo 'register sample api' -zowe_base_path = '/u/zowe/ibmuser/1.0.1' -api_defs_path = "$zowe_base_path/api-mediation/api-defs" -run_zowe_path = "$zowe_base_path/scripts/internal/run-zowe.sh" - -if [ -d $api_defs_path ] -then - echo "Error: Unable to locate $api_defs_path folder" - exit(1) -fi - -if [ -f $run_zowe_path ] -then - echo "Error: Unable to locate $run_zowe_path script" - exit(1) -fi - -echo 'making scripts start/restart script executable' -chmod 755 start-sample-node-api.sh -chmod 755 restart-sample-node-api.sh - -echo 'change yaml file from 1047 to 850 format' -iconv -t IBM-850 -f IBM-1047 sample-node-api.yml > sample-node-api.yml.850 - -echo 'move yaml file to api-defs folder' -mv sample-node-api.yml.850 ${api_defs_path}/sample-node-api.yml - -echo 'appending sample api startup script to run-zowe.sh' - -if ! grep -q 'start-sample-node-api.sh' "$file_path"; then -`dirname $0`/../../sample-node-api/scripts/start-sample-node-api.sh >> $run_zowe_path -fi - -echo 'done' diff --git a/scripts/restart-sample-node-api.sh b/scripts/restart-sample-node-api.sh deleted file mode 100644 index 0fac171..0000000 --- a/scripts/restart-sample-node-api.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -echo 'restarting sample node api...' -# ps -elf | awk '/node/ && /app.js/ && !/sh -c/' | awk '{print $2}' | xargs kill -9 $1 -ps -elf | awk '/node/ && /app.js/ && !/sh -c/' | awk '{print $3}' | xargs kill -9 $1 -./start-sample-node-api.sh -sleep 30 -echo 'restart sample node api done' \ No newline at end of file diff --git a/scripts/start-sample-node-api.sh b/scripts/start-sample-node-api.sh deleted file mode 100644 index 6b17f68..0000000 --- a/scripts/start-sample-node-api.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# find node bin -# export NODE_HOME=/usr/lpp/IBM/cnj/IBM/node-v6.14.4-os390-s390x -# export NODE_HOME=/Z23B/usr/lpp/IBM/cnj/IBM/node-v6.14.4-os390-s390x -# export NODE_HOME=/u/nodejs/node-v6.16.0-os390-s390x - -echo 'starting sample node api...' -if [ ! -z "$NODE_HOME" ]; then - NODE_BIN=${NODE_HOME}/bin/node - NPM_CLI=${NODE_HOME}/lib/node_modules/npm/bin/npm-cli.js -else - echo "Error: cannot find node bin, node app did not start" - exit 1 -fi - -# get current script directory -SCRIPT_DIR=$(dirname "$0") - -# get to new node app source directory -cd "$SCRIPT_DIR/.." - -# start service -$NODE_BIN server/app.js & -echo 'starting sample node api done' diff --git a/scripts/stop-sample-node-api.sh b/scripts/stop-sample-node-api.sh deleted file mode 100644 index afd8dc6..0000000 --- a/scripts/stop-sample-node-api.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -echo 'stopping sample node api...' -ps -elf | awk '/node/ && /app.js/ && !/sh -c/' | awk '{print $2}' | xargs kill -9 $1 -echo 'stop sample node api done' \ No newline at end of file diff --git a/scripts/testNodeAPI.js b/scripts/testNodeAPI.js deleted file mode 100644 index b45ca89..0000000 --- a/scripts/testNodeAPI.js +++ /dev/null @@ -1,4 +0,0 @@ -const fetch = require('node-fetch'); -fetch('https://mymainframe.ibm.com:18000/accounts', { method: 'GET' }) - .then(res => res.json()) // expecting a json response - .then(json => console.log(json)); \ No newline at end of file diff --git a/server/app.js b/server/app.js index 64932c6..86d8e64 100644 --- a/server/app.js +++ b/server/app.js @@ -3,13 +3,115 @@ const http = require('http'); const https = require('https'); const fs = require('fs'); const path = require("path"); + const cors = require('cors') -const { HTTPS_PORT } = require('./config.json'); +function buildConfig(argv) { + + const config = { + 'port': argv.port /*|| port*/, + 'https': { + 'key': argv.key /*|| key*/, + 'cert': argv.cert /*|| cert*/, + 'pfx': argv.pfx, + 'passphrase': argv.pass, + } + }; + return config; +} + +function loadCertificateFiles(config) { + // load https certs file content + if (config && config.https) { + ['key', 'cert', 'pfx'].forEach(key => { + if (config.https[key]) { + let file = config.https[key]; + config.https[key] = fs.readFileSync(file); + } + }); + } + return config; +}; + +function validateParams (argv) { + let isValid = true; + const serviceFor=argv.s; + + if((argv.p==='' || !argv.p) && isValid) { + isValid = false; + process.stderr.write(`[${serviceFor}] port configuration is missing\n`); + } + + if( (argv.k==='' && argv.c==='' && argv.x==='' && argv.w==='') && isValid) { + isValid = false; + process.stderr.write(`[${serviceFor}] https configuration is missing\n`); + } + + if( ( (argv.k==='' && argv.c>'') || (argv.k>'' && argv.c==='') + || (argv.x==='' && argv.w>'' && argv.k==='' && argv.c==='') + || (argv.x==='' && argv.w>'' && !(argv.k>'' && argv.c>'')) + || (argv.x>'' && argv.w==='') ) && isValid) { + isValid = false; + process.stderr.write(`[${serviceFor}] https configuration is missing\n`); + } + + if(!isValid) { + process.stderr.write(`[${serviceFor}] is failed to start, error:\n`); + process.exit(1); + return false; + } + + return true; +} + +var argv = require('yargs') + .usage('Usage: $0 [options]') + .option('s', { + alias: 'service', + description: 'service-for path', + default: '' + }) + .option('p', { + alias: 'port', + description: 'listening port' + }) + .option('k', { + alias: 'key', + default: '', + description: 'server key' + }) + .option('c', { + alias: 'cert', + default: '', + description: 'server cert', + }) + .option('x', { + alias: 'pfx', + default: '', + description: 'server pfx', + }) + .option('w', { + alias: 'pass', + default: '', + description: 'server pfx passphrase', + }) + .option('v', { + alias: 'verbose', + default: false, + description: 'show request logs', + type: 'boolean' + }) + .help('h') + .alias('h', 'help') + .check(validateParams) + .argv; + +let config = buildConfig(argv); +config = loadCertificateFiles(config); +const {https:{key, cert}} = config; +const credentials = { key, cert }; + -const privateKey = fs.readFileSync(path.resolve(__dirname, "../sslcert/server.key"), 'utf8'); -const certificate = fs.readFileSync(path.resolve(__dirname, "../sslcert/server.cert"), 'utf8'); -const credentials = { key: privateKey, cert: certificate }; const app = express(); @@ -26,7 +128,7 @@ app.use('/cli', cli); const httpsServer = https.createServer(credentials, app); // httpServer.listen(HTTP_PORT); -httpsServer.listen(HTTPS_PORT); -console.log(`server listening at port ${HTTPS_PORT}`); +httpsServer.listen(config.port); +console.log(`server listening at port ${config.port}`); module.exports = { app }; \ No newline at end of file diff --git a/server/config.json b/server/config.json index b05a74b..51b8132 100644 --- a/server/config.json +++ b/server/config.json @@ -1,3 +1,7 @@ { - "HTTPS_PORT": 18000 + "port": "18000", + "https": { + "key": "../sslcert/server.key", + "cert": "../sslcert/server.cert" + } } \ No newline at end of file diff --git a/test/features/endpoint.feature b/test/features/endpoint.feature deleted file mode 100644 index df0e1f1..0000000 --- a/test/features/endpoint.feature +++ /dev/null @@ -1,61 +0,0 @@ -@1 -Feature: initial REST feature - As a - I can - So that - -Scenario: connect - When I GET the endpoint "/" - Then I should get a 200 with body - """ - Hello World! - """ - -Scenario: get cars - When I GET the endpoint "/cars" - Then I should get a 200 with body - """ - [{"_id":0,"Name":"chevrolet chevelle malibu","Miles_per_Gallon":18,"Cylinders":8,"Displacement":307,"Horsepower":130,"Weight_in_lbs":3504,"Acceleration":12,"Year":"1970-01-01","Origin":"USA"},{"_id":1,"Name":"buick skylark 320","Miles_per_Gallon":15,"Cylinders":8,"Displacement":350,"Horsepower":165,"Weight_in_lbs":3693,"Acceleration":11.5,"Year":"1970-01-01","Origin":"USA"},{"_id":2,"Name":"plymouth satellite","Miles_per_Gallon":18,"Cylinders":8,"Displacement":318,"Horsepower":150,"Weight_in_lbs":3436,"Acceleration":11,"Year":"1970-01-01","Origin":"USA"},{"_id":3,"Name":"amc rebel sst","Miles_per_Gallon":16,"Cylinders":8,"Displacement":304,"Horsepower":150,"Weight_in_lbs":3433,"Acceleration":12,"Year":"1970-01-01","Origin":"USA"},{"_id":4,"Name":"ford torino","Miles_per_Gallon":17,"Cylinders":8,"Displacement":302,"Horsepower":140,"Weight_in_lbs":3449,"Acceleration":10.5,"Year":"1970-01-01","Origin":"USA"},{"_id":5,"Name":"ford galaxie 500","Miles_per_Gallon":15,"Cylinders":8,"Displacement":429,"Horsepower":198,"Weight_in_lbs":4341,"Acceleration":10,"Year":"1970-01-01","Origin":"USA"},{"_id":6,"Name":"chevrolet impala","Miles_per_Gallon":14,"Cylinders":8,"Displacement":454,"Horsepower":220,"Weight_in_lbs":4354,"Acceleration":9,"Year":"1970-01-01","Origin":"USA"},{"_id":7,"Name":"plymouth fury iii","Miles_per_Gallon":14,"Cylinders":8,"Displacement":440,"Horsepower":215,"Weight_in_lbs":4312,"Acceleration":8.5,"Year":"1970-01-01","Origin":"USA"},{"_id":8,"Name":"pontiac catalina","Miles_per_Gallon":14,"Cylinders":8,"Displacement":455,"Horsepower":225,"Weight_in_lbs":4425,"Acceleration":10,"Year":"1970-01-01","Origin":"USA"},{"_id":9,"Name":"amc ambassador dpl","Miles_per_Gallon":15,"Cylinders":8,"Displacement":390,"Horsepower":190,"Weight_in_lbs":3850,"Acceleration":8.5,"Year":"1970-01-01","Origin":"USA"}] - """ - -Scenario: get car - When I GET the endpoint "/cars/0" - Then I should get a 200 with body - """ - {"_id":0,"Name":"chevrolet chevelle malibu","Miles_per_Gallon":18,"Cylinders":8,"Displacement":307,"Horsepower":130,"Weight_in_lbs":3504,"Acceleration":12,"Year":"1970-01-01","Origin":"USA"} - """ - -Scenario: get accounts - When I GET the endpoint "/accounts" - Then I should get a 200 with body - """ - [{"_id":"0","name":{"first":"Deidre","last":"Hayes"},"email":"deidre.hayes@undefined.me","phone":"+1 (839) 577-3100","address":"507 Church Avenue, Heil, Wyoming, 1754"},{"_id":"1","name":{"first":"Maldonado","last":"Sellers"},"email":"maldonado.sellers@undefined.biz","phone":"+1 (834) 573-2841","address":"286 Hewes Street, Abiquiu, Maine, 2447"},{"_id":"2","name":{"first":"Elvia","last":"Aguilar"},"email":"elvia.aguilar@undefined.io","phone":"+1 (826) 486-2932","address":"457 Buffalo Avenue, Caberfae, Connecticut, 2648"},{"_id":"3","name":{"first":"Chris","last":"Mullins"},"email":"chris.mullins@undefined.org","phone":"+1 (884) 425-2397","address":"642 Vandalia Avenue, Driftwood, California, 213"},{"_id":"4","name":{"first":"Vargas","last":"Oneal"},"email":"vargas.oneal@undefined.info","phone":"+1 (893) 576-3106","address":"413 Bedford Avenue, Bynum, Federated States Of Micronesia, 1793"}] - """ - -Scenario: get account - When I GET the endpoint "/accounts/0" - Then I should get a 200 with body - """ - {"_id":"0","name":{"first":"Deidre","last":"Hayes"},"email":"deidre.hayes@undefined.me","phone":"+1 (839) 577-3100","address":"507 Church Avenue, Heil, Wyoming, 1754"} - """ - -Scenario: get cars with account - When I GET the endpoint "/accounts/0/cars" - Then I should get a 200 with body - """ - [{"_id":0,"Name":"chevrolet chevelle malibu","Miles_per_Gallon":18,"Cylinders":8,"Displacement":307,"Horsepower":130,"Weight_in_lbs":3504,"Acceleration":12,"Year":"1970-01-01","Origin":"USA"},{"_id":1,"Name":"buick skylark 320","Miles_per_Gallon":15,"Cylinders":8,"Displacement":350,"Horsepower":165,"Weight_in_lbs":3693,"Acceleration":11.5,"Year":"1970-01-01","Origin":"USA"}] - """ - -Scenario: get cars with account - When I GET the endpoint "/accounts/0/cars" - Then I should get a 200 with body - """ - [{"_id":0,"Name":"chevrolet chevelle malibu","Miles_per_Gallon":18,"Cylinders":8,"Displacement":307,"Horsepower":130,"Weight_in_lbs":3504,"Acceleration":12,"Year":"1970-01-01","Origin":"USA"},{"_id":1,"Name":"buick skylark 320","Miles_per_Gallon":15,"Cylinders":8,"Displacement":350,"Horsepower":165,"Weight_in_lbs":3693,"Acceleration":11.5,"Year":"1970-01-01","Origin":"USA"}] - """ - -Scenario: get account - When I GET the endpoint "/accounts/0/cars/0" - Then I should get a 200 with body - """ - {"_id":0,"Name":"chevrolet chevelle malibu","Miles_per_Gallon":18,"Cylinders":8,"Displacement":307,"Horsepower":130,"Weight_in_lbs":3504,"Acceleration":12,"Year":"1970-01-01","Origin":"USA"} - """ \ No newline at end of file diff --git a/test/support/steps.js b/test/support/steps.js deleted file mode 100644 index 170cd9f..0000000 --- a/test/support/steps.js +++ /dev/null @@ -1,21 +0,0 @@ -const { When, Then } = require("cucumber") -const assert = require("assert") - -const request = require("supertest"); -const app = require(process.cwd() + "/server/app").app; - -When('I GET the endpoint {string}', function (path) { - this.request = request(app).get(path); -}); - -Then('I should get a {int} with body', function (status, body, done) { - this.request.expect(status).expect(body).end(done); -}); - -Then('I should get the message', function (message) { - if (this.response + "" !== message) { - console.log("EXPECTED", message) - console.log("ACTUAL", this.response + "") - } - assert(this.response + "" == message); -}); \ No newline at end of file From c353f834a2cce69489db5e80ccb2d7bfff42bb3a Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Thu, 6 Feb 2020 18:14:07 -0500 Subject: [PATCH 02/10] fix copyright, modified readme Signed-off-by: Nakul Manchanda --- README.md | 7 ++++--- bin/configure-2.sh | 2 +- bin/configure.sh | 2 +- bin/start.sh | 11 +++++++++++ server/app.js | 10 ++++++++++ server/cli/accounts.route.js | 10 ++++++++++ server/cli/accountsCars.route.js | 10 ++++++++++ server/cli/cars.route.js | 10 ++++++++++ server/cli/index.route.js | 10 ++++++++++ server/controllers/accounts.controller.js | 10 ++++++++++ server/controllers/accountsCars.controller.js | 10 ++++++++++ server/controllers/cars.controller.js | 10 ++++++++++ server/routes/accounts.route.js | 10 ++++++++++ server/routes/accountsCars.route.js | 10 ++++++++++ server/routes/cars.route.js | 10 ++++++++++ server/routes/index.route.js | 10 ++++++++++ server/services/accounts.service.js | 10 ++++++++++ server/services/accountsCars.service.js | 10 ++++++++++ server/services/cars.service.js | 10 ++++++++++ 19 files changed, 167 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1946556..fa8240c 100644 --- a/README.md +++ b/README.md @@ -34,13 +34,14 @@ scp -r sample-node-api ibmuser@my.mainframe.com:/sample-node- ``` ### 3) Register as External Component -Append to EXTERNAL_COMPONENT /sample-node-api in INSTANCE_DIR/instance.env +Append to EXTERNAL_COMPONENT /sample-node-api/bin in INSTANCE_DIR/instance.env ``` vi INSTANCE_DIR/instance.env - EXTERNAL_COMPONENTS=/sample-node-api + EXTERNAL_COMPONENTS=/sample-node-api/bin ``` -It expects `bin` folder with `start.sh`, `configure.sh` and `validate.sh`, provide lifecycle hooks to configure and start your api component with rest rest of zowe. +It expects folder with `start.sh`, `configure.sh` and `validate.sh`, provides lifecycle hooks to configure and start your api component with rest of zowe. +In our case its bin folder with relevant scripts. ### 4) Access newly deployed webservice behind api/v1 `https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/` diff --git a/bin/configure-2.sh b/bin/configure-2.sh index 1da697b..2061180 100644 --- a/bin/configure-2.sh +++ b/bin/configure-2.sh @@ -7,7 +7,7 @@ # # SPDX-License-Identifier: EPL-2.0 # -# Copyright IBM Corporation 2019 +# Copyright IBM Corporation 2020 ################################################################################ . env.sh diff --git a/bin/configure.sh b/bin/configure.sh index 959f16f..9104092 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -7,7 +7,7 @@ # # SPDX-License-Identifier: EPL-2.0 # -# Copyright IBM Corporation 2019 +# Copyright IBM Corporation 2020 ################################################################################ . env.sh diff --git a/bin/start.sh b/bin/start.sh index 5d4c442..5159868 100644 --- a/bin/start.sh +++ b/bin/start.sh @@ -1,5 +1,16 @@ #!/bin/sh +################################################################################ +# This program and the accompanying materials are made available under the terms of the +# Eclipse Public License v2.0 which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-v20.html +# +# SPDX-License-Identifier: EPL-2.0 +# +# Copyright IBM Corporation 2020 +################################################################################ + + # find node bin NODE_BIN=${NODE_HOME}/bin/node diff --git a/server/app.js b/server/app.js index 86d8e64..0bdcdda 100644 --- a/server/app.js +++ b/server/app.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const express = require('express'); const http = require('http'); const https = require('https'); diff --git a/server/cli/accounts.route.js b/server/cli/accounts.route.js index f05862b..8084b48 100644 --- a/server/cli/accounts.route.js +++ b/server/cli/accounts.route.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const express = require('express'); const router = express.Router({ mergeParams: true }); diff --git a/server/cli/accountsCars.route.js b/server/cli/accountsCars.route.js index 34f1239..13c085e 100644 --- a/server/cli/accountsCars.route.js +++ b/server/cli/accountsCars.route.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const express = require('express'); const router = express.Router({ mergeParams: true }); diff --git a/server/cli/cars.route.js b/server/cli/cars.route.js index db55308..ac3af9c 100644 --- a/server/cli/cars.route.js +++ b/server/cli/cars.route.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const express = require('express'); const router = express.Router({ mergeParams: true }); diff --git a/server/cli/index.route.js b/server/cli/index.route.js index f3b9dd9..964b3dd 100644 --- a/server/cli/index.route.js +++ b/server/cli/index.route.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const express = require('express'); const cars = require('./cars.route'); const accounts = require('./accounts.route'); diff --git a/server/controllers/accounts.controller.js b/server/controllers/accounts.controller.js index 06285fe..dccd35f 100644 --- a/server/controllers/accounts.controller.js +++ b/server/controllers/accounts.controller.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const accountsService = require('../services/accounts.service'); const get = function(req, res){ diff --git a/server/controllers/accountsCars.controller.js b/server/controllers/accountsCars.controller.js index 4f1c695..f5343b7 100644 --- a/server/controllers/accountsCars.controller.js +++ b/server/controllers/accountsCars.controller.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const accountsCarsService = require('../services/accountsCars.service'); const get = function(req, res){ diff --git a/server/controllers/cars.controller.js b/server/controllers/cars.controller.js index 897796e..9ac9e7b 100644 --- a/server/controllers/cars.controller.js +++ b/server/controllers/cars.controller.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const carsService = require('../services/cars.service'); const get = function(req, res){ diff --git a/server/routes/accounts.route.js b/server/routes/accounts.route.js index f05862b..8084b48 100644 --- a/server/routes/accounts.route.js +++ b/server/routes/accounts.route.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const express = require('express'); const router = express.Router({ mergeParams: true }); diff --git a/server/routes/accountsCars.route.js b/server/routes/accountsCars.route.js index 1385064..ad2a305 100644 --- a/server/routes/accountsCars.route.js +++ b/server/routes/accountsCars.route.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const express = require('express'); const router = express.Router({ mergeParams: true }); diff --git a/server/routes/cars.route.js b/server/routes/cars.route.js index db55308..ac3af9c 100644 --- a/server/routes/cars.route.js +++ b/server/routes/cars.route.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const express = require('express'); const router = express.Router({ mergeParams: true }); diff --git a/server/routes/index.route.js b/server/routes/index.route.js index f3b9dd9..964b3dd 100644 --- a/server/routes/index.route.js +++ b/server/routes/index.route.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const express = require('express'); const cars = require('./cars.route'); const accounts = require('./accounts.route'); diff --git a/server/services/accounts.service.js b/server/services/accounts.service.js index f7063eb..c04bf3f 100644 --- a/server/services/accounts.service.js +++ b/server/services/accounts.service.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const data = require('../../data'); const get = function(_id){ diff --git a/server/services/accountsCars.service.js b/server/services/accountsCars.service.js index 38790d6..2a296dc 100644 --- a/server/services/accountsCars.service.js +++ b/server/services/accountsCars.service.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const data = require('../../data'); const carsService = require('./cars.service'); diff --git a/server/services/cars.service.js b/server/services/cars.service.js index 1d1e8c4..04ef301 100644 --- a/server/services/cars.service.js +++ b/server/services/cars.service.js @@ -1,3 +1,13 @@ +/* + This program and the accompanying materials are + made available under the terms of the Eclipse Public License v2.0 which accompanies + this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html + + SPDX-License-Identifier: EPL-2.0 + + Copyright IBM Corporation 2020 +*/ + const data = require('../../data'); const get = function(_id){ From 6aa526a638a609932d2cb851d4df09973a320d19 Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Sun, 9 Feb 2020 01:03:32 -0500 Subject: [PATCH 03/10] removed extra file, un-comment /cars api Signed-off-by: Nakul Manchanda --- package-lock.json | 851 +++++++++++++++------------- server/app.js | 2 - server/cli/accounts.route.js | 25 - server/cli/accountsCars.route.js | 22 - server/cli/cars.route.js | 22 - server/cli/index.route.js | 20 - server/routes/accountsCars.route.js | 4 +- 7 files changed, 448 insertions(+), 498 deletions(-) delete mode 100644 server/cli/accounts.route.js delete mode 100644 server/cli/accountsCars.route.js delete mode 100644 server/cli/cars.route.js delete mode 100644 server/cli/index.route.js diff --git a/package-lock.json b/package-lock.json index 3e44176..0d04218 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +5,12 @@ "requires": true, "dependencies": { "@babel/polyfill": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz", - "integrity": "sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==", + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/@babel/polyfill/-/polyfill-7.8.3.tgz", + "integrity": "sha1-IzP8IUSlQqfAfaOVAs7us6vk3r0=", "requires": { - "core-js": "^2.5.7", - "regenerator-runtime": "^0.12.0" + "core-js": "^2.6.5", + "regenerator-runtime": "^0.13.2" } }, "@types/color-name": { @@ -20,27 +20,27 @@ }, "abbrev": { "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/abbrev/-/abbrev-1.0.9.tgz", "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=" }, "accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", + "version": "1.3.7", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha1-UxvHJlF6OytB+FACHGzBXqq1B80=", "requires": { - "mime-types": "~2.1.18", - "negotiator": "0.6.1" + "mime-types": "~2.1.24", + "negotiator": "0.6.2" } }, "amdefine": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "optional": true }, "ansi-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, "ansi-styles": { @@ -54,39 +54,40 @@ }, "any-promise": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/any-promise/-/any-promise-1.3.0.tgz", "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" }, "argparse": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", "requires": { "sprintf-js": "~1.0.2" } }, "array-flatten": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "assert": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", + "version": "1.5.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/assert/-/assert-1.5.0.tgz", + "integrity": "sha1-VcEJqvbgrv2z3EtxJAxwv1dLGOs=", "requires": { + "object-assign": "^4.1.1", "util": "0.10.3" } }, "assert-plus": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "assertion-error-formatter": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/assertion-error-formatter/-/assertion-error-formatter-2.0.1.tgz", - "integrity": "sha512-cjC3jUCh9spkroKue5PDSKH5RFQ/KNuZJhk3GwHYmB/8qqETxLOmMdLH+ohi/VukNzxDlMvIe7zScvLoOdhb6Q==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/assertion-error-formatter/-/assertion-error-formatter-2.0.1.tgz", + "integrity": "sha1-a73/rsji+p4rDrFYv+NTEy18Cps=", "requires": { "diff": "^3.0.0", "pad-right": "^0.2.2", @@ -95,59 +96,59 @@ }, "async": { "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/async/-/async-1.5.2.tgz", "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" }, "asynckit": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "becke-ch--regex--s0-0-v1--base--pl--lib": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz", "integrity": "sha1-Qpzuu/pffpNueNc/vcfacWKyDiA=" }, "bluebird": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", - "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==" + "version": "3.7.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28=" }, "body-parser": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", - "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", + "version": "1.19.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io=", "requires": { - "bytes": "3.0.0", + "bytes": "3.1.0", "content-type": "~1.0.4", "debug": "2.6.9", "depd": "~1.1.2", - "http-errors": "~1.6.3", - "iconv-lite": "0.4.23", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", "on-finished": "~2.3.0", - "qs": "6.5.2", - "raw-body": "2.3.3", - "type-is": "~1.6.16" + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" } }, "brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY=" }, "camelcase": { "version": "5.3.1", @@ -156,8 +157,8 @@ }, "cli-table3": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", - "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cli-table3/-/cli-table3-0.5.1.tgz", + "integrity": "sha1-AlI3LZTfxA29jfBgBfSPMfZW8gI=", "requires": { "colors": "^1.1.2", "object-assign": "^4.1.0", @@ -218,71 +219,74 @@ "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=" }, "colors": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", - "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==" + "version": "1.4.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/colors/-/colors-1.4.0.tgz", + "integrity": "sha1-xQSRR51MG9rtLJztMs98fcI2D3g=" }, "combined-stream": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", + "version": "1.0.8", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=", "requires": { "delayed-stream": "~1.0.0" } }, "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==" + "version": "2.20.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/commander/-/commander-2.20.3.tgz", + "integrity": "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM=" }, "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" + "version": "1.3.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=" }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" + "version": "0.5.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70=", + "requires": { + "safe-buffer": "5.1.2" + } }, "content-type": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=" }, "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" + "version": "0.4.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha1-vrQ35wIrO21JAZ0IhmUwPr6cFLo=" }, "cookie-signature": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, "cookiejar": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cookiejar/-/cookiejar-2.1.2.tgz", + "integrity": "sha1-3YojVTB1L5iPmghE8/xYnjERElw=" }, "core-js": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", - "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==" + "version": "2.6.11", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha1-OIMUafmSK97Y7iHJ3EaYXgOZMIw=" }, "core-util-is": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cors": { "version": "2.8.5", - "resolved": "https://gizaartifactory.jfrog.io/gizaartifactory/api/npm/npm-release/cors/-/cors-2.8.5.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cors/-/cors-2.8.5.tgz", "integrity": "sha1-6sEdpRWS3Ya58G9uesKTs9+HXSk=", "requires": { "object-assign": "^4", @@ -291,8 +295,8 @@ }, "cross-spawn": { "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=", "requires": { "nice-try": "^1.0.4", "path-key": "^2.0.1", @@ -303,8 +307,8 @@ }, "cucumber": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cucumber/-/cucumber-5.1.0.tgz", - "integrity": "sha512-zrl2VYTBRgvxucwV2GKAvLqcfA1Naeax8plPvWgPEzl3SCJiuPPv3WxBHIRHtPYcEdbHDR6oqLpZP4bJ8UIdmA==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cucumber/-/cucumber-5.1.0.tgz", + "integrity": "sha1-exZoEsJVvsfqxLDfcAekDQiciV0=", "requires": { "@babel/polyfill": "^7.2.3", "assertion-error-formatter": "^2.0.1", @@ -338,30 +342,31 @@ } }, "cucumber-expressions": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/cucumber-expressions/-/cucumber-expressions-6.0.1.tgz", - "integrity": "sha1-R8nFc3gcL/ch161bLNHJf0OZq44=", + "version": "6.6.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cucumber-expressions/-/cucumber-expressions-6.6.2.tgz", + "integrity": "sha1-2JZA7Mxyp4OAtsIQ6uNqZOdGK4E=", "requires": { "becke-ch--regex--s0-0-v1--base--pl--lib": "^1.2.0" } }, "cucumber-tag-expressions": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/cucumber-tag-expressions/-/cucumber-tag-expressions-1.1.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cucumber-tag-expressions/-/cucumber-tag-expressions-1.1.1.tgz", "integrity": "sha1-f1x7cACbwrZmWRv+ZIVFeL7e6Fo=" }, "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "version": "1.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/d/-/d-1.0.1.tgz", + "integrity": "sha1-hpgJU3LVjb7jRv/Qxwk/mfj561o=", "requires": { - "es5-ext": "^0.10.9" + "es5-ext": "^0.10.50", + "type": "^1.0.1" } }, "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/debug/-/debug-2.6.9.tgz", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", "requires": { "ms": "2.0.0" } @@ -373,33 +378,33 @@ }, "deep-is": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/deep-is/-/deep-is-0.1.3.tgz", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, "delayed-stream": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, "depd": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/depd/-/depd-1.1.2.tgz", "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" }, "destroy": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, "diff": { "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/diff/-/diff-3.5.0.tgz", + "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI=" }, "duration": { "version": "0.2.2", - "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz", - "integrity": "sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/duration/-/duration-0.2.2.tgz", + "integrity": "sha1-3fFJvDvGkBFQ/pAXER0BazNX9Sk=", "requires": { "d": "1", "es5-ext": "~0.10.46" @@ -407,7 +412,7 @@ }, "ee-first": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "emoji-regex": { @@ -417,30 +422,30 @@ }, "encodeurl": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, "error-stack-parser": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.2.tgz", - "integrity": "sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==", + "version": "2.0.6", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/error-stack-parser/-/error-stack-parser-2.0.6.tgz", + "integrity": "sha1-WpmnB716TFinl5AtSNgoA+3mqtg=", "requires": { - "stackframe": "^1.0.4" + "stackframe": "^1.1.1" } }, "es5-ext": { - "version": "0.10.47", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz", - "integrity": "sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==", + "version": "0.10.53", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/es5-ext/-/es5-ext-0.10.53.tgz", + "integrity": "sha1-k8WjrP2+8nUiCtcmRK0C7hg2jeE=", "requires": { "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "1" + "es6-symbol": "~3.1.3", + "next-tick": "~1.0.0" } }, "es6-iterator": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/es6-iterator/-/es6-iterator-2.0.3.tgz", "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "requires": { "d": "1", @@ -449,27 +454,27 @@ } }, "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "version": "3.1.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha1-utXTwbzawoJp9MszHkMceKxwXRg=", "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "^1.0.1", + "ext": "^1.1.2" } }, "escape-html": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, "escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/escodegen/-/escodegen-1.8.1.tgz", "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", "requires": { "esprima": "^2.7.1", @@ -481,7 +486,7 @@ "dependencies": { "source-map": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/source-map/-/source-map-0.2.0.tgz", "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", "optional": true, "requires": { @@ -492,95 +497,110 @@ }, "esprima": { "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/esprima/-/esprima-2.7.3.tgz", "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" }, "estraverse": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/estraverse/-/estraverse-1.9.3.tgz", "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=" }, "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" + "version": "2.0.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=" }, "etag": { "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/etag/-/etag-1.8.1.tgz", "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, "express": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz", - "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", + "version": "4.17.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/express/-/express-4.17.1.tgz", + "integrity": "sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ=", "requires": { - "accepts": "~1.3.5", + "accepts": "~1.3.7", "array-flatten": "1.1.1", - "body-parser": "1.18.3", - "content-disposition": "0.5.2", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", "content-type": "~1.0.4", - "cookie": "0.3.1", + "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "~1.1.2", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.1.1", + "finalhandler": "~1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", "methods": "~1.1.2", "on-finished": "~2.3.0", - "parseurl": "~1.3.2", + "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.4", - "qs": "6.5.2", - "range-parser": "~1.2.0", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", "safe-buffer": "5.1.2", - "send": "0.16.2", - "serve-static": "1.13.2", - "setprototypeof": "1.1.0", - "statuses": "~1.4.0", - "type-is": "~1.6.16", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" } }, + "ext": { + "version": "1.4.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ext/-/ext-1.4.0.tgz", + "integrity": "sha1-ia56BxWPedNVF4gpBDJAd+Q3kkQ=", + "requires": { + "type": "^2.0.0" + }, + "dependencies": { + "type": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/type/-/type-2.0.0.tgz", + "integrity": "sha1-Xxb/bvLrRPJgSU2uJxAzspwJqcM=" + } + } + }, "extend": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/extend/-/extend-3.0.2.tgz", + "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=" }, "extsprintf": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/extsprintf/-/extsprintf-1.4.0.tgz", "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=" }, "fast-levenshtein": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, "figures": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/figures/-/figures-2.0.0.tgz", "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "requires": { "escape-string-regexp": "^1.0.5" } }, "finalhandler": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", - "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", + "version": "1.1.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0=", "requires": { "debug": "2.6.9", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.4.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", "unpipe": "~1.0.0" } }, @@ -594,9 +614,9 @@ } }, "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "version": "2.5.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/form-data/-/form-data-2.5.1.tgz", + "integrity": "sha1-8svsV7XlniNxbhKP5E1OXdI4lfQ=", "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -605,22 +625,22 @@ }, "formidable": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", - "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/formidable/-/formidable-1.2.1.tgz", + "integrity": "sha1-cPt8oCkO5v+WEJBBX0s989IIJlk=" }, "forwarded": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/forwarded/-/forwarded-0.1.2.tgz", "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" }, "fresh": { "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "get-caller-file": { @@ -630,13 +650,13 @@ }, "gherkin": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/gherkin/-/gherkin-5.1.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/gherkin/-/gherkin-5.1.0.tgz", "integrity": "sha1-aEu7A63STq9731RPWAM+so+zxtU=" }, "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "version": "7.1.6", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/glob/-/glob-7.1.6.tgz", + "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -647,63 +667,63 @@ } }, "handlebars": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.0.tgz", - "integrity": "sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==", + "version": "4.7.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/handlebars/-/handlebars-4.7.3.tgz", + "integrity": "sha1-js4nl4Johs+AgtFyb/IdKgIlUO4=", "requires": { - "async": "^2.5.0", + "neo-async": "^2.6.0", "optimist": "^0.6.1", "source-map": "^0.6.1", "uglify-js": "^3.1.4" }, "dependencies": { - "async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", - "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", - "requires": { - "lodash": "^4.17.11" - } - }, "source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=" } } }, "has-flag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" }, "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "version": "1.7.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8=", "requires": { "depd": "~1.1.2", "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + } } }, "iconv-lite": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "version": "0.4.24", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", "requires": { "safer-buffer": ">= 2.1.2 < 3" } }, "indent-string": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/indent-string/-/indent-string-3.2.0.tgz", "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=" }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { "once": "^1.3.0", @@ -711,43 +731,43 @@ } }, "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "version": "2.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/inherits/-/inherits-2.0.1.tgz", + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" }, "ipaddr.js": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz", - "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=" + "version": "1.9.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ipaddr.js/-/ipaddr.js-1.9.0.tgz", + "integrity": "sha1-N9905DCg5HVQ/lSi3v4w2KzZX2U=" }, "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, "is-generator": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-generator/-/is-generator-1.0.3.tgz", "integrity": "sha1-wUwhBX7TbjKNuANHlmxpP4hjifM=" }, "is-stream": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/isexe/-/isexe-2.0.0.tgz", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "istanbul": { "version": "0.4.5", - "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/istanbul/-/istanbul-0.4.5.tgz", "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", "requires": { "abbrev": "1.0.x", @@ -768,7 +788,7 @@ "dependencies": { "glob": { "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/glob/-/glob-5.0.15.tgz", "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "requires": { "inflight": "^1.0.4", @@ -780,15 +800,15 @@ }, "resolve": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/resolve/-/resolve-1.1.7.tgz", "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=" } } }, "js-yaml": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", - "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", + "version": "3.13.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc=", "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -796,14 +816,14 @@ "dependencies": { "esprima": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=" } } }, "knuth-shuffle-seeded": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/knuth-shuffle-seeded/-/knuth-shuffle-seeded-1.0.6.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/knuth-shuffle-seeded/-/knuth-shuffle-seeded-1.0.6.tgz", "integrity": "sha1-AfG2VzOqdUDuCNiwF0Fk0iCB5OE=", "requires": { "seed-random": "~2.2.0" @@ -811,7 +831,7 @@ }, "levn": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "requires": { "prelude-ls": "~1.1.2", @@ -827,64 +847,64 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=" }, "lower-case": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/lower-case/-/lower-case-1.1.4.tgz", "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" }, "media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "merge-descriptors": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, "methods": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/methods/-/methods-1.1.2.tgz", "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==" + "version": "1.6.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/mime/-/mime-1.6.0.tgz", + "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=" }, "mime-db": { - "version": "1.38.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz", - "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==" + "version": "1.43.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha1-ChLgUCZQ5HPXNVNQUOfI9OtPrlg=" }, "mime-types": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz", - "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==", + "version": "2.1.26", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/mime-types/-/mime-types-2.1.26.tgz", + "integrity": "sha1-nJIfwJt+FJpl39wNpNIJlyALCgY=", "requires": { - "mime-db": "~1.38.0" + "mime-db": "1.43.0" } }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/minimist/-/minimist-0.0.10.tgz", "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" @@ -892,20 +912,20 @@ "dependencies": { "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" } } }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "mz": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/mz/-/mz-2.7.0.tgz", + "integrity": "sha1-lQCAV6Vsr63CvGPd5/n/aVWUjjI=", "requires": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", @@ -913,37 +933,42 @@ } }, "negotiator": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", - "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" + "version": "0.6.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs=" + }, + "neo-async": { + "version": "2.6.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/neo-async/-/neo-async-2.6.1.tgz", + "integrity": "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=" }, "next-tick": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, "nice-try": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=" }, "no-case": { "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/no-case/-/no-case-2.3.2.tgz", + "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "requires": { "lower-case": "^1.1.1" } }, "node-fetch": { - "version": "2.3.0", - "resolved": "https://gizaartifactory.jfrog.io/gizaartifactory/api/npm/npm-release/node-fetch/-/node-fetch-2.3.0.tgz", - "integrity": "sha1-Gh2UC7+5FqHT4CGfA36J5x+MX6U=", + "version": "2.6.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha1-5jNFY4bUqlWGP2dqerDaqP3ssP0=", "dev": true }, "nopt": { "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "requires": { "abbrev": "1" @@ -951,12 +976,12 @@ }, "object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "on-finished": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", "requires": { "ee-first": "1.1.1" @@ -964,7 +989,7 @@ }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { "wrappy": "1" @@ -972,7 +997,7 @@ }, "optimist": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/optimist/-/optimist-0.6.1.tgz", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "requires": { "minimist": "~0.0.1", @@ -981,22 +1006,22 @@ "dependencies": { "wordwrap": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/wordwrap/-/wordwrap-0.0.3.tgz", "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" } } }, "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "version": "0.8.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha1-hPodA2/p08fiHZmIS2ARZ+yPtJU=", "requires": { "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", + "fast-levenshtein": "~2.0.6", "levn": "~0.3.0", "prelude-ls": "~1.1.2", "type-check": "~0.3.2", - "wordwrap": "~1.0.0" + "word-wrap": "~1.2.3" } }, "p-limit": { @@ -1022,16 +1047,16 @@ }, "pad-right": { "version": "0.2.2", - "resolved": "https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/pad-right/-/pad-right-0.2.2.tgz", "integrity": "sha1-b7ySQEXSRPKiokRQMGDTv8YAl3Q=", "requires": { "repeat-string": "^1.5.2" } }, "parseurl": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", - "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=" + "version": "1.3.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ=" }, "path-exists": { "version": "4.0.0", @@ -1040,73 +1065,73 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-key": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/path-key/-/path-key-2.0.1.tgz", "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" }, "path-parse": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=" }, "path-to-regexp": { "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "prelude-ls": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/prelude-ls/-/prelude-ls-1.1.2.tgz", "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + "version": "2.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=" }, "progress": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/progress/-/progress-2.0.3.tgz", + "integrity": "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg=" }, "proxy-addr": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", - "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", + "version": "2.0.5", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/proxy-addr/-/proxy-addr-2.0.5.tgz", + "integrity": "sha1-NMvWSi2B9LH9IedvnwbIpFKZ7jQ=", "requires": { "forwarded": "~0.1.2", - "ipaddr.js": "1.8.0" + "ipaddr.js": "1.9.0" } }, "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + "version": "6.7.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/qs/-/qs-6.7.0.tgz", + "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=" }, "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" + "version": "1.2.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE=" }, "raw-body": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz", - "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", + "version": "2.4.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha1-oc5vucm8NWylLoklarWQWeE9AzI=", "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.3", - "iconv-lite": "0.4.23", + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", "unpipe": "1.0.0" } }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c=", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -1115,16 +1140,23 @@ "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.4", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=" + } } }, "regenerator-runtime": { - "version": "0.12.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", - "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" + "version": "0.13.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", + "integrity": "sha1-fPanfY9cb2Drc8X8GVWyzrAea/U=" }, "repeat-string": { "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, "require-directory": { @@ -1138,37 +1170,37 @@ "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs=" }, "resolve": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz", - "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==", + "version": "1.15.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/resolve/-/resolve-1.15.1.tgz", + "integrity": "sha1-J73N7/6vLWJEuVuw+fS0ZTRR8+g=", "requires": { "path-parse": "^1.0.6" } }, "safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" }, "safer-buffer": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" }, "seed-random": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/seed-random/-/seed-random-2.2.0.tgz", "integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ=" }, "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" + "version": "5.7.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/semver/-/semver-5.7.1.tgz", + "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=" }, "send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", + "version": "0.17.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/send/-/send-0.17.1.tgz", + "integrity": "sha1-wdiwWfeQD3Rm3Uk4vcROEd2zdsg=", "requires": { "debug": "2.6.9", "depd": "~1.1.2", @@ -1177,28 +1209,35 @@ "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "~1.6.2", - "mime": "1.4.1", - "ms": "2.0.0", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.4.0" + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "dependencies": { + "ms": { + "version": "2.1.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ms/-/ms-2.1.1.tgz", + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=" + } } }, "serialize-error": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-3.0.0.tgz", - "integrity": "sha512-+y3nkkG/go1Vdw+2f/+XUXM1DXX1XcxTl99FfiD/OEPUNw4uo0i6FKABfTAN5ZcgGtjTRZcEbxcE/jtXbEY19A==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/serialize-error/-/serialize-error-3.0.0.tgz", + "integrity": "sha1-gBACgrCb4zxhFTb1ADNIHLnMh88=" }, "serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", + "version": "1.14.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk=", "requires": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", - "parseurl": "~1.3.2", - "send": "0.16.2" + "parseurl": "~1.3.3", + "send": "0.17.1" } }, "set-blocking": { @@ -1207,13 +1246,13 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + "version": "1.1.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM=" }, "shebang-command": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "requires": { "shebang-regex": "^1.0.0" @@ -1221,70 +1260,70 @@ }, "shebang-regex": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/shebang-regex/-/shebang-regex-1.0.0.tgz", "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, "source-map": { "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/source-map/-/source-map-0.5.6.tgz", "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" }, "sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "stack-chain": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-2.0.0.tgz", - "integrity": "sha512-GGrHXePi305aW7XQweYZZwiRwR7Js3MWoK/EHzzB9ROdc75nCnjSJVi21rdAGxFl+yCx2L2qdfl5y7NO4lTyqg==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/stack-chain/-/stack-chain-2.0.0.tgz", + "integrity": "sha1-1z0Rcq+JVl8HQ4tbzAhoMbZomy0=" }, "stack-generator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.3.tgz", - "integrity": "sha512-kdzGoqrnqsMxOEuXsXyQTmvWXZmG0f3Ql2GDx5NtmZs59sT2Bt9Vdyq0XdtxUi58q/+nxtbF9KOQ9HkV1QznGg==", + "version": "2.0.5", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/stack-generator/-/stack-generator-2.0.5.tgz", + "integrity": "sha1-+wDltO6X3mA+B3PqeM6UTYFZbDY=", "requires": { - "stackframe": "^1.0.4" + "stackframe": "^1.1.1" } }, "stackframe": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz", - "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==" + "version": "1.1.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/stackframe/-/stackframe-1.1.1.tgz", + "integrity": "sha1-/+8KMxixtgw7WFZJiaylZgcp7HE=" }, "stacktrace-gps": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.0.2.tgz", - "integrity": "sha512-9o+nWhiz5wFnrB3hBHs2PTyYrS60M1vvpSzHxwxnIbtY2q9Nt51hZvhrG1+2AxD374ecwyS+IUwfkHRE/2zuGg==", + "version": "3.0.4", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/stacktrace-gps/-/stacktrace-gps-3.0.4.tgz", + "integrity": "sha1-dojcL8Cf+zoTFl6+DbyvQbzwxpo=", "requires": { "source-map": "0.5.6", - "stackframe": "^1.0.4" + "stackframe": "^1.1.1" } }, "stacktrace-js": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.0.tgz", - "integrity": "sha1-d2ymRqlbxsayuQd2U2p/xyxt21g=", + "version": "2.0.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/stacktrace-js/-/stacktrace-js-2.0.2.tgz", + "integrity": "sha1-TKk+qfSUdS1VcJoIHUAP2uvuiXs=", "requires": { - "error-stack-parser": "^2.0.1", - "stack-generator": "^2.0.1", - "stacktrace-gps": "^3.0.1" + "error-stack-parser": "^2.0.6", + "stack-generator": "^2.0.5", + "stacktrace-gps": "^3.0.4" } }, "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" + "version": "1.5.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, "string-argv": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.1.1.tgz", - "integrity": "sha512-El1Va5ehZ0XTj3Ekw4WFidXvTmt9SrC0+eigdojgtJMVtPkF0qbBe9fyNSl9eQf+kUHnTSQxdQYzuHfZy8V+DQ==" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-argv/-/string-argv-0.1.1.tgz", + "integrity": "sha1-Zr1a44I3COqhkW+lQScDFQ1N368=" }, "string-width": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "requires": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" @@ -1292,15 +1331,15 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", "requires": { "safe-buffer": "~5.1.0" } }, "strip-ansi": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "requires": { "ansi-regex": "^3.0.0" @@ -1308,8 +1347,8 @@ }, "superagent": { "version": "3.8.3", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz", - "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/superagent/-/superagent-3.8.3.tgz", + "integrity": "sha1-Rg6g29t9WxG8T3jeulZfhqF44Sg=", "requires": { "component-emitter": "^1.2.0", "cookiejar": "^2.1.0", @@ -1325,23 +1364,23 @@ "dependencies": { "debug": { "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/debug/-/debug-3.2.6.tgz", + "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "requires": { "ms": "^2.1.1" } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ms/-/ms-2.1.2.tgz", + "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=" } } }, "supertest": { "version": "3.4.2", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.4.2.tgz", - "integrity": "sha512-WZWbwceHUo2P36RoEIdXvmqfs47idNNZjCuJOqDz6rvtkk8ym56aU5oglORCpPeXGxT7l9rkJ41+O1lffQXYSA==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/supertest/-/supertest-3.4.2.tgz", + "integrity": "sha1-utfeLkPWDSfIyuuKs0pnyKX3Gq0=", "requires": { "methods": "^1.1.2", "superagent": "^3.8.3" @@ -1349,7 +1388,7 @@ }, "supports-color": { "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "requires": { "has-flag": "^1.0.0" @@ -1357,7 +1396,7 @@ }, "thenify": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/thenify/-/thenify-3.3.0.tgz", "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=", "requires": { "any-promise": "^1.0.0" @@ -1365,7 +1404,7 @@ }, "thenify-all": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/thenify-all/-/thenify-all-1.6.0.tgz", "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", "requires": { "thenify": ">= 3.1.0 < 4" @@ -1373,102 +1412,99 @@ }, "title-case": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/title-case/-/title-case-2.1.1.tgz", "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=", "requires": { "no-case": "^2.2.0", "upper-case": "^1.0.3" } }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM=" + }, + "type": { + "version": "1.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/type/-/type-1.2.0.tgz", + "integrity": "sha1-hI3XaY2vo+VKbEeedZxLw/GIR6A=" + }, "type-check": { "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "requires": { "prelude-ls": "~1.1.2" } }, "type-is": { - "version": "1.6.16", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", - "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", + "version": "1.6.18", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha1-TlUs0F3wlGfcvE73Od6J8s83wTE=", "requires": { "media-typer": "0.3.0", - "mime-types": "~2.1.18" + "mime-types": "~2.1.24" } }, "uglify-js": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", + "version": "3.7.7", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/uglify-js/-/uglify-js-3.7.7.tgz", + "integrity": "sha1-IeUsfczagKU7983mliin5RGuyck=", "optional": true, "requires": { - "commander": "~2.17.1", + "commander": "~2.20.3", "source-map": "~0.6.1" }, "dependencies": { - "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", - "optional": true - }, "source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", "optional": true } } }, "unpipe": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, "upper-case": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/upper-case/-/upper-case-1.1.3.tgz", "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" }, "util": { "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "requires": { "inherits": "2.0.1" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" - } } }, "util-arity": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/util-arity/-/util-arity-1.1.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/util-arity/-/util-arity-1.1.0.tgz", "integrity": "sha1-WdAa8f2z/t4KxOYysKtfbOl8kzA=" }, "util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "utils-merge": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, "vary": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, "verror": { "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { "assert-plus": "^1.0.0", @@ -1478,8 +1514,8 @@ }, "which": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/which/-/which-1.3.1.tgz", + "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", "requires": { "isexe": "^2.0.0" } @@ -1489,9 +1525,14 @@ "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha1-YQY29rH3A4kb00dxzLF/uTtHB5w=" + }, "wordwrap": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" }, "wrap-ansi": { @@ -1536,7 +1577,7 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "y18n": { diff --git a/server/app.js b/server/app.js index 0bdcdda..93438d5 100644 --- a/server/app.js +++ b/server/app.js @@ -128,11 +128,9 @@ const app = express(); //TODO: use for whitelist only app.use(cors()); const routes = require('./routes/index.route'); -const cli = require('./cli/index.route'); app.get('/', (req, res) => res.send('Hello World!')); app.use(routes); -app.use('/cli', cli); // const httpServer = http.createServer(app); const httpsServer = https.createServer(credentials, app); diff --git a/server/cli/accounts.route.js b/server/cli/accounts.route.js deleted file mode 100644 index 8084b48..0000000 --- a/server/cli/accounts.route.js +++ /dev/null @@ -1,25 +0,0 @@ -/* - This program and the accompanying materials are - made available under the terms of the Eclipse Public License v2.0 which accompanies - this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html - - SPDX-License-Identifier: EPL-2.0 - - Copyright IBM Corporation 2020 -*/ - -const express = require('express'); -const router = express.Router({ mergeParams: true }); - -const accountsController = require('../controllers/accounts.controller'); -const accountsCarsRoute = require('./accountsCars.route'); - -router.route('/') - .get(accountsController.getAll); - -router.route('/:_id') - .get(accountsController.get); - -router.use('/:Account_id', accountsCarsRoute); - -module.exports = router; \ No newline at end of file diff --git a/server/cli/accountsCars.route.js b/server/cli/accountsCars.route.js deleted file mode 100644 index 13c085e..0000000 --- a/server/cli/accountsCars.route.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - This program and the accompanying materials are - made available under the terms of the Eclipse Public License v2.0 which accompanies - this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html - - SPDX-License-Identifier: EPL-2.0 - - Copyright IBM Corporation 2020 -*/ - -const express = require('express'); -const router = express.Router({ mergeParams: true }); - -const accountsCarsController = require('../controllers/accountsCars.controller'); - -router.route('/cars') - .get(accountsCarsController.getAll); - -router.route('/cars/:_id') - .get(accountsCarsController.get); - -module.exports = router; \ No newline at end of file diff --git a/server/cli/cars.route.js b/server/cli/cars.route.js deleted file mode 100644 index ac3af9c..0000000 --- a/server/cli/cars.route.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - This program and the accompanying materials are - made available under the terms of the Eclipse Public License v2.0 which accompanies - this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html - - SPDX-License-Identifier: EPL-2.0 - - Copyright IBM Corporation 2020 -*/ - -const express = require('express'); -const router = express.Router({ mergeParams: true }); - -const carsController = require('../controllers/cars.controller'); - -router.route('/') - .get(carsController.getAll); - -router.route('/:_id') - .get(carsController.get); - -module.exports = router; \ No newline at end of file diff --git a/server/cli/index.route.js b/server/cli/index.route.js deleted file mode 100644 index 964b3dd..0000000 --- a/server/cli/index.route.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - This program and the accompanying materials are - made available under the terms of the Eclipse Public License v2.0 which accompanies - this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html - - SPDX-License-Identifier: EPL-2.0 - - Copyright IBM Corporation 2020 -*/ - -const express = require('express'); -const cars = require('./cars.route'); -const accounts = require('./accounts.route'); - -const router = express.Router(); - -router.use('/cars', cars); -router.use('/accounts', accounts); - -module.exports = router; \ No newline at end of file diff --git a/server/routes/accountsCars.route.js b/server/routes/accountsCars.route.js index ad2a305..b4c222f 100644 --- a/server/routes/accountsCars.route.js +++ b/server/routes/accountsCars.route.js @@ -13,7 +13,7 @@ const router = express.Router({ mergeParams: true }); const accountsCarsController = require('../controllers/accountsCars.controller'); -/* + // Add missing feature // un-comment this to implement two new routes // accounts/:id/cars & accounts/:id/cars/:id2 @@ -23,6 +23,6 @@ router.route('/cars') router.route('/cars/:_id') .get(accountsCarsController.get); -*/ + module.exports = router; \ No newline at end of file From 26f8db6f9b00185f130114312ced05bd3ee48e09 Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Thu, 13 Feb 2020 13:47:42 -0500 Subject: [PATCH 04/10] update sample-node-api Signed-off-by: Nakul Manchanda --- .gitignore | 2 +- README.md | 48 +- bin/configure-2.sh | 58 +- bin/configure.sh | 52 +- bin/env.sh | 3 +- bin/start.sh | 22 +- package-lock.json | 1296 ++++++++++++-------------------------------- package.json | 14 +- 8 files changed, 482 insertions(+), 1013 deletions(-) diff --git a/.gitignore b/.gitignore index 610fc67..2c0a106 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ coverage/ node_modules/ .vscode/ output -steps.md \ No newline at end of file +dist/** diff --git a/README.md b/README.md index fa8240c..60c62f9 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ A sample node js api for finding cars and accounts for a dealership,its used her ` This sample express app, has https enabled already. +## On Local: + ### 1) Clone the repository, install node packages and verify routes locally ``` @@ -30,20 +32,56 @@ Open your local browser and try accessing Don't transfer `node_modules` folder, we can do install npm install later on remote server itself to pull down required node packages ``` -scp -r sample-node-api ibmuser@my.mainframe.com:/sample-node-api +cd sample-node-api +npm run build +scp -r dist ibmuser@my.mainframe.com:/sample-node-api ``` -### 3) Register as External Component -Append to EXTERNAL_COMPONENT /sample-node-api/bin in INSTANCE_DIR/instance.env +## On Server +### 1) login +``` +ssh ibmuser@my.mainframe.com +``` + +### 2) install dependencies +``` +cd /sample-node-api +npm install --only=prod + +``` + +### 3) Manage lifecycle of service with core zowe components + +Use property `EXTERNAL_COMPONENT` located in file `$INSTANCE_DIR/instance.env` +Append it with your service lifecycle scripts. + +In our sample it is: ``` vi INSTANCE_DIR/instance.env EXTERNAL_COMPONENTS=/sample-node-api/bin ``` -It expects folder with `start.sh`, `configure.sh` and `validate.sh`, provides lifecycle hooks to configure and start your api component with rest of zowe. + +We expect following in service folder `start.sh`, `configure.sh` and `validate.sh`. In our case its bin folder with relevant scripts. -### 4) Access newly deployed webservice behind api/v1 +`configure.sh` it adds static definition for sample-node-api to folder ${INSTANCE_DIR}/workspace/api-mediation/api-defs in IBM-850 encoding +`start.sh` starts node app on configured port +`env.sh` its custom script use to configure port for our node app, feel free to use your desired way + +### 4) Access newly deployed webservice + +Please see static definition file `sample-node-api.yml` +It configures service endpoint as `sample-node-api` with property `serviceId` +We also provide api gateway base path `api\v1` with property `gatewayUrl` in same file. + + +In effect, service can be accessed with following url: +`https://{host}:{GATEWAY_PORT}/{gatewayUrl}/{serviceId}/*` + +where `GATEWAY_PORT` is configured in $INSTANCE_DIR/instance.env + +Verify by accessing following: `https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/` `https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/1/` `https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/1/cars/` diff --git a/bin/configure-2.sh b/bin/configure-2.sh index 2061180..7eb218b 100644 --- a/bin/configure-2.sh +++ b/bin/configure-2.sh @@ -10,15 +10,55 @@ # Copyright IBM Corporation 2020 ################################################################################ -. env.sh -COMPONENT_DIR="${ROOT_DIR}/components/${MY_API_NAME}" +# Variables required on shell: +# STATIC_DEF_CONFIG_DIR=${INSTANCE_DIR}/workspace/api-mediation/api-defs +# ZOWE_EXPLORER_HOST +# MY_API_NAME +# MY_API_PORT -# copy static definition for sample-node-api to make fresh copy on every start -cp ${COMPONENT_DIR}/${MY_API_NAME}.yml ${COMPONENT_DIR}/${MY_API_NAME}.ebcidic.yml +echo 'sample-node-api configure begin' -#configure based on env.sh -sed -i 's/mymainframe.ibm.com/${ZOWE_EXPLORER_HOST}/g' ${COMPONENT_DIR}/${MY_API_NAME}.ebcidic.yml -sed -i 's/18000/${MY_API_PORT}/g' ${COMPONENT_DIR}/${MY_API_NAME}.ebcidic.yml +BASE_DIR=$(dirname "$0") +COMPONENT_DIR="$( cd "${BASE_DIR}/.." >/dev/null 2>&1 && pwd )" +cd $OLDPWD +echo "COMPONENT_DIR: ${COMPONENT_DIR}" -iconv -f IBM-1047 -t IBM-850 ${COMPONENT_DIR}/${MY_API_NAME}.ebcidic.yml > $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml -chmod 770 $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml \ No newline at end of file +echo 'load sample-node-api config' +# load config from env +. ${COMPONENT_DIR}/bin/env.sh + +echo 'make sample-node-api.ebcidic.yml with replaced env variable' + +# Add static definition for sample-node-api +cat <${STATIC_DEF_CONFIG_DIR}/${MY_API_NAME}.ebcidic.yml +# +services: + - serviceId: ${MY_API_NAME} + title: ${MY_API_NAME} + description: Example ${MY_API_NAME} Application + catalogUiTileId: ${MY_API_NAME} + instanceBaseUrls: + - https://${ZOWE_EXPLORER_HOST}:${MY_API_PORT}/ + homePageRelativeUrl: # Home page is at the same URL + routedServices: + - gatewayUrl: api/v1 # [api/ui/ws]/v{majorVersion} + serviceRelativeUrl: + apiInfo: + - apiId: com.ibm.${MY_API_NAME} + gatewayUrl: api/v1 + version: 0.0.1 + +catalogUiTiles: + ${MY_API_NAME}: + title: ${MY_API_NAME} + description: Example ${MY_API_NAME} Application +EOF + +echo 'change sample-node-api.ebcidic.yml encoding from ibm-1047 to ibm-850' + +# basically this yml file is only thing we need to do register our service with apiml +iconv -f IBM-1047 -t IBM-850 ${STATIC_DEF_CONFIG_DIR}/${MY_API_NAME}.ebcidic.yml > $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml +rm ${STATIC_DEF_CONFIG_DIR}/${MY_API_NAME}.ebcidic.yml +chmod 770 $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml + +echo 'sample-node-api configure done' \ No newline at end of file diff --git a/bin/configure.sh b/bin/configure.sh index 9104092..52d162e 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -10,34 +10,34 @@ # Copyright IBM Corporation 2020 ################################################################################ -. env.sh -COMPONENT_DIR="${ROOT_DIR}/components/${MY_API_NAME}" +# Variables required on shell: +# STATIC_DEF_CONFIG_DIR=${INSTANCE_DIR}/workspace/api-mediation/api-defs +# ZOWE_EXPLORER_HOST +# MY_API_NAME +# MY_API_PORT +echo 'sample-node-api configure begin' -# Add static definition for sample-node-api -cat <${STATIC_DEF_CONFIG_DIR}/${MY_API_NAME}.ebcidic.yml -# -services: - - serviceId: ${MY_API_NAME} - title: ${MY_API_NAME} - description: Example ${MY_API_NAME} Application - catalogUiTileId: ${MY_API_NAME} - instanceBaseUrls: - - https://${ZOWE_EXPLORER_HOST}:${MY_API_PORT}/ - homePageRelativeUrl: # Home page is at the same URL - routedServices: - - gatewayUrl: api/v1 # [api/ui/ws]/v{majorVersion} - serviceRelativeUrl: - apiInfo: - - apiId: com.ibm.${MY_API_NAME} - gatewayUrl: api/v1 - version: 0.0.1 +BASE_DIR=$(dirname "$0") +COMPONENT_DIR="$( cd "${BASE_DIR}/.." >/dev/null 2>&1 && pwd )" +cd $OLDPWD +echo "COMPONENT_DIR: ${COMPONENT_DIR}" -catalogUiTiles: - ${MY_API_NAME}: - title: ${MY_API_NAME} - description: Example ${MY_API_NAME} Application -EOF +# load config from env +echo 'load sample-node-api config' +. ${COMPONENT_DIR}/bin/env.sh + +echo 'Add static definition for sample-node-api' +#configure based on env.sh +sed -e "s/mymainframe.ibm.com/${ZOWE_EXPLORER_HOST}/g" \ + -e "s/18000/${MY_API_PORT}/g" \ + ${COMPONENT_DIR}/${MY_API_NAME}.yml \ + > ${STATIC_DEF_CONFIG_DIR}/${MY_API_NAME}.ebcidic.yml + +echo 'change sample-node-api.ebcidic.yml encoding from ibm-1047 to ibm-850' +# basically this yml file is only thing we need to do register our service with apiml iconv -f IBM-1047 -t IBM-850 ${STATIC_DEF_CONFIG_DIR}/${MY_API_NAME}.ebcidic.yml > $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml rm ${STATIC_DEF_CONFIG_DIR}/${MY_API_NAME}.ebcidic.yml -chmod 770 $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml \ No newline at end of file +chmod 770 $STATIC_DEF_CONFIG_DIR/${MY_API_NAME}.yml + +echo 'sample-node-api configure done' diff --git a/bin/env.sh b/bin/env.sh index 9820a61..c9abfef 100644 --- a/bin/env.sh +++ b/bin/env.sh @@ -1,3 +1,2 @@ MY_API_NAME='sample-node-api' -MY_API_PORT='18000' - +MY_API_PORT='18000' \ No newline at end of file diff --git a/bin/start.sh b/bin/start.sh index 5159868..71a8bb7 100644 --- a/bin/start.sh +++ b/bin/start.sh @@ -10,19 +10,35 @@ # Copyright IBM Corporation 2020 ################################################################################ +# Variables required on shell: +# NODE_HOME +# MY_API_NAME +# MY_API_PORT +# KEYSTORE_KEY +# KEYSTORE_CERTIFICATE + +echo 'sample-node-api start begin' # find node bin NODE_BIN=${NODE_HOME}/bin/node #load component config -. env.sh +BASE_DIR=$(dirname "$0") +COMPONENT_DIR="$( cd "${BASE_DIR}/.." >/dev/null 2>&1 && pwd )" +cd $OLDPWD +echo "COMPONENT_DIR: ${COMPONENT_DIR}" -COMPONENT_DIR="${ROOT_DIR}/components/${MY_API_NAME}" +# load config from env +echo 'load sample-node-api config' +. ${COMPONENT_DIR}/bin/env.sh +echo "start sample-node-api app on port ${MY_API_PORT}" #start component $NODE_BIN $COMPONENT_DIR/server/app.js \ --service ${MY_API_NAME} \ --port ${MY_API_PORT} \ --key ${KEYSTORE_KEY} \ --cert ${KEYSTORE_CERTIFICATE} \ - -v & \ No newline at end of file + -v & + +echo 'sample-node-api start done' diff --git a/package-lock.json b/package-lock.json index 0d04218..55bb6e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,25 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@babel/polyfill": { - "version": "7.8.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/@babel/polyfill/-/polyfill-7.8.3.tgz", - "integrity": "sha1-IzP8IUSlQqfAfaOVAs7us6vk3r0=", - "requires": { - "core-js": "^2.6.5", - "regenerator-runtime": "^0.13.2" - } - }, - "@types/color-name": { - "version": "1.1.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha1-HBJhu+qhCoBVu8XYq4S3sq/IRqA=" - }, - "abbrev": { - "version": "1.0.9", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=" - }, "accepts": { "version": "1.3.7", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/accepts/-/accepts-1.3.7.tgz", @@ -32,92 +13,21 @@ "negotiator": "0.6.2" } }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "optional": true - }, "ansi-regex": { "version": "3.0.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha1-kK51xCTQCNJiTFvynq0xd+v881k=", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "any-promise": { - "version": "1.3.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", - "requires": { - "sprintf-js": "~1.0.2" - } - }, "array-flatten": { "version": "1.1.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, - "assert": { - "version": "1.5.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/assert/-/assert-1.5.0.tgz", - "integrity": "sha1-VcEJqvbgrv2z3EtxJAxwv1dLGOs=", - "requires": { - "object-assign": "^4.1.1", - "util": "0.10.3" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "assertion-error-formatter": { - "version": "2.0.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/assertion-error-formatter/-/assertion-error-formatter-2.0.1.tgz", - "integrity": "sha1-a73/rsji+p4rDrFYv+NTEy18Cps=", - "requires": { - "diff": "^3.0.0", - "pad-right": "^0.2.2", - "repeat-string": "^1.6.1" - } - }, - "async": { - "version": "1.5.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, "balanced-match": { "version": "1.0.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "becke-ch--regex--s0-0-v1--base--pl--lib": { - "version": "1.4.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz", - "integrity": "sha1-Qpzuu/pffpNueNc/vcfacWKyDiA=" - }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28=" + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true }, "body-parser": { "version": "1.19.0", @@ -140,6 +50,7 @@ "version": "1.1.11", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", + "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -151,100 +62,63 @@ "integrity": "sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY=" }, "camelcase": { - "version": "5.3.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=" - }, - "cli-table3": { - "version": "0.5.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cli-table3/-/cli-table3-0.5.1.tgz", - "integrity": "sha1-AlI3LZTfxA29jfBgBfSPMfZW8gI=", - "requires": { - "colors": "^1.1.2", - "object-assign": "^4.1.0", - "string-width": "^2.1.1" - } + "version": "4.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" }, "cliui": { - "version": "6.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha1-UR1wLAxOQcoVbX0OlgIfI+EyJbE=", + "version": "3.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=" + "version": "2.1.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=" + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } }, "string-width": { - "version": "4.2.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha1-lSGCxGzHssMT0VluYjmSvRY7crU=", + "version": "1.0.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=", + "version": "3.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^2.0.0" } } } }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=" - }, - "colors": { - "version": "1.4.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/colors/-/colors-1.4.0.tgz", - "integrity": "sha1-xQSRR51MG9rtLJztMs98fcI2D3g=" - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "commander": { - "version": "2.20.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/commander/-/commander-2.20.3.tgz", - "integrity": "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM=" - }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=" + "code-point-at": { + "version": "1.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "concat-map": { "version": "0.0.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true }, "content-disposition": { "version": "0.5.3", @@ -269,21 +143,6 @@ "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, - "cookiejar": { - "version": "2.1.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha1-3YojVTB1L5iPmghE8/xYnjERElw=" - }, - "core-js": { - "version": "2.6.11", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha1-OIMUafmSK97Y7iHJ3EaYXgOZMIw=" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, "cors": { "version": "2.8.5", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cors/-/cors-2.8.5.tgz", @@ -293,76 +152,6 @@ "vary": "^1" } }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "cucumber": { - "version": "5.1.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cucumber/-/cucumber-5.1.0.tgz", - "integrity": "sha1-exZoEsJVvsfqxLDfcAekDQiciV0=", - "requires": { - "@babel/polyfill": "^7.2.3", - "assertion-error-formatter": "^2.0.1", - "bluebird": "^3.4.1", - "cli-table3": "^0.5.1", - "colors": "^1.1.2", - "commander": "^2.9.0", - "cross-spawn": "^6.0.5", - "cucumber-expressions": "^6.0.0", - "cucumber-tag-expressions": "^1.1.1", - "duration": "^0.2.1", - "escape-string-regexp": "^1.0.5", - "figures": "2.0.0", - "gherkin": "^5.0.0", - "glob": "^7.1.3", - "indent-string": "^3.1.0", - "is-generator": "^1.0.2", - "is-stream": "^1.1.0", - "knuth-shuffle-seeded": "^1.0.6", - "lodash": "^4.17.10", - "mz": "^2.4.0", - "progress": "^2.0.0", - "resolve": "^1.3.3", - "serialize-error": "^3.0.0", - "stack-chain": "^2.0.0", - "stacktrace-js": "^2.0.0", - "string-argv": "0.1.1", - "title-case": "^2.1.1", - "util-arity": "^1.0.2", - "verror": "^1.9.0" - } - }, - "cucumber-expressions": { - "version": "6.6.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cucumber-expressions/-/cucumber-expressions-6.6.2.tgz", - "integrity": "sha1-2JZA7Mxyp4OAtsIQ6uNqZOdGK4E=", - "requires": { - "becke-ch--regex--s0-0-v1--base--pl--lib": "^1.2.0" - } - }, - "cucumber-tag-expressions": { - "version": "1.1.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cucumber-tag-expressions/-/cucumber-tag-expressions-1.1.1.tgz", - "integrity": "sha1-f1x7cACbwrZmWRv+ZIVFeL7e6Fo=" - }, - "d": { - "version": "1.0.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/d/-/d-1.0.1.tgz", - "integrity": "sha1-hpgJU3LVjb7jRv/Qxwk/mfj561o=", - "requires": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, "debug": { "version": "2.6.9", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/debug/-/debug-2.6.9.tgz", @@ -376,16 +165,6 @@ "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, "depd": { "version": "1.1.2", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/depd/-/depd-1.1.2.tgz", @@ -396,70 +175,22 @@ "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, - "diff": { - "version": "3.5.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/diff/-/diff-3.5.0.tgz", - "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI=" - }, - "duration": { - "version": "0.2.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/duration/-/duration-0.2.2.tgz", - "integrity": "sha1-3fFJvDvGkBFQ/pAXER0BazNX9Sk=", - "requires": { - "d": "1", - "es5-ext": "~0.10.46" - } - }, "ee-first": { "version": "1.1.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc=" - }, "encodeurl": { "version": "1.0.2", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, - "error-stack-parser": { - "version": "2.0.6", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/error-stack-parser/-/error-stack-parser-2.0.6.tgz", - "integrity": "sha1-WpmnB716TFinl5AtSNgoA+3mqtg=", + "error-ex": { + "version": "1.3.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=", "requires": { - "stackframe": "^1.1.1" - } - }, - "es5-ext": { - "version": "0.10.53", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/es5-ext/-/es5-ext-0.10.53.tgz", - "integrity": "sha1-k8WjrP2+8nUiCtcmRK0C7hg2jeE=", - "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.3", - "next-tick": "~1.0.0" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-symbol": { - "version": "3.1.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha1-utXTwbzawoJp9MszHkMceKxwXRg=", - "requires": { - "d": "^1.0.1", - "ext": "^1.1.2" + "is-arrayish": "^0.2.1" } }, "escape-html": { @@ -467,54 +198,37 @@ "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - }, - "escodegen": { - "version": "1.8.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", - "requires": { - "esprima": "^2.7.1", - "estraverse": "^1.9.1", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.2.0" - }, - "dependencies": { - "source-map": { - "version": "0.2.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "optional": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" - }, - "estraverse": { - "version": "1.9.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=" - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=" - }, "etag": { "version": "1.8.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/etag/-/etag-1.8.1.tgz", "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, + "execa": { + "version": "0.7.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "express": { "version": "4.17.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/express/-/express-4.17.1.tgz", @@ -552,44 +266,6 @@ "vary": "~1.1.2" } }, - "ext": { - "version": "1.4.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ext/-/ext-1.4.0.tgz", - "integrity": "sha1-ia56BxWPedNVF4gpBDJAd+Q3kkQ=", - "requires": { - "type": "^2.0.0" - }, - "dependencies": { - "type": { - "version": "2.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/type/-/type-2.0.0.tgz", - "integrity": "sha1-Xxb/bvLrRPJgSU2uJxAzspwJqcM=" - } - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/extend/-/extend-3.0.2.tgz", - "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=" - }, - "extsprintf": { - "version": "1.4.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/extsprintf/-/extsprintf-1.4.0.tgz", - "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=" - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" - }, - "figures": { - "version": "2.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, "finalhandler": { "version": "1.1.2", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/finalhandler/-/finalhandler-1.1.2.tgz", @@ -605,29 +281,13 @@ } }, "find-up": { - "version": "4.1.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk=", + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "locate-path": "^2.0.0" } }, - "form-data": { - "version": "2.5.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/form-data/-/form-data-2.5.1.tgz", - "integrity": "sha1-8svsV7XlniNxbhKP5E1OXdI4lfQ=", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, - "formidable": { - "version": "1.2.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/formidable/-/formidable-1.2.1.tgz", - "integrity": "sha1-cPt8oCkO5v+WEJBBX0s989IIJlk=" - }, "forwarded": { "version": "0.1.2", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/forwarded/-/forwarded-0.1.2.tgz", @@ -641,22 +301,24 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true }, "get-caller-file": { - "version": "2.0.5", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34=" + "version": "1.0.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o=" }, - "gherkin": { - "version": "5.1.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/gherkin/-/gherkin-5.1.0.tgz", - "integrity": "sha1-aEu7A63STq9731RPWAM+so+zxtU=" + "get-stream": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" }, "glob": { "version": "7.1.6", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/glob/-/glob-7.1.6.tgz", "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=", + "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -666,28 +328,15 @@ "path-is-absolute": "^1.0.0" } }, - "handlebars": { - "version": "4.7.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/handlebars/-/handlebars-4.7.3.tgz", - "integrity": "sha1-js4nl4Johs+AgtFyb/IdKgIlUO4=", - "requires": { - "neo-async": "^2.6.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=" - } - } + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha1-ShL/G2A3bvCYYsIJPt2Qgyi+hCM=" }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + "hosted-git-info": { + "version": "2.8.5", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/hosted-git-info/-/hosted-git-info-2.8.5.tgz", + "integrity": "sha1-dZz88sTRVq3lmwst+r3cQqa5xww=" }, "http-errors": { "version": "1.7.2", @@ -716,15 +365,11 @@ "safer-buffer": ">= 2.1.2 < 3" } }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=" - }, "inflight": { "version": "1.0.6", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -733,134 +378,89 @@ "inherits": { "version": "2.0.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" }, "ipaddr.js": { "version": "1.9.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ipaddr.js/-/ipaddr.js-1.9.0.tgz", "integrity": "sha1-N9905DCg5HVQ/lSi3v4w2KzZX2U=" }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, - "is-generator": { - "version": "1.0.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-generator/-/is-generator-1.0.3.tgz", - "integrity": "sha1-wUwhBX7TbjKNuANHlmxpP4hjifM=" - }, "is-stream": { "version": "1.1.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, - "isarray": { - "version": "1.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, "isexe": { "version": "2.0.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/isexe/-/isexe-2.0.0.tgz", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, - "istanbul": { - "version": "0.4.5", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/istanbul/-/istanbul-0.4.5.tgz", - "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", + "lcid": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "requires": { - "abbrev": "1.0.x", - "async": "1.x", - "escodegen": "1.8.x", - "esprima": "2.7.x", - "glob": "^5.0.15", - "handlebars": "^4.0.1", - "js-yaml": "3.x", - "mkdirp": "0.5.x", - "nopt": "3.x", - "once": "1.x", - "resolve": "1.1.x", - "supports-color": "^3.1.0", - "which": "^1.1.1", - "wordwrap": "^1.0.0" - }, - "dependencies": { - "glob": { - "version": "5.0.15", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "resolve": { - "version": "1.1.7", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=" - } + "invert-kv": "^1.0.0" } }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc=", + "load-json-file": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "dependencies": { - "esprima": { - "version": "4.0.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=" - } - } - }, - "knuth-shuffle-seeded": { - "version": "1.0.6", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/knuth-shuffle-seeded/-/knuth-shuffle-seeded-1.0.6.tgz", - "integrity": "sha1-AfG2VzOqdUDuCNiwF0Fk0iCB5OE=", - "requires": { - "seed-random": "~2.2.0" - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" } }, "locate-path": { - "version": "5.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha1-Gvujlq/WdqbUJQTQpno6frn2KqA=", + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "requires": { - "p-locate": "^4.1.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" } }, - "lodash": { - "version": "4.17.15", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=" - }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" + "lru-cache": { + "version": "4.1.5", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } }, "media-typer": { "version": "0.3.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, + "mem": { + "version": "1.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "requires": { + "mimic-fn": "^1.0.0" + } + }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -889,91 +489,66 @@ "mime-db": "1.43.0" } }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=" + }, "minimatch": { "version": "3.0.4", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, "requires": { "brace-expansion": "^1.1.7" } }, - "minimist": { - "version": "0.0.10", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" - }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - } - } + "version": "1.0.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/mkdirp/-/mkdirp-1.0.3.tgz", + "integrity": "sha1-TPLjCtRZWd3epTrZfVGLbIIF4eo=", + "dev": true }, "ms": { "version": "2.0.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, - "mz": { - "version": "2.7.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/mz/-/mz-2.7.0.tgz", - "integrity": "sha1-lQCAV6Vsr63CvGPd5/n/aVWUjjI=", - "requires": { - "any-promise": "^1.0.0", - "object-assign": "^4.0.1", - "thenify-all": "^1.0.0" - } - }, "negotiator": { "version": "0.6.2", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs=" }, - "neo-async": { - "version": "2.6.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=" - }, - "next-tick": { - "version": "1.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" - }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=" - }, - "no-case": { - "version": "2.3.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", - "requires": { - "lower-case": "^1.1.1" - } - }, "node-fetch": { "version": "2.6.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha1-5jNFY4bUqlWGP2dqerDaqP3ssP0=", "dev": true }, - "nopt": { - "version": "3.0.6", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=", "requires": { - "abbrev": "1" + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "^2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, "object-assign": { "version": "4.1.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/object-assign/-/object-assign-4.1.1.tgz", @@ -991,66 +566,53 @@ "version": "1.4.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, "requires": { "wrappy": "1" } }, - "optimist": { - "version": "0.6.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "os-locale": { + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=", "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" - } + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, - "optionator": { - "version": "0.8.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha1-hPodA2/p08fiHZmIS2ARZ+yPtJU=", - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - } + "p-finally": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "p-limit": { - "version": "2.2.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/p-limit/-/p-limit-2.2.2.tgz", - "integrity": "sha1-YSebZ3IfUoeqHBOpp/u8SMkpGx4=", + "version": "1.3.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg=", "requires": { - "p-try": "^2.0.0" + "p-try": "^1.0.0" } }, "p-locate": { - "version": "4.1.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha1-o0KLtwiLOmApL2aRkni3wpetTwc=", + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "requires": { - "p-limit": "^2.2.0" + "p-limit": "^1.1.0" } }, "p-try": { - "version": "2.2.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY=" + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" }, - "pad-right": { - "version": "0.2.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/pad-right/-/pad-right-0.2.2.tgz", - "integrity": "sha1-b7ySQEXSRPKiokRQMGDTv8YAl3Q=", + "parse-json": { + "version": "2.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "requires": { - "repeat-string": "^1.5.2" + "error-ex": "^1.2.0" } }, "parseurl": { @@ -1059,14 +621,15 @@ "integrity": "sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ=" }, "path-exists": { - "version": "4.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha1-UTvb4tO5XXdi6METfvoZXGxhtbM=" + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true }, "path-key": { "version": "2.0.1", @@ -1083,20 +646,18 @@ "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" + "path-type": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "requires": { + "pify": "^2.0.0" + } }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=" - }, - "progress": { - "version": "2.0.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/progress/-/progress-2.0.3.tgz", - "integrity": "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg=" + "pify": { + "version": "2.3.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" }, "proxy-addr": { "version": "2.0.5", @@ -1107,6 +668,11 @@ "ipaddr.js": "1.9.0" } }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + }, "qs": { "version": "6.7.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/qs/-/qs-6.7.0.tgz", @@ -1128,36 +694,24 @@ "unpipe": "1.0.0" } }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c=", + "read-pkg": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "inherits": { - "version": "2.0.4", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=" - } + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" } }, - "regenerator-runtime": { - "version": "0.13.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", - "integrity": "sha1-fPanfY9cb2Drc8X8GVWyzrAea/U=" - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" + } }, "require-directory": { "version": "2.1.1", @@ -1165,9 +719,9 @@ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-main-filename": { - "version": "2.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs=" + "version": "1.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, "resolve": { "version": "1.15.1", @@ -1177,6 +731,15 @@ "path-parse": "^1.0.6" } }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho=", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1187,11 +750,6 @@ "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" }, - "seed-random": { - "version": "2.2.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/seed-random/-/seed-random-2.2.0.tgz", - "integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ=" - }, "semver": { "version": "5.7.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/semver/-/semver-5.7.1.tgz", @@ -1224,11 +782,6 @@ } } }, - "serialize-error": { - "version": "3.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/serialize-error/-/serialize-error-3.0.0.tgz", - "integrity": "sha1-gBACgrCb4zxhFTb1ADNIHLnMh88=" - }, "serve-static": { "version": "1.14.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/serve-static/-/serve-static-1.14.1.tgz", @@ -1263,63 +816,44 @@ "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/shebang-regex/-/shebang-regex-1.0.0.tgz", "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, - "source-map": { - "version": "0.5.6", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" + "signal-exit": { + "version": "3.0.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" - }, - "stack-chain": { - "version": "2.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/stack-chain/-/stack-chain-2.0.0.tgz", - "integrity": "sha1-1z0Rcq+JVl8HQ4tbzAhoMbZomy0=" - }, - "stack-generator": { - "version": "2.0.5", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/stack-generator/-/stack-generator-2.0.5.tgz", - "integrity": "sha1-+wDltO6X3mA+B3PqeM6UTYFZbDY=", + "spdx-correct": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/spdx-correct/-/spdx-correct-3.1.0.tgz", + "integrity": "sha1-+4PlBERSaPFUsHTiGMh8ADzTHfQ=", "requires": { - "stackframe": "^1.1.1" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, - "stackframe": { - "version": "1.1.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/stackframe/-/stackframe-1.1.1.tgz", - "integrity": "sha1-/+8KMxixtgw7WFZJiaylZgcp7HE=" + "spdx-exceptions": { + "version": "2.2.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", + "integrity": "sha1-LqRQrudPKom/uUUZwH/Nb0EyKXc=" }, - "stacktrace-gps": { - "version": "3.0.4", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/stacktrace-gps/-/stacktrace-gps-3.0.4.tgz", - "integrity": "sha1-dojcL8Cf+zoTFl6+DbyvQbzwxpo=", + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=", "requires": { - "source-map": "0.5.6", - "stackframe": "^1.1.1" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, - "stacktrace-js": { - "version": "2.0.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/stacktrace-js/-/stacktrace-js-2.0.2.tgz", - "integrity": "sha1-TKk+qfSUdS1VcJoIHUAP2uvuiXs=", - "requires": { - "error-stack-parser": "^2.0.6", - "stack-generator": "^2.0.5", - "stacktrace-gps": "^3.0.4" - } + "spdx-license-ids": { + "version": "3.0.5", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha1-NpS1gEVnpFjTyARYQqY1hjL2JlQ=" }, "statuses": { "version": "1.5.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, - "string-argv": { - "version": "0.1.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-argv/-/string-argv-0.1.1.tgz", - "integrity": "sha1-Zr1a44I3COqhkW+lQScDFQ1N368=" - }, "string-width": { "version": "2.1.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-width/-/string-width-2.1.1.tgz", @@ -1329,14 +863,6 @@ "strip-ansi": "^4.0.0" } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", - "requires": { - "safe-buffer": "~5.1.0" - } - }, "strip-ansi": { "version": "4.0.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -1345,98 +871,21 @@ "ansi-regex": "^3.0.0" } }, - "superagent": { - "version": "3.8.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/superagent/-/superagent-3.8.3.tgz", - "integrity": "sha1-Rg6g29t9WxG8T3jeulZfhqF44Sg=", - "requires": { - "component-emitter": "^1.2.0", - "cookiejar": "^2.1.0", - "debug": "^3.1.0", - "extend": "^3.0.0", - "form-data": "^2.3.1", - "formidable": "^1.2.0", - "methods": "^1.1.1", - "mime": "^1.4.1", - "qs": "^6.5.1", - "readable-stream": "^2.3.5" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/debug/-/debug-3.2.6.tgz", - "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ms/-/ms-2.1.2.tgz", - "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=" - } - } + "strip-bom": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" }, - "supertest": { - "version": "3.4.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/supertest/-/supertest-3.4.2.tgz", - "integrity": "sha1-utfeLkPWDSfIyuuKs0pnyKX3Gq0=", - "requires": { - "methods": "^1.1.2", - "superagent": "^3.8.3" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "requires": { - "has-flag": "^1.0.0" - } - }, - "thenify": { - "version": "3.3.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/thenify/-/thenify-3.3.0.tgz", - "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=", - "requires": { - "any-promise": "^1.0.0" - } - }, - "thenify-all": { - "version": "1.6.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", - "requires": { - "thenify": ">= 3.1.0 < 4" - } - }, - "title-case": { - "version": "2.1.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/title-case/-/title-case-2.1.1.tgz", - "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=", - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.0.3" - } + "strip-eof": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, "toidentifier": { "version": "1.0.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/toidentifier/-/toidentifier-1.0.0.tgz", "integrity": "sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM=" }, - "type": { - "version": "1.2.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/type/-/type-1.2.0.tgz", - "integrity": "sha1-hI3XaY2vo+VKbEeedZxLw/GIR6A=" - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "requires": { - "prelude-ls": "~1.1.2" - } - }, "type-is": { "version": "1.6.18", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/type-is/-/type-is-1.6.18.tgz", @@ -1446,72 +895,30 @@ "mime-types": "~2.1.24" } }, - "uglify-js": { - "version": "3.7.7", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/uglify-js/-/uglify-js-3.7.7.tgz", - "integrity": "sha1-IeUsfczagKU7983mliin5RGuyck=", - "optional": true, - "requires": { - "commander": "~2.20.3", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", - "optional": true - } - } - }, "unpipe": { "version": "1.0.0", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" - }, - "util": { - "version": "0.10.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "requires": { - "inherits": "2.0.1" - } - }, - "util-arity": { - "version": "1.1.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/util-arity/-/util-arity-1.1.0.tgz", - "integrity": "sha1-WdAa8f2z/t4KxOYysKtfbOl8kzA=" - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, "utils-merge": { "version": "1.0.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha1-/JH2uce6FchX9MssXe/uw51PQQo=", + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, "vary": { "version": "1.1.2", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, - "verror": { - "version": "1.10.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, "which": { "version": "1.3.1", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/which/-/which-1.3.1.tgz", @@ -1525,52 +932,44 @@ "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha1-YQY29rH3A4kb00dxzLF/uTtHB5w=" - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" - }, "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha1-6Tk7oHEC5skaOyIUePAlfNKFblM=", + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=" + "version": "2.1.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=" + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } }, "string-width": { - "version": "4.2.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha1-lSGCxGzHssMT0VluYjmSvRY7crU=", + "version": "1.0.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=", + "version": "3.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^2.0.0" } } } @@ -1578,68 +977,45 @@ "wrappy": { "version": "1.0.2", "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true }, "y18n": { - "version": "4.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms=" + "version": "3.2.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, "yargs": { - "version": "15.1.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/yargs/-/yargs-15.1.0.tgz", - "integrity": "sha1-4RE4H1gw6GOolVC9SxNrtqXzchk=", + "version": "8.0.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/yargs/-/yargs-8.0.2.tgz", + "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", + "camelcase": "^4.1.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "read-pkg-up": "^2.0.0", "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", + "require-main-filename": "^1.0.1", "set-blocking": "^2.0.0", - "string-width": "^4.2.0", + "string-width": "^2.0.0", "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^16.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=" - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha1-lSGCxGzHssMT0VluYjmSvRY7crU=", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=", - "requires": { - "ansi-regex": "^5.0.0" - } - } + "y18n": "^3.2.1", + "yargs-parser": "^7.0.0" } }, "yargs-parser": { - "version": "16.1.0", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/yargs-parser/-/yargs-parser-16.1.0.tgz", - "integrity": "sha1-c3R9U64YfnuNvjM/lXFMduoA7PE=", + "version": "7.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/yargs-parser/-/yargs-parser-7.0.0.tgz", + "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "camelcase": "^4.1.0" } } } diff --git a/package.json b/package.json index ec3906d..1d5569a 100644 --- a/package.json +++ b/package.json @@ -4,20 +4,20 @@ "description": "", "main": "index.js", "scripts": { - "start": "node server/app.js" + "start": "node server/app.js", + "build": "npm run clean && cp -r server dist/server && cp -r bin dist/bin && cp *.yml dist && cp *.json dist && cp *.js dist && rimraf dist/package-lock.json", + "clean": "rimraf dist && mkdirp dist" }, "author": "", "license": "ISC", "dependencies": { - "assert": "^1.4.1", "cors": "^2.8.5", - "cucumber": "^5.1.0", "express": "^4.16.4", - "istanbul": "^0.4.5", - "supertest": "^3.4.2", - "yargs": "^15.1.0" + "yargs": "^8.0.2" }, "devDependencies": { - "node-fetch": "^2.3.0" + "mkdirp": "^1.0.3", + "node-fetch": "^2.3.0", + "rimraf": "^3.0.2" } } From ad4f292d5ef5babc13253680ec8fb713b35cdcce Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Thu, 13 Feb 2020 14:19:54 -0500 Subject: [PATCH 05/10] using i to get path of LAUNCH_COMPONENT Signed-off-by: Nakul Manchanda --- bin/configure-2.sh | 5 +++-- bin/configure.sh | 5 +++-- bin/start.sh | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bin/configure-2.sh b/bin/configure-2.sh index 7eb218b..9a484e9 100644 --- a/bin/configure-2.sh +++ b/bin/configure-2.sh @@ -18,8 +18,9 @@ echo 'sample-node-api configure begin' -BASE_DIR=$(dirname "$0") -COMPONENT_DIR="$( cd "${BASE_DIR}/.." >/dev/null 2>&1 && pwd )" +echo "LAUNCH_COMPONENT: ${i} " +BASE_DIR=$(dirname "${i}") +COMPONENT_DIR="$( cd "${BASE_DIR}" >/dev/null 2>&1 && pwd )" cd $OLDPWD echo "COMPONENT_DIR: ${COMPONENT_DIR}" diff --git a/bin/configure.sh b/bin/configure.sh index 52d162e..6f41213 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -18,8 +18,9 @@ echo 'sample-node-api configure begin' -BASE_DIR=$(dirname "$0") -COMPONENT_DIR="$( cd "${BASE_DIR}/.." >/dev/null 2>&1 && pwd )" +echo "LAUNCH_COMPONENT: ${i} " +BASE_DIR=$(dirname "${i}") +COMPONENT_DIR="$( cd "${BASE_DIR}" >/dev/null 2>&1 && pwd )" cd $OLDPWD echo "COMPONENT_DIR: ${COMPONENT_DIR}" diff --git a/bin/start.sh b/bin/start.sh index 71a8bb7..99520c7 100644 --- a/bin/start.sh +++ b/bin/start.sh @@ -22,9 +22,9 @@ echo 'sample-node-api start begin' # find node bin NODE_BIN=${NODE_HOME}/bin/node -#load component config -BASE_DIR=$(dirname "$0") -COMPONENT_DIR="$( cd "${BASE_DIR}/.." >/dev/null 2>&1 && pwd )" +echo "LAUNCH_COMPONENT: ${i} " +BASE_DIR=$(dirname "${i}") +COMPONENT_DIR="$( cd "${BASE_DIR}" >/dev/null 2>&1 && pwd )" cd $OLDPWD echo "COMPONENT_DIR: ${COMPONENT_DIR}" From 9e666a5456caf3c8bd37f608d401ec19a022e572 Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Thu, 13 Feb 2020 14:23:50 -0500 Subject: [PATCH 06/10] add empty dist directory Signed-off-by: Nakul Manchanda --- .gitignore | 1 + README.md | 50 +++++++++++++++++++++++++------------------------- dist/.keep | 0 3 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 dist/.keep diff --git a/.gitignore b/.gitignore index 2c0a106..fcb912f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules/ .vscode/ output dist/** +!dist/.keep diff --git a/README.md b/README.md index 60c62f9..6b98074 100644 --- a/README.md +++ b/README.md @@ -40,48 +40,48 @@ scp -r dist ibmuser@my.mainframe.com:/sample-node-api ## On Server ### 1) login -``` -ssh ibmuser@my.mainframe.com +``` +ssh ibmuser@my.mainframe.com ``` -### 2) install dependencies +### 2) install dependencies ``` -cd /sample-node-api -npm install --only=prod +cd /sample-node-api +npm install --only=prod ``` ### 3) Manage lifecycle of service with core zowe components -Use property `EXTERNAL_COMPONENT` located in file `$INSTANCE_DIR/instance.env` -Append it with your service lifecycle scripts. +Use property `EXTERNAL_COMPONENT` located in file `$INSTANCE_DIR/instance.env` +Append it with your service lifecycle scripts. -In our sample it is: +In our sample it is: ``` - vi INSTANCE_DIR/instance.env - EXTERNAL_COMPONENTS=/sample-node-api/bin + vi INSTANCE_DIR/instance.env + EXTERNAL_COMPONENTS=/sample-node-api/bin ``` We expect following in service folder `start.sh`, `configure.sh` and `validate.sh`. -In our case its bin folder with relevant scripts. - -`configure.sh` it adds static definition for sample-node-api to folder ${INSTANCE_DIR}/workspace/api-mediation/api-defs in IBM-850 encoding -`start.sh` starts node app on configured port -`env.sh` its custom script use to configure port for our node app, feel free to use your desired way +In our case its bin folder with relevant scripts. + +`configure.sh` it adds static definition for sample-node-api to folder ${INSTANCE_DIR}/workspace/api-mediation/api-defs in IBM-850 encoding +`start.sh` starts node app on configured port +`env.sh` its custom script use to configure port for our node app, feel free to use your desired way ### 4) Access newly deployed webservice -Please see static definition file `sample-node-api.yml` -It configures service endpoint as `sample-node-api` with property `serviceId` -We also provide api gateway base path `api\v1` with property `gatewayUrl` in same file. +Please see static definition file `sample-node-api.yml` +It configures service endpoint as `sample-node-api` with property `serviceId` +We also provide api gateway base path `api\v1` with property `gatewayUrl` in same file. -In effect, service can be accessed with following url: -`https://{host}:{GATEWAY_PORT}/{gatewayUrl}/{serviceId}/*` +In effect, service can be accessed with following url: +`https://{host}:{GATEWAY_PORT}/{gatewayUrl}/{serviceId}/*` -where `GATEWAY_PORT` is configured in $INSTANCE_DIR/instance.env +where `GATEWAY_PORT` is configured in $INSTANCE_DIR/instance.env -Verify by accessing following: -`https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/` -`https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/1/` -`https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/1/cars/` +Verify by accessing following: +`https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/` +`https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/1/` +`https://my.mainframe.com:7554/api/v1/sample-node-api/accounts/1/cars/` diff --git a/dist/.keep b/dist/.keep new file mode 100644 index 0000000..e69de29 From f8bfd3f2b58b85fb4784521f440f1a6a89b0d1ff Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Thu, 13 Feb 2020 14:57:07 -0500 Subject: [PATCH 07/10] updated readme section header Signed-off-by: Nakul Manchanda --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6b98074..d9fca73 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A sample node js api for finding cars and accounts for a dealership,its used her ` This sample express app, has https enabled already. -## On Local: +## PART I: Download & Build on local ### 1) Clone the repository, install node packages and verify routes locally @@ -37,7 +37,7 @@ npm run build scp -r dist ibmuser@my.mainframe.com:/sample-node-api ``` -## On Server +## PART II: Deploy with Zowe on server ### 1) login ``` From f2a549b68d29ad498d15c347930a41a731187e65 Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Thu, 13 Feb 2020 16:37:09 -0500 Subject: [PATCH 08/10] removed dist keep Signed-off-by: Nakul Manchanda --- dist/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 dist/.keep diff --git a/dist/.keep b/dist/.keep deleted file mode 100644 index e69de29..0000000 From 523224bb921c16f7545d07ff860da0e206f48533 Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Fri, 14 Feb 2020 11:07:44 -0500 Subject: [PATCH 09/10] adjust gitignore Signed-off-by: Nakul Manchanda Signed-off-by: Nakul Manchanda --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fcb912f..5155ab9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,4 @@ coverage/ node_modules/ .vscode/ output -dist/** -!dist/.keep +dist \ No newline at end of file From 66742ce7c8720650f8b88e33eae22ffb0744c73f Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Thu, 20 Feb 2020 00:17:42 -0500 Subject: [PATCH 10/10] change LAUNCH_COMPONENT variable Signed-off-by: Nakul Manchanda --- bin/configure-2.sh | 6 ++---- bin/configure.sh | 6 ++---- bin/start.sh | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/bin/configure-2.sh b/bin/configure-2.sh index 9a484e9..bd1cfbf 100644 --- a/bin/configure-2.sh +++ b/bin/configure-2.sh @@ -18,10 +18,8 @@ echo 'sample-node-api configure begin' -echo "LAUNCH_COMPONENT: ${i} " -BASE_DIR=$(dirname "${i}") -COMPONENT_DIR="$( cd "${BASE_DIR}" >/dev/null 2>&1 && pwd )" -cd $OLDPWD +echo "LAUNCH_COMPONENT: ${LAUNCH_COMPONENT} " +COMPONENT_DIR=$(dirname "${LAUNCH_COMPONENT}") echo "COMPONENT_DIR: ${COMPONENT_DIR}" echo 'load sample-node-api config' diff --git a/bin/configure.sh b/bin/configure.sh index 6f41213..ae8d456 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -18,10 +18,8 @@ echo 'sample-node-api configure begin' -echo "LAUNCH_COMPONENT: ${i} " -BASE_DIR=$(dirname "${i}") -COMPONENT_DIR="$( cd "${BASE_DIR}" >/dev/null 2>&1 && pwd )" -cd $OLDPWD +echo "LAUNCH_COMPONENT: ${LAUNCH_COMPONENT} " +COMPONENT_DIR=$(dirname "${LAUNCH_COMPONENT}") echo "COMPONENT_DIR: ${COMPONENT_DIR}" # load config from env diff --git a/bin/start.sh b/bin/start.sh index 99520c7..affc004 100644 --- a/bin/start.sh +++ b/bin/start.sh @@ -22,10 +22,8 @@ echo 'sample-node-api start begin' # find node bin NODE_BIN=${NODE_HOME}/bin/node -echo "LAUNCH_COMPONENT: ${i} " -BASE_DIR=$(dirname "${i}") -COMPONENT_DIR="$( cd "${BASE_DIR}" >/dev/null 2>&1 && pwd )" -cd $OLDPWD +echo "LAUNCH_COMPONENT: ${LAUNCH_COMPONENT} " +COMPONENT_DIR=$(dirname "${LAUNCH_COMPONENT}") echo "COMPONENT_DIR: ${COMPONENT_DIR}" # load config from env