Merge pull request #38 from codefresh-io/CF-4974

Cf 4974

Author: ziv-codefresh

lib/interface/cli/commands/get/commands/compositions.js

@@ -17,15 +17,15 @@ const builder = (yargs) => {
 
 const handler = async (argv) => {
     const compositionId = argv.id;
-
+    const output = argv.output ? argv.output : 'default';
     let compositions;
     // TODO:need to decide for one way for error handeling
     if (compositionId) {
         compositions = await composition.getCompositionByIdentifier(compositionId);
-        specifyOutputForSingle(argv.output, compositions);
+        specifyOutputForSingle(output, compositions);
     } else {
         compositions = await composition.getCompositions();
-        specifyOutputForArray(argv.output, compositions);
+        specifyOutputForArray(output, compositions);
     }
 
 };

lib/interface/cli/commands/get/commands/contexts.js

@@ -31,11 +31,11 @@ const handler = async (argv) => {
     if (argv.owner) {
         data.owner = argv.owner;
     }
-
+    const output = argv.output ? argv.output : 'default';
     if (argv.name) {
         try {
             const singleContext = await context.getContextByName(argv.name, data.owner);
-            specifyOutputForSingle(argv.output, singleContext);
+            specifyOutputForSingle(output, singleContext);
         }
         catch (err) {
             const error = new CFError({
@@ -48,7 +48,7 @@ const handler = async (argv) => {
     else {
         try {
             const contextArray = await context.getContexts(data);
-            specifyOutputForArray(argv.output, contextArray);
+            specifyOutputForArray(output, contextArray);
         }
         catch (err) {
             const error = new CFError({

lib/interface/cli/commands/get/commands/environments.js

@@ -17,15 +17,15 @@ const builder = (yargs) => {
 
 const handler = async (argv) => {
     const environmentId = argv.id;
-
+    const output = argv.output ? argv.output : 'default';
     let environments;
     // TODO:need to decide for one way for error handeling
     if (environmentId) {
         environments = await environment.getEnvironmentById(environmentId);
-        specifyOutputForSingle(argv.output, environments);
+        specifyOutputForSingle(output, environments);
     } else {
         environments = await environment.getEnvironments();
-        specifyOutputForArray(argv.output, environments);
+        specifyOutputForArray(output, environments);
     }
 
 };

lib/interface/cli/commands/get/commands/images.js

@@ -45,7 +45,7 @@ const handler = async (argv) => {
     if (!allRegistries) {
         filterRegistries = DEFAULTS.CODEFRESH_REGISTRIES;
     }
-
+    const output = argv.output ? argv.output : 'default';
     let images;
     // TODO:need to decide for one way for error handeling
     if (imageId) {
@@ -60,7 +60,7 @@ const handler = async (argv) => {
         });
     }
 
-    specifyOutputForArray(argv.output, images);
+    specifyOutputForArray(output, images);
 };
 
 module.exports = {

lib/interface/cli/commands/get/commands/pipelines.js

@@ -27,6 +27,7 @@ const handler = async (argv) => {
     const id        = argv.id;
     const repoOwner = argv['repo-owner'];
     const repoName  = argv['repo-name'];
+    const output    = argv.output ? argv.output : 'default';
 
     let pipelines;
     // TODO:need to decide for one way for error handeling
@@ -41,9 +42,9 @@ const handler = async (argv) => {
     }
 
     if (_.isArray(pipelines)) {
-        specifyOutputForArray(argv.output, pipelines);
+        specifyOutputForArray(output, pipelines);
     } else {
-        specifyOutputForSingle(argv.output, pipelines);
+        specifyOutputForSingle(output, pipelines);
     }
 };
 

lib/interface/cli/commands/get/commands/workflows.js

@@ -28,18 +28,19 @@ const handler = async (argv) => {
     const workflowId = argv.id;
     const limit      = argv.limit;
     const page       = argv.page;
+    const output     = argv.output ? argv.output : 'default';
 
     let workflows;
     // TODO:need to decide for one way for error handeling
     if (workflowId) {
         workflows = await workflow.getWorkflowById(workflowId);
-        specifyOutputForSingle(argv.output, workflows);
+        specifyOutputForSingle(output, workflows);
     } else {
         workflows = await workflow.getWorkflows({
             limit,
             page,
         });
-        specifyOutputForArray(argv.output, workflows);
+        specifyOutputForArray(output, workflows);
     }
 };
 

lib/interface/cli/commands/get/index.js

@@ -26,8 +26,7 @@ const builder = (yargs) => {
         .option('output', {
             describe: 'Output format',
             alias: 'o',
-            choices: ['json', 'yaml', 'wide', 'name', 'default'],
-            default: 'default',
+            choices: ['json', 'yaml', 'wide', 'name'],
         });
 
     crudFilenameOption(yargs);