add cmd to add helm repo from s3 bucket and from http web server

Oleg Sucharevich · web-flow · commit 3b86e0a05f18 · 2018-02-18T14:10:11.000+02:00
diff --git a/codefresh.yml b/codefresh.yml
@@ -25,7 +25,7 @@ steps:
     type: build
     dockerfile: Dockerfile
     image-name: codefresh/cli
-    tag: ${{CF_BRANCH}}
+    tag: ${{CF_BRANCH_TAG_NORMALIZED}}
 
   push_to_registry_revision:
     title: "Pushing image tagged with revision to registry"
diff --git a/lib/interface/cli/commands/context/create/createHelmRepository.cmd.js b/lib/interface/cli/commands/context/create/createHelmRepository.cmd.js
diff --git a/lib/interface/cli/commands/context/create/helm-repo/base.cmd.js b/lib/interface/cli/commands/context/create/helm-repo/base.cmd.js
@@ -0,0 +1,24 @@
+const debug = require('debug')('codefresh:cli:create:context:helmRepo');
+const Command = require('../../../../Command');
+const createContext = require('../../create.cmd');
+
+const command = new Command({
+    command: 'helm-repository',
+    parent: createContext,
+    description: 'Create a helm-repository context [type]',
+    usage: ``,
+    webDocs: {
+        category: 'Create Context',
+        subCategory : 'Helm Repository',
+        title: 'Create Helm-Repository Context',
+    },
+    builder: (yargs) => {
+        return yargs;
+    },
+    handler: async (argv) => {
+        yargs.showHelp();
+    },
+});
+
+module.exports = command;
+
diff --git a/lib/interface/cli/commands/context/create/helm-repo/types/http.cmd.js b/lib/interface/cli/commands/context/create/helm-repo/types/http.cmd.js
@@ -0,0 +1,61 @@
+const debug = require('debug')('codefresh:cli:create:context:helmRepo:http');
+const Command = require('../../../../../Command');
+const CFError = require('cf-errors');
+const createHelmRepoCmd = require('./../base.cmd');
+const { context } = require('../../../../../../../logic/index').api;
+
+
+const command = new Command({
+    command: 'http <name>',
+    parent: createHelmRepoCmd,
+    description: 'Create a helm-repository context from HTTP server',
+    usage: `
+    A chart repository is an HTTP server that houses an index.yaml file and optionally some packaged charts.
+    When you're ready to share your charts, the preferred way to do so is by uploading them to a chart repository.
+    Read more: https://github.com/kubernetes/helm/blob/master/docs/chart_repository.md`,
+    webDocs: {
+        category: 'Create Helm-Repository Context',
+        subCategory: 'HTTP',
+        title: 'From HTTP web server',
+    },
+    builder: (yargs) => {
+        yargs
+            .option('url', {
+                describe: 'Url to the web server',
+                required: true,
+            });
+        return yargs;
+    },
+    handler: async (argv) => {
+        const data = {
+            apiVersion: 'v1',
+            kind: 'context',
+            owner: argv.owner,
+            metadata: {
+                name: argv.name,
+            },
+            spec: {
+                type: 'helm-repository',
+                data: {
+                    repositoryUrl: argv.url,
+                },
+            },
+        };
+        
+        let { url } = argv;
+        const indexFileName = 'index.yaml';
+        if (url.endsWith(indexFileName)) {
+            url = url.substring(0, url.indexOf(indexFileName));
+        }
+
+        if (!data.metadata.name || !data.spec.type) {
+            throw new CFError('Name and type must be provided');
+        }
+        
+        await context.createContext(data);
+        console.log(`Context: ${data.metadata.name} created`);
+    },
+});
+
+module.exports = command;
+
diff --git a/lib/interface/cli/commands/context/create/helm-repo/types/s3.cmd.js b/lib/interface/cli/commands/context/create/helm-repo/types/s3.cmd.js
@@ -0,0 +1,98 @@
+const debug = require('debug')('codefresh:cli:create:context:helmRepo:s3');
+const Command = require('../../../../../Command');
+const CFError = require('cf-errors');
+const createHelmRepoCmd = require('./../base.cmd');
+const { context } = require('../../../../../../../logic/index').api;
+
+const AWS = {
+    keyId: {
+        awsEnvVar: 'AWS_ACCESS_KEY_ID',
+    },
+    secretKey: {
+        awsEnvVar: 'AWS_SECRET_ACCESS_KEY',
+    },
+    region: {
+        awsEnvVar: 'AWS_DEFAULT_REGION',
+    },
+};
+
+AWS.keyId.cliFlag = AWS.keyId.awsEnvVar.replace(/_/g, '-').toLowerCase();
+AWS.secretKey.cliFlag = AWS.secretKey.awsEnvVar.replace(/_/g, '-').toLowerCase();
+AWS.region.cliFlag = AWS.region.awsEnvVar.replace(/_/g, '-').toLowerCase();
+
+const command = new Command({
+    command: 's3 <name>',
+    parent: createHelmRepoCmd,
+    description: 'Create a helm-repository context from s3 bucket',
+    usage: `
+    Helm repository can be stored in AWS S3 bucket.
+    Codefresh will integrate with the bucket in the following order
+    If environment variables ${AWS.keyId.awsEnvVar}, ${AWS.secretKey.awsEnvVar} ,${AWS.region.awsEnvVar} are set, will use it to create context.
+    You can override them using flags ${AWS.keyId.cliFlag} ${AWS.secretKey.cliFlag} ${AWS.region.cliFlag}`,
+    webDocs: {
+        category: 'Create Helm-Repository Context',
+        subCategory: 'S3',
+        title: 'From AWS S3 bucket',
+    },
+    builder: (yargs) => {
+        yargs
+            .option(AWS.keyId.cliFlag, {
+                describe: 'Amazon access key id',
+                default: process.env[AWS.keyId.awsEnvVar],
+                required: true,
+            })
+            .option(AWS.secretKey.cliFlag, {
+                describe: 'Amazon access secret key with permissions to the bucket',
+                default: process.env[AWS.secretKey.awsEnvVar],
+                required: true,
+            })
+            .option(AWS.region.cliFlag, {
+                describe: 'Amazon default region',
+                default: process.env[AWS.region.awsEnvVar],
+                required: true,
+            })
+            .option('bucket', {
+                describe: 'Name of the bucket',
+                required: true,
+            });
+        return yargs;
+    },
+    handler: async (argv) => {
+        let bucket = '';
+        if (argv.bucket.startsWith('s3://')) {
+            ({ bucket } = argv);
+        } else {
+            bucket = `s3://${argv.bucket}`;
+        }
+
+        const data = {
+            apiVersion: 'v1',
+            kind: 'context',
+            owner: argv.owner,
+            metadata: {
+                name: argv.name,
+            },
+            spec: {
+                type: 'helm-repository',
+                data: {
+                    repositoryUrl: bucket,
+                    variables: {
+                        [AWS.keyId.awsEnvVar]: argv[AWS.keyId.cliFlag],
+                        [AWS.secretKey.awsEnvVar]: argv[AWS.secretKey.cliFlag],
+                        [AWS.region.awsEnvVar]: argv[AWS.region.cliFlag],
+                    },
+                },
+            },
+        };
+
+        if (!data.metadata.name || !data.spec.type) {
+            throw new CFError('Name and type must be provided');
+        }
+        
+        await context.createContext(data);
+        console.log(`Context: ${data.metadata.name} created`);
+    },
+});
+
+module.exports = command;
+
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.8.22",
+  "version": "0.8.23",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,
diff --git a/yarn.lock b/yarn.lock
@@ -2054,10 +2054,6 @@ is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
-is-url@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.2.tgz#498905a593bf47cc2d9e7f738372bbf7696c7f26"
-
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"

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