Support install-chart command (#56)

olegs-codefresh · itai-codefresh · commit ba4990c01291 · 2018-01-04T12:30:06.000+02:00
diff --git a/lib/interface/cli/codefresh b/lib/interface/cli/codefresh
@@ -37,10 +37,6 @@ recursive(path.resolve(__dirname, 'commands'), (err, files) => {
             default: DEFAULTS.CFCONFIG,
             global: false,
         })
-        .option('version', {
-            alias: 'v',
-            global: false,
-        })
         .config('cfconfig', 'Custom path for authentication contexts config file', (configFilePath) => {
             try {
                 authManager.loadContexts(configFilePath, process.env.CF_TOKEN, process.env.CF_URL || DEFAULTS.URL);
@@ -59,6 +55,7 @@ recursive(path.resolve(__dirname, 'commands'), (err, files) => {
         .completion()
         .demandCommand(1, 'You need at least one command before moving on')
         .wrap(null)
+        .version(false)
         .help('help')
         .option('help', {
             global: false,
diff --git a/lib/interface/cli/commands/root/install-chart.cmd.js b/lib/interface/cli/commands/root/install-chart.cmd.js
@@ -0,0 +1,72 @@
+const Command = require('../../Command');
+const {
+    installChart,
+} = require('./../../../../logic/api/helm');
+const { printError } = require('./../../helpers/general');
+
+const install = new Command({
+    root: true,
+    command: 'install-chart',
+    description: 'Install or upgrade Helm chart',
+    builder: (yargs) => {
+        return yargs
+            .usage('Install or upgrade helm chart on cluster')
+            .option('cluster', {
+                description: 'Install on cluster',
+                type: 'string',
+                required: true,
+            })
+            .option('namespace', {
+                description: 'Install on namespace',
+                default: 'default',
+                type: 'string',
+            })
+            .option('tiller-namespace', {
+                description: 'Where tiller has been installed',
+                default: 'kube-system',
+                type: 'string',
+            })
+            .option('repository', {
+                description: 'Helm repository',
+                type: 'string',
+                required: true,
+            })
+            .option('name', {
+                description: 'Name of the chart in the repository',
+                type: 'string',
+                required: true,
+            })
+            .option('version', {
+                description: 'Version of the chart in the repository',
+                type: 'string',
+                required: true,
+            })
+            .option('context', {
+                description: 'Contexts (helm-plain-text-values) to be passed to the install',
+                array: true,
+            })
+            .option('release-name', {
+                description: 'The name to set to the release',
+            });
+    },
+    handler: async (argv) => {
+        try {
+            const workflowId = await installChart({
+                releaseName: argv.releaseName,
+                cluster: argv.cluster,
+                namespace: argv.namespace,
+                name: argv.name,
+                repository: argv.repository,
+                version: argv.version,
+                values: argv.values,
+                tillerNamespace: argv.tillerNamespace,
+            });
+            console.log(`Started with id: ${workflowId}`);
+        } catch (err) {
+            printError(err);
+            process.exit(1);
+        }
+    },
+});
+
+module.exports = install;
diff --git a/lib/interface/cli/commands/root/version.cmd.js b/lib/interface/cli/commands/root/version.cmd.js
@@ -0,0 +1,16 @@
+const Command = require('../../Command');
+const cliPackage = require('./../../../../../package.json');
+
+const version = new Command({
+    root: true,
+    command: 'version',
+    description: 'Print version',
+    builder: (yargs) => {
+        return yargs;
+    },
+    handler: async () => {
+        console.log(cliPackage.version);
+    },
+});
+
+module.exports = version;
diff --git a/lib/logic/api/helm.js b/lib/logic/api/helm.js
@@ -0,0 +1,69 @@
+const Promise = require('bluebird');
+const _ = require('lodash');
+const CFError = require('cf-errors'); // eslint-disable-line
+const { sendHttpRequest } = require('./helper');
+const { getContextByName } = require('./context');
+
+const SUPPORTED_TYPES = [
+    'helm-plain-text-values',
+];
+
+
+const _normalizeValues = async (values = []) => {
+    const normalizedValues = await Promise.reduce(values, async (normalized, name) => {
+        let context;
+        try {
+            context = await getContextByName(name);
+        } catch (err) {
+            console.log(`Failed to get context: ${err.message}`);
+            throw err;
+        }
+        const type = context.getType();
+        if (_.includes(SUPPORTED_TYPES, type)) {
+            normalized.push({
+                name,
+            });
+        } else {
+            console.log(`${name} has type ${type} which not supported, skipping`);
+        }
+        return normalized;
+    }, []);
+
+    return normalizedValues;
+};
+
+const installChart = async ({
+    cluster,
+    namespace,
+    name,
+    repository,
+    version,
+    values,
+    releaseName,
+    tillerNamespace,
+}) => {
+    const normalizedValues = await _normalizeValues(values);
+    const options = {
+        url: '/api/kubernetes/chart/install',
+        method: 'POST',
+        qs: {
+            selector: cluster,
+            namespace: tillerNamespace,
+        },
+        body: {
+            name,
+            repository,
+            namespace,
+            values: normalizedValues,
+            version,
+            releaseName,
+        },
+    };
+
+    const res = await sendHttpRequest(options);
+    return res.id;
+};
+
+module.exports = {
+    installChart,
+};
diff --git a/lib/logic/entities/Context.js b/lib/logic/entities/Context.js
@@ -1,4 +1,5 @@
 const Entity = require('./Entity');
+const _ = require('lodash');
 
 class Context extends Entity {
     constructor(data) {
@@ -8,6 +9,11 @@ class Context extends Entity {
         this.defaultColumns = ['apiVersion', 'kind', 'name'];
         this.wideColumns = ['apiVersion', 'kind', 'name', 'owner', 'type'];
     }
+
+    // get the type of the context from spec.type
+    getType() {
+        return _.get(this, 'info.type');
+    }
 }
 
 module.exports = Context;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,
diff --git a/yarn.lock b/yarn.lock
@@ -60,16 +60,7 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.1.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.4.0.tgz#32d1cf08dbc80c432f426f12e10b2511f6b46474"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.0.tgz#eb2840746e9dc48bd5e063a36e3fd400c5eab5a9"
   dependencies:
@@ -1018,7 +1009,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen@1.8.1:
+escodegen@1.8.1, escodegen@^1.6.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
@@ -1029,17 +1020,6 @@ escodegen@1.8.1:
   optionalDependencies:
     source-map "~0.2.0"
 
-escodegen@^1.6.1:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
-  dependencies:
-    esprima "^3.1.3"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.5.6"
-
 eslint-config-airbnb-base@^12.1.0:
   version "12.1.0"
   resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-12.1.0.tgz#386441e54a12ccd957b0a92564a4bafebd747944"
@@ -1145,10 +1125,6 @@ esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
 esprima@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
@@ -2602,30 +2578,26 @@ mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
-minimatch@3.0.3:
+minimatch@3.0.3, minimatch@^3.0.2, minimatch@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
     brace-expansion "^1.0.0"
 
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.0, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
 minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
 "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -2883,7 +2855,7 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
-package-json@2.3.3:
+package-json@2.3.3, package-json@^2.0.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-2.3.3.tgz#14895311a963d18edf8801e06b67ea87795d15b9"
   dependencies:
@@ -2899,15 +2871,6 @@ package-json@^1.0.0:
     got "^3.2.0"
     registry-url "^3.0.0"
 
-package-json@^2.0.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-2.4.0.tgz#0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"
-  dependencies:
-    got "^5.0.0"
-    registry-auth-token "^3.0.1"
-    registry-url "^3.0.3"
-    semver "^5.1.0"
-
 parse-github-repo-url@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.3.0.tgz#d4de02d68e2e60f0d6a182e7a8cb21b6f38c730b"
@@ -3135,7 +3098,7 @@ randomatic@^1.1.3:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7:
+rc@^1.0.1, rc@^1.1.2, rc@^1.1.7:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
   dependencies:
@@ -3224,13 +3187,6 @@ regex-cache@^0.4.2:
   dependencies:
     is-equal-shallow "^0.1.3"
 
-registry-auth-token@^3.0.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.1.tgz#fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"
-  dependencies:
-    rc "^1.1.6"
-    safe-buffer "^5.0.1"
-
 registry-url@3.1.0, registry-url@^3.0.0, registry-url@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
@@ -3396,18 +3352,12 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@1.4.0:
+resolve@1.4.0, resolve@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.2.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
-  dependencies:
-    path-parse "^1.0.5"
-
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
@@ -3574,7 +3524,7 @@ source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6:
+source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "codefresh",`
`3`		`- "version": "0.4.8",`
	`3`	`+ "version": "0.4.9",`
`4`	`4`	`"description": "Codefresh command line utility",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"preferGlobal": true,`