diff --git a/bin/install.js b/bin/install.js index a2a0fda..990fe37 100755 --- a/bin/install.js +++ b/bin/install.js @@ -2,7 +2,9 @@ const fs = require('fs'); const os = require('os'); const jsonfile = require('jsonfile'); -const hznConfig = '/etc/default/config'; +const homePath = process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME']; +const hznConfig = `${homePath}/config`; +const constants = fs.constants; const template = { envHzn: { diff --git a/build/commands/deploy.js b/build/commands/deploy.js index 03bcceb..bb837ea 100755 --- a/build/commands/deploy.js +++ b/build/commands/deploy.js @@ -50,6 +50,7 @@ const handler = (argv) => { if (env.length == 0) { let value = hzn_1.utils.getPropValueFromFile(`${hzn_1.utils.getHznConfig()}/.env-local`, 'DEFAULT_ORG'); env = value.length > 0 ? value : 'biz'; + console.log('$$$env', env); } const proceed = () => { if ((0, fs_1.existsSync)(`${hzn_1.utils.getHznConfig()}/.env-hzn.json`) && (0, fs_1.existsSync)(`${hzn_1.utils.getHznConfig()}/.env-local`)) { diff --git a/build/commands/deploy.js.map b/build/commands/deploy.js.map index c7a7043..f5b525a 100644 --- a/build/commands/deploy.js.map +++ b/build/commands/deploy.js.map @@ -1 +1 @@ -{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":";;;;;;AACA,2CAA+C;AAC/C,kDAA0B;AAC1B,kDAA0B;AAC1B,oDAA4B;AAC5B,2BAAgC;AAanB,QAAA,OAAO,GAAW,iBAAiB,CAAC;AACpC,QAAA,IAAI,GAAW,8BAA8B,CAAC;AAEpD,MAAM,OAAO,GAAqC,CAAC,KAAK,EAAE,EAAE,CACjE,KAAK;KACF,OAAO,CAAC;IACP,GAAG,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,gCAAgC,EAAC;IAC7D,WAAW,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,yDAAyD,EAAC;IAC9F,IAAI,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,yCAAyC,EAAC;IACvE,WAAW,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,gBAAgB,EAAC;IACrD,SAAS,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,8BAA8B,EAAC;IACjE,MAAM,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,6BAA6B,EAAC;IAC7D,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAC;IAC9C,kBAAkB,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,kCAAkC,EAAC;CAC/E,CAAC;KACD,UAAU,CAAC,QAAQ,EAAE;IACpB,IAAI,EAAE,QAAQ;IACd,YAAY,EAAE,IAAI;IAClB,IAAI,EAAE,qBAAqB;QACrB,gJAAgJ;QAChJ,6IAA6I;QAC7I,oJAAoJ;QACtJ,0HAA0H;CAC/H,CAAC,CAAC;AApBM,QAAA,OAAO,WAoBb;AAEA,MAAM,OAAO,GAAG,CAAC,IAAwB,EAAQ,EAAE;IACxD,IAAA,eAAK,GAAE,CAAC;IACR,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,WAAW,CACf,gBAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC,CACzD,CACF,CAAC;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC;IAC7G,IAAI,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC;IACpB,MAAM,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;IACrB,MAAM,OAAO,GAAG,WAAW,IAAI,EAAE,CAAC;IAClC,MAAM,KAAK,GAAG,SAAS,IAAI,EAAE,CAAC;IAC9B,MAAM,GAAG,GAAG,MAAM,IAAI,EAAE,CAAC;IACzB,MAAM,CAAC,GAAG,OAAO,IAAI,EAAE,CAAC;IACxB,MAAM,UAAU,GAAG,WAAW,IAAI,WAAK,CAAC,YAAY,EAAE,CAAC;IACvD,MAAM,cAAc,GAAG,CAAC,eAAe,EAAE,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;IACnF,MAAM,OAAO,GAAG,CAAC,kBAAkB,EAAE,cAAc,EAAE,eAAe,EAAE,sBAAsB,EAAE,UAAU,EAAE,iBAAiB,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,kBAAkB,EAAE,eAAe,CAAC,CAAC;IAC1O,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,CAAA;IAChR,MAAM,WAAW,GAAG,CAAC,oBAAoB,EAAE,kBAAkB,CAAC,CAAC;IAE/D,IAAG,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE;QAClB,IAAI,KAAK,GAAG,WAAK,CAAC,oBAAoB,CAAC,GAAG,WAAK,CAAC,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,CAAA;QAC3F,GAAG,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;KAC3B;IACD,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAG,IAAA,eAAU,EAAC,GAAG,WAAK,CAAC,YAAY,EAAE,gBAAgB,CAAC,IAAI,IAAA,eAAU,EAAC,GAAG,WAAK,CAAC,YAAY,EAAE,aAAa,CAAC,EAAE;YAC1G,MAAM,GAAG,GAAG,IAAI,SAAG,CAAC,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;YAEhE,GAAG,CAAC,IAAI,EAAE;iBACT,SAAS,CAAC;gBACT,QAAQ,EAAE,GAAG,EAAE;oBACb,GAAG,CAAC,MAAM,CAAC,EAAE;yBACZ,SAAS,CAAC;wBACT,QAAQ,EAAC,GAAG,EAAE;4BACZ,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;4BAClC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;wBACjB,CAAC;qBACF,CAAC,CAAA;gBACJ,CAAC;gBACD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;oBACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;aACF,CAAC,CAAA;SACH;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,iCAAiC,CAAC,CAAA;SAC5D;IACH,CAAC,CAAA;IAED,IAAG,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACxG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACjC,IAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACnC,WAAK,CAAC,MAAM,CAAC,EAAE;iBACd,SAAS,CAAC;gBACT,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC/B,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;oBACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;aACF,CAAC,CAAA;SACH;aAAM;YACL,WAAK,CAAC,kBAAkB,EAAE;iBACzB,SAAS,CAAC;gBACT,QAAQ,EAAE,GAAG,EAAE;oBACb,IAAG,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;wBACtC,OAAO,EAAE,CAAC;qBACX;yBAAM,IAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;wBACtC,WAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;6BACxB,SAAS,CAAC;4BACT,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE;4BACzB,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;gCACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gCACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;4BAClB,CAAC;yBACF,CAAC,CAAA;qBACH;yBAAM,IAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,kBAAkB,EAAE;wBACnE,WAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,kBAAkB,KAAK,MAAM,CAAC;6BACjD,SAAS,CAAC;4BACT,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE;4BACzB,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;gCACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gCACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;4BAClB,CAAC;yBACF,CAAC,CAAA;qBACH;yBAAM;wBACL,WAAK,CAAC,cAAc,CAAC,GAAG,CAAC;6BACxB,SAAS,CAAC;4BACT,QAAQ,EAAE,GAAG,EAAE;gCACb,OAAO,EAAE,CAAA;4BACX,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;gCAChB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gCAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;4BAClB,CAAC;yBACF,CAAC,CAAA;qBACH;gBACH,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;oBAChB,IAAG,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;wBACrC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAA;wBACnC,WAAK,CAAC,aAAa,CAAC,GAAG,CAAC;6BACvB,SAAS,CAAC;4BACT,IAAI,EAAE,CAAC,IAAS,EAAE,EAAE;gCAClB,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;gCAC/B,OAAO,EAAE,CAAA;4BACX,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;yBAChC,CAAC,CAAA;qBACH;yBAAM;wBACL,WAAK,CAAC,gBAAgB,EAAE;6BACvB,SAAS,CAAC;4BACT,QAAQ,EAAC,GAAG,EAAE;gCACZ,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;gCAClC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;4BACjB,CAAC;yBACF,CAAC,CAAA;qBACH;gBACH,CAAC;aACF,CAAC,CAAA;SACH;KACF;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,8FAA8F,CAAC,CAAA;KAC5G;AACH,CAAC,CAAC;AAzHW,QAAA,OAAO,WAyHlB"} \ No newline at end of file diff --git a/build/common/src/utils.d.ts b/build/common/src/utils.d.ts index 58a39c9..bf183a5 100644 --- a/build/common/src/utils.d.ts +++ b/build/common/src/utils.d.ts @@ -1,5 +1,6 @@ import { Observable } from 'rxjs'; export declare class Utils { + homePath: string | undefined; hznConfig: string; constructor(); init(): void; diff --git a/build/common/src/utils.js b/build/common/src/utils.js index 7326095..a4c282b 100644 --- a/build/common/src/utils.js +++ b/build/common/src/utils.js @@ -15,7 +15,8 @@ const env = process.env.npm_config_env || 'biz'; const notRequired = ['SERVICE_CONTAINER_CREDS', 'MMS_CONTAINER_CREDS', 'MMS_OBJECT_FILE', 'HZN_CUSTOM_NODE_ID', 'UPDATE_FILE_NAME']; class Utils { constructor() { - this.hznConfig = '/etc/default/config'; + this.homePath = process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME']; + this.hznConfig = `${this.homePath}/config`; } init() { } @@ -132,7 +133,7 @@ class Utils { this.shell(`curl -sSL https://raw.githubusercontent.com/open-horizon/devops/master/mgmt-hub/deploy-mgmt-hub.sh --output deploy-mgmt-hub.sh && chmod +x deploy-mgmt-hub.sh && sudo -s -E -b ./deploy-mgmt-hub.sh`) .subscribe({ next: (res) => { - (0, fs_1.writeFileSync)(`/etc/default/.secret`, res); + (0, fs_1.writeFileSync)(`${this.hznConfig}/.secret`, res); }, complete: () => observer.complete(), error: (err) => observer.error(err) @@ -292,6 +293,7 @@ class Utils { prompt_1.default.get({ name: 'answer', required: true }, (err, question) => { if (question.answer.toUpperCase() === 'Y') { hznJson[org] = Object.assign({}, hznJson.biz); + console.log('$$$new org', org, hznJson); this.updateOrgConfig(hznJson, org, true) .subscribe({ next: () => observer.next({ env: org }), @@ -326,7 +328,7 @@ class Utils { console.log(`\nWould you like to save config files: Y/n?`); prompt_1.default.get({ name: 'answer', required: true }, (err, question) => { if (question.answer.toUpperCase() === 'Y') { - this.copyFile(`sudo cp -rf ${__dirname}/config /etc/default`).then(() => { + this.copyFile(`sudo cp -rf ${__dirname}/config ${this.homePath}`).then(() => { let content = ''; for (const [key, value] of Object.entries(result)) { content += `${key}=${value}\n`; diff --git a/build/common/src/utils.js.map b/build/common/src/utils.js.map index ce2c730..f24fb56 100644 --- a/build/common/src/utils.js.map +++ b/build/common/src/utils.js.map @@ -1 +1 @@ -{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/common/src/utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/common/src/utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/install.sh b/install.sh new file mode 100644 index 0000000..38edb13 --- /dev/null +++ b/install.sh @@ -0,0 +1,66 @@ +#!/bin/sh +set -e +# Install node and npm via nvm - https://github.com/nvm-sh/nvm + +# Run this script like - bash script-name.sh + +# Define versions +INSTALL_NODE_VER=16 +INSTALL_NVM_VER=0.39.1 + +# You can pass argument to this script --version 8 +if [ "$1" = '--version' ]; then + echo "==> Using specified node version - $2" + INSTALL_NODE_VER=$2 +fi + +echo "==> Ensuring .bashrc exists and is writable" +touch ~/.bashrc + +echo "==> Installing node version manager (NVM). Version $INSTALL_NVM_VER" +# Removed if already installed +rm -rf ~/.nvm +# Unset exported variable +export NVM_DIR= + +# Install nvm +curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v$INSTALL_NVM_VER/install.sh | bash +# Make nvm command available to terminal +source ~/.nvm/nvm.sh + +echo "==> Installing node js version $INSTALL_NODE_VER" +nvm install $INSTALL_NODE_VER + +echo "==> Make this version system default" +nvm alias default $INSTALL_NODE_VER +nvm use default + +#echo -e "==> Update npm to latest version, if this stuck then terminate (CTRL+C) the execution" +npm install -g npm + +echo "==> Checking for versions" +nvm --version +node --version +npm --version + +echo "==> Print binary paths" +which npm +which node + +echo "==> List installed node versions" +nvm ls + +nvm cache clear +echo "==> Now you're all setup and ready for development. If changes are yet to take effect in the current shell, try source ~/.bashrc or open a new shell" + +echo "==> Installing oh cli" +npm i -g hzn-cli + +echo "==> Checking oh version" +oh --version + +echo "==> Setting up hzn environment" +oh deploy setup + +# Tested on Ubuntu, MacOS +# @playground diff --git a/package.json b/package.json index e669072..bb177df 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hzn-cli", - "version": "0.2.9", + "version": "0.3.0", "description": "Open Horizon CLI toolkit helps streamline the process of preparing node agents and perform tasks between orgs environments", "main": "./build/index.js", "bin": { diff --git a/src/commands/deploy.ts b/src/commands/deploy.ts index b4830a1..feba881 100644 --- a/src/commands/deploy.ts +++ b/src/commands/deploy.ts @@ -64,6 +64,7 @@ export const handler = (argv: Arguments): void => { if(env.length == 0) { let value = utils.getPropValueFromFile(`${utils.getHznConfig()}/.env-local`, 'DEFAULT_ORG') env = value.length > 0 ? value : 'biz' + console.log('$$$env', env) } const proceed = () => { if(existsSync(`${utils.getHznConfig()}/.env-hzn.json`) && existsSync(`${utils.getHznConfig()}/.env-local`)) { diff --git a/src/common/src/utils.ts b/src/common/src/utils.ts index a4af1b6..6222b59 100644 --- a/src/common/src/utils.ts +++ b/src/common/src/utils.ts @@ -12,7 +12,9 @@ const env = process.env.npm_config_env || 'biz'; const notRequired = ['SERVICE_CONTAINER_CREDS', 'MMS_CONTAINER_CREDS', 'MMS_OBJECT_FILE', 'HZN_CUSTOM_NODE_ID', 'UPDATE_FILE_NAME']; export class Utils { - hznConfig = '/etc/default/config'; + etcDefault = '/etc/default'; + homePath = process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME']; + hznConfig = `${this.homePath}/config`; constructor() {} init() { } @@ -126,7 +128,7 @@ export class Utils { this.shell(`curl -sSL https://raw.githubusercontent.com/open-horizon/devops/master/mgmt-hub/deploy-mgmt-hub.sh --output deploy-mgmt-hub.sh && chmod +x deploy-mgmt-hub.sh && sudo -s -E -b ./deploy-mgmt-hub.sh`) .subscribe({ next: (res: any) => { - writeFileSync(`/etc/default/.secret`, res) + writeFileSync(`${this.hznConfig}/.secret`, res) }, complete: () => observer.complete(), error: (err) => observer.error(err) @@ -278,6 +280,7 @@ export class Utils { prompt.get({name: 'answer', required: true}, (err: any, question: any) => { if(question.answer.toUpperCase() === 'Y') { hznJson[org] = Object.assign({}, hznJson.biz); + console.log('$$$new org', org, hznJson) this.updateOrgConfig(hznJson, org, true) .subscribe({ next: () => observer.next({env: org}), @@ -310,7 +313,7 @@ export class Utils { console.log(`\nWould you like to save config files: Y/n?`) prompt.get({name: 'answer', required: true}, (err: any, question: any) => { if(question.answer.toUpperCase() === 'Y') { - this.copyFile(`sudo cp -rf ${__dirname}/config /etc/default`).then(() => { + this.copyFile(`sudo cp -rf ${__dirname}/config ${this.homePath}`).then(() => { let content = ''; for(const [key, value] of Object.entries(result)) { content += `${key}=${value}\n`; @@ -358,7 +361,7 @@ export class Utils { }) } getHznInfo() { - return readFileSync('/etc/default/horizon').toString().split('\n'); + return readFileSync(`${this.etcDefault}/horizon`).toString().split('\n'); } showHznInfo() { return new Observable((observer) => { @@ -413,7 +416,7 @@ export class Utils { } updateHznInfo() { return new Observable((observer) => { - let props = this.getPropsFromFile('/etc/default/horizon'); + let props = this.getPropsFromFile(`${this.etcDefault}/horizon`); console.log('\nKey in new value or (leave blank) press Enter to keep current value: ') prompt.get(props, (err: any, result: any) => { console.log(result) @@ -425,9 +428,9 @@ export class Utils { for(const [key, value] of Object.entries(result)) { content += `${key}=${value}\n`; } - this.copyFile('sudo cp /etc/default/horizon /etc/default/.horizon').then(() => { + this.copyFile(`sudo cp ${this.etcDefault}/horizon ${this.etcDefault}/.horizon`).then(() => { writeFileSync('.horizon', content); - this.copyFile(`sudo mv .horizon /etc/default/horizon`).then(() => { + this.copyFile(`sudo mv .horizon ${this.etcDefault}/horizon`).then(() => { observer.next(); observer.complete(); })