Revert "CR-17813 (#800)" (#803)

* Revert "CR-17813 (#800)"

This reverts commit acbce01.

* bump

docs/content/pipelines/Run Pipeline.md

@@ -15,44 +15,22 @@ The pipeline will be triggered multiple times according to the array length.
 
 #### Variable yaml file with 2 sets of variables
 ```yaml
-- VARIABLE_A: value_a_for_the_first_build
-  VARIABLE_B: value_b_for_the_first_build
-- VARIABLE_A: value_a_for_the_first_build
-  VARIABLE_B: value_b_for_the_first_build
+- key: value
+  key2: key1
+- key: value
+  key2: key2
 ```
 
 #### Variable json file with 2 sets of variables
 ```json
 [
   {
-    "VARIABLE_A": "value_a_for_the_first_build",
-    "VARIABLE_B": "value_b_for_the_first_build"
+    "key": "value",
+    "key2": "key1"
   },
   {
-    "VARIABLE_A": "value_a_for_the_first_build",
-    "VARIABLE_B": "value_b_for_the_first_build"
-  }
-]
-```
-### Use encrypted variables in Codefresh build runs; supported from CLI version: 0.82.8
-#### Variable yaml file with single variable set with encrypted variables
-```yaml
-- key:
-    val: value
-    encrypted: true
-  key2: key1
-
-```
-
-#### Variable json file single variable set with encrypted variables
-```json
-[
-  {
-    "key": {
-      "val": "value",
-      "encrypted": true
-    },
-    "key2": "key1"
+    "key": "value",
+    "key2": "key2"
   }
 ]
 ```

lib/interface/cli/commands/pipeline/pipeline.sdk.spec.js

@@ -1,6 +1,3 @@
-const yaml = require('js-yaml');
-const request = require('requestretry');
-const fs = require('fs');
 const DEFAULTS = require('../../defaults');
 const getCmd = require('./get.cmd').toCommand();
 const deleteCmd = require('./delete.cmd').toCommand();
@@ -13,16 +10,18 @@ jest.mock('../../helpers/validation'); // eslint-disable-line
 jest.mock('../../../../../check-version');
 jest.mock('../../completion/helpers', () => { // eslint-disable-line
     return {
-        authContextWrapper: (func) => func,
+        authContextWrapper: func => func,
     };
 });
 
 jest.mock('../../../../logic/entities/Pipeline', () => { // eslint-disable-line
     return {
-        fromResponse: (res) => res,
+        fromResponse: res => res,
     };
 });
 
+const request = require('requestretry');
+
 const DEFAULT_RESPONSE = request.__defaultResponse();
 
 describe('pipeline', () => {
@@ -58,11 +57,11 @@ describe('pipeline', () => {
             });
 
             it('should return default limit', async () => {
-                expect(_getLimit(undefined, false)).toEqual(DEFAULTS.GET_LIMIT_RESULTS);
+                expect(_getLimit(undefined,false)).toEqual(DEFAULTS.GET_LIMIT_RESULTS);
             });
 
             it('should return `unlimited` value', async () => {
-                expect(_getLimit(undefined, true)).toEqual(DEFAULTS.GET_ALL_PIPELINES_LIMIT);
+                expect(_getLimit(undefined,true)).toEqual(DEFAULTS.GET_ALL_PIPELINES_LIMIT);
             });
         });
 
@@ -85,75 +84,6 @@ describe('pipeline', () => {
                     });
                 });
 
-                describe('run', () => {
-                    it('should handle running pipeline with encrypted variables', async () => {
-                        const argv = { name: 'some name',
-                            detach: true,
-                            annotation: [],
-                            variable:
-                                [{
-                                    key: 'secret',
-                                    value: 'secret',
-                                },
-                                {
-                                    key: 'VAR1',
-                                    value: 'VAL1',
-                                },
-                                ],
-                            encrypted: ['secret'],
-                        };
-                        const pip = new CfPipeline(argv);
-                        await pip.run();
-                        expect(pip.executionRequests[0].options.variables).toEqual([
-                            {
-                                key: 'secret',
-                                value: 'secret',
-                                encrypted: true,
-                            },
-                            {
-                                key: 'VAR1',
-                                value: 'VAL1',
-                            },
-                        ]);
-                        await verifyResponsesReturned([DEFAULT_RESPONSE]); // eslint-disable-line
-                    });
-
-                    it('should handle running pipeline with encrypted variables passing inside json file', async () => {
-                        const rawFile = fs.readFileSync('lib/interface/cli/commands/pipeline/var.json', 'utf8');
-
-                        const argv = { name: 'some name',
-                            detach: true,
-                            annotation: [],
-                            'var-file': JSON.parse(rawFile),
-                        };
-                        const pip = new CfPipeline(argv);
-                        await pip.run();
-                        expect(pip.executionRequests[0].options.variables).toEqual(
-                            [{ key: 'help6', value: '85858' },
-                                { key: 'should_be_encrepted', value: '0000' },
-                                { encrypted: true, key: 'help7', value: 'test' }],
-                        );
-                        await verifyResponsesReturned([DEFAULT_RESPONSE]); // eslint-disable-line
-                    });
-
-                    it('should handle running pipeline with encrypted variables passing inside yaml file', async () => {
-                        const rawFile = fs.readFileSync('lib/interface/cli/commands/pipeline/var.yml', 'utf8');
-
-                        const argv = { name: 'some name',
-                            detach: true,
-                            annotation: [],
-                            'var-file': yaml.safeLoad(rawFile),
-                        };
-                        const pip = new CfPipeline(argv);
-                        await pip.run();
-                        expect(pip.executionRequests[0].options.variables).toEqual(
-                            [{ key: 'VAR1', value: 'VAL1' },
-                                { encrypted: true, key: 'VAR2', value: 'VAL2' }],
-                        );
-                        await verifyResponsesReturned([DEFAULT_RESPONSE]); // eslint-disable-line
-                    });
-                });
-
                 describe('runImpl', () => {
                     it('should handle running pipeline', async () => {
                         const argv = { name: 'some name', detach: true };

lib/interface/cli/commands/pipeline/run.base.js

@@ -1,11 +1,9 @@
 const _ = require('lodash');
 const Promise = require('bluebird');
-const CFError = require('cf-errors');
-const { prepareKeyValueFromCLIEnvOption,
-    markEncryptedFlagOnRequestedVariables,
-    prepareKeyValueObjectsFromEnvFileOption } = require('../../helpers/general');
+const { prepareKeyValueFromCLIEnvOption } = require('../../helpers/general');
 const { validatePipelineYaml } = require('../../helpers/validation');
 const { printResult } = require('../root/validate.cmd');
+const CFError = require('cf-errors');
 const { sdk } = require('../../../../logic');
 
 class RunBaseCommand {
@@ -61,18 +59,18 @@ class RunBaseCommand {
         if (variablesFromFile) {
             _.forEach(variablesFromFile, (variables) => {
                 const request = _.cloneDeep(executionRequestTemplate);
-                request.options.variables = prepareKeyValueObjectsFromEnvFileOption(variables);
+                request.options.variables = variables;
                 this.executionRequests.push(request);
             });
         } else {
-            const variables = markEncryptedFlagOnRequestedVariables(this.argv.variable, this.argv.encrypted);
+            const variables = prepareKeyValueFromCLIEnvOption(this.argv.variable);
             const request = _.cloneDeep(executionRequestTemplate);
             request.options.variables = variables;
             request.options.contexts = contexts;
             this.executionRequests.push(request);
         }
 
-        const results = await Promise.all(this.executionRequests.map((request) => this.runImpl(request)));
+        const results = await Promise.all(this.executionRequests.map(request => this.runImpl(request)));
         const findMaxReducer = (accumulator, currentValue) => (currentValue > accumulator ? currentValue : accumulator);
         const exitCode = results.reduce(findMaxReducer);
         await this.postRunRequest();

lib/interface/cli/commands/pipeline/run.cmd.js

@@ -1,5 +1,6 @@
+const debug = require('debug')('codefresh:cli:run:pipeline');
 const Command = require('../../Command');
-const { crudFilenameOption, prepareKeyValueObjectsFromCLIEnvOption } = require('../../helpers/general');
+const { crudFilenameOption } = require('../../helpers/general');
 const RunLocalCommand = require('./run.local');
 const RunExternalCommand = require('./run.cf');
 
@@ -84,13 +85,6 @@ const run = new Command({
                 describe: 'Set build variables',
                 default: [],
                 alias: 'v',
-                coerce: prepareKeyValueObjectsFromCLIEnvOption,
-            })
-            .option('encrypted', {
-                array: true,
-                alias: 'e',
-                describe: 'Variable names to encrypt',
-                default: [],
             })
             .option('detach', {
                 alias: 'd',
@@ -132,7 +126,6 @@ const run = new Command({
             .example('codefresh run PIPELINE_ID | PIPELINE_NAME -b=master', 'Defining the source control context using a branch')
             .example('codefresh run PIPELINE_ID | PIPELINE_NAME -s=52b992e783d2f84dd0123c70ac8623b4f0f938d1', 'Defining the source control context using a commit')
             .example('codefresh run PIPELINE_ID | PIPELINE_NAME -b=master -v key1=value1 -v key2=value2', 'Setting variables through the command')
-            .example('codefresh run PIPELINE_ID | PIPELINE_NAME -b=master -v key1=value1 -v key2=value2 -e key1', 'Setting variables through the command with encrypted option')
             .example('codefresh run PIPELINE_ID | PIPELINE_NAME -b=master --var-file ./var_file.yml', 'Settings variables through a yml file')
             .example('codefresh run PIPELINE_ID | PIPELINE_NAME -b=master --context context', 'Inject contexts to the pipeline execution')
             .example('codefresh run PIPELINE_ID | PIPELINE_NAME --skip step1 step2 step3', 'Skip specific steps');

lib/interface/cli/commands/project/apply.cmd.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 const { sdk } = require('../../../../logic');
 
 const applyRoot = require('../root/apply.cmd');
-const { prepareKeyValueObjectsFromCLIEnvOption, ignoreHttpError, markEncryptedFlagOnRequestedVariables } = require('../../helpers/general');
+const { prepareKeyValueObjectsFromCLIEnvOption, ignoreHttpError } = require('../../helpers/general');
 
 const command = new Command({
     command: 'project [id|name]',
@@ -61,7 +61,14 @@ const command = new Command({
             encrypted,
         } = argv;
 
-        const requestedProjectVariables = markEncryptedFlagOnRequestedVariables(variables, encrypted);
+        const variableMap = _.reduce(variables, (acc, v) => _.assign(acc, { [v.key]: v }), {});
+        _.forEach(encrypted, (varName) => {
+            const variable = variableMap[varName];
+            if (!variable) {
+                throw new CFError(`Variable is not provided: "${varName}"`);
+            }
+            variable.encrypted = true;
+        });
 
         let project = await sdk.projects.get({ id }).catch(ignoreHttpError);
         project = project || await sdk.projects.getByName({ name }).catch(ignoreHttpError);
@@ -74,7 +81,7 @@ const command = new Command({
         const updatePayload = _.pickBy({
             projectName,
             tags: tags || existingTags,
-            variables: requestedProjectVariables || existingVariables,
+            variables: variables || existingVariables,
         }, _.identity);
 
         await sdk.projects.patch({ id: project.id }, updatePayload);

lib/interface/cli/commands/project/create.cmd.js

@@ -1,8 +1,10 @@
 const Command = require('../../Command');
+const CFError = require('cf-errors');
+const _ = require('lodash');
 const { sdk } = require('../../../../logic');
 const createRoot = require('../root/create.cmd');
 const { checkOrProjectExists } = require('../../helpers/validation');
-const { prepareKeyValueObjectsFromCLIEnvOption, markEncryptedFlagOnRequestedVariables } = require('../../helpers/general');
+const { prepareKeyValueObjectsFromCLIEnvOption } = require('../../helpers/general');
 
 const command = new Command({
     command: 'project <name>',
@@ -50,10 +52,17 @@ const command = new Command({
             encrypted,
         } = argv;
 
-        const requestedProjectVariables = markEncryptedFlagOnRequestedVariables(variables, encrypted);
+        const variableMap = _.reduce(variables, (acc, v) => _.assign(acc, { [v.key]: v }), {});
+        _.forEach(encrypted, (varName) => {
+            const variable = variableMap[varName];
+            if (!variable) {
+                throw new CFError(`Variable is not provided: "${varName}"`);
+            }
+            variable.encrypted = true;
+        });
 
         await checkOrProjectExists(projectName);
-        await sdk.projects.create({ projectName, tags, variables: requestedProjectVariables });
+        await sdk.projects.create({ projectName, tags, variables });
         console.log(`Project: "${projectName}" created`);
     },
 });