morpheus-cli 4.2.14 → 4.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12da692ad20d0ab6db265ec26da63bdd71dbe110381586cea320ac83fe09de2
-  data.tar.gz: deb39862ff91c6da7bdfe4d2a3a616c6daea0a4b1192f514b78d27d5c8eb22dd
+  metadata.gz: b6215b2bb521606b6de3580787cca558fa2925f2c037f5c6bfbf2f1d952e0f81
+  data.tar.gz: 64f921b6c079eabda7fdad9bf70f55af423c0cc1a42f6f5ccead6442737a684b
 SHA512:
-  metadata.gz: ec460c3243e1f19153f3889b1fda253a17ff5ddc81b26e7fd43313250c76b8e4bac0c534174270377ffb4b0e027515722fd7564f5a7a3b06307c2b3559fdcd2f
-  data.tar.gz: 8e98be2498dd435aab6e4ed09d46e41a380df9a29f0a39a760d4f20a5d965b9254f34eb0fc65d821d8874a8a4eebca04f7aa3af17afb8c5593e73cb79f25a778
+  metadata.gz: ba237f9f75cb4f64d04699ae8feaf3840c87b2cb62c1f0ec224a70aece0a23c76105de608f493f019e44f43ebd72590df226cf61654aee6fa34881754695a82b
+  data.tar.gz: 92f3c614362d4dfe3385aecdb8f52847a336d47aa41afc3a9ee6909f221a672454bc98a2e3bfdbe94a48208cebbb9f0293abc7bd9d9c177e7f11ec8b0989a9b6

data/lib/morpheus/cli/library_option_types_command.rb

@@ -65,7 +65,8 @@ class Morpheus::Cli::LibraryOptionTypesCommand
             fieldLabel: option_type['fieldLabel'],
             fieldName: option_type['fieldName'],
             default: option_type['defaultValue'],
-            required: option_type['required'] ? 'yes' : 'no'
+            required: option_type['required'] ? 'yes' : 'no',
+            export: option_type['exportMeta'] ? 'yes' : 'no'
           }
         end
         print cyan
@@ -76,7 +77,8 @@ class Morpheus::Cli::LibraryOptionTypesCommand
           {:fieldLabel => {:display_name => "Field Label"} },
           {:fieldName => {:display_name => "Field Name"} },
           :default,
-          :required
+          :required,
+          :export,
         ], options)
         print reset
         print_results_pagination(json_response)
@@ -139,6 +141,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
         "Placeholder" => 'placeHolder',
         "Default Value" => 'defaultValue',
         "Required" => lambda {|it| format_boolean(it['required']) },
+        "Export As Tag" => lambda {|it| it['exportMeta'].nil? ? '' : format_boolean(it['exportMeta']) },
       }, option_type)
       print reset,"\n"
       return 0
@@ -162,18 +165,14 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       payload = nil
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if options[:options]
-          payload['optionType'] ||= {}
-          payload['optionType'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
-        end
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
       else
-        params = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client, options[:params])
-        if params.key?('required')
-          params['required'] = ['on','true'].include?(params['required'].to_s)
-        end
-        option_type_payload = params
-        payload = {optionType: option_type_payload}
+        payload = {}
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
+        option_type_payload = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client)
+        option_type_payload['required'] = ['on','true'].include?(option_type_payload['required'].to_s) if option_type_payload.key?('required')
+        option_type_payload['exportMeta'] = ['on','true'].include?(option_type_payload['exportMeta'].to_s) if option_type_payload.key?('exportMeta')
+        payload.deep_merge!({'optionType' => option_type_payload})
       end
       @option_types_interface.setopts(options)
       if options[:dry_run]
@@ -207,27 +206,17 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     begin
       option_type = find_option_type_by_name_or_id(args[0])
       exit 1 if option_type.nil?
-
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if options[:options]
-          payload['optionType'] ||= {}
-          payload['optionType'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
-        end
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
       else
-        #params = options[:options] || {}
-        params = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types, options[:options], @api_client, options[:params])
-        if params.empty?
-          print_red_alert "Specify at least one option to update"
-          puts optparse
-          exit 1
-        end
-        if params.key?('required')
-          params['required'] = ['on','true'].include?(params['required'].to_s)
-        end
-        option_type_payload = params
-        payload = {optionType: option_type_payload}
+        payload = {}
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
+        option_type_payload = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types, options[:options], @api_client)
+        option_type_payload['required'] = ['on','true'].include?(option_type_payload['required'].to_s) if option_type_payload.key?('required')
+        option_type_payload['exportMeta'] = ['on','true'].include?(option_type_payload['exportMeta'].to_s) if option_type_payload.key?('exportMeta')
+        payload.deep_merge!({'optionType' => option_type_payload})
+        raise_command_error "Specify at least one option to update.\n#{optparse}" if payload['optionType'].empty?
       end
       @option_types_interface.setopts(options)
       if options[:dry_run]
@@ -302,6 +291,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       {'fieldName' => 'placeHolder', 'fieldLabel' => 'Placeholder', 'type' => 'text', 'displayOrder' => 6},
       {'fieldName' => 'defaultValue', 'fieldLabel' => 'Default Value', 'type' => 'text', 'displayOrder' => 7},
       {'fieldName' => 'required', 'fieldLabel' => 'Required', 'type' => 'checkbox', 'defaultValue' => 'off', 'displayOrder' => 8},
+      {'fieldName' => 'exportMeta', 'fieldLabel' => 'Export As Tag', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'Export as Tag.', 'displayOrder' => 9},
     ]
   end
 

data/lib/morpheus/cli/option_types.rb

@@ -622,14 +622,28 @@ module Morpheus
         if source_type == "local"
           # prompt for content
           if file_params['content'].nil?
-            file_params['content'] = multiline_prompt({'fieldContext' => full_field_key, 'fieldName' => 'content', 'type' => 'code-editor', 'fieldLabel' => 'Content', 'required' => true})
+            if options[:no_prompt]
+              print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
+              print Term::ANSIColor.red, "  * Content [-O #{full_field_key}.content=] - File Content\n", Term::ANSIColor.reset
+              print "\n"
+              exit 1
+            else
+              file_params['content'] = multiline_prompt({'fieldContext' => full_field_key, 'fieldName' => 'content', 'type' => 'code-editor', 'fieldLabel' => 'Content', 'required' => true})
+            end
           end
         elsif source_type == "url"
           if file_params['url']
             file_params['contentPath'] = file_params.delete('url')
           end
           if file_params['contentPath'].nil?
-            file_params['contentPath'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'url', 'fieldLabel' => 'URL', 'type' => 'text', 'required' => true})
+            if options[:no_prompt]
+              print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
+              print Term::ANSIColor.red, "  * URL [-O #{full_field_key}.url=] - Path of file in the repository\n", Term::ANSIColor.reset
+              print "\n"
+              exit 1
+            else
+              file_params['contentPath'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'url', 'fieldLabel' => 'URL', 'type' => 'text', 'required' => true})
+            end
           end
         elsif source_type == "repository"
           if file_params['repository'].nil?
@@ -637,10 +651,21 @@ module Morpheus
             file_params['repository'] = {'id' => repository_id}
           end
           if file_params['contentPath'].nil?
-            file_params['contentPath'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'path', 'fieldLabel' => 'File Path', 'type' => 'text', 'required' => true})
+            if options[:no_prompt]
+              print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
+              print Term::ANSIColor.red, "  * File Path [-O #{full_field_key}.path=] - Path of file in the repository\n", Term::ANSIColor.reset
+              print "\n"
+              exit 1
+            else
+              file_params['contentPath'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'path', 'fieldLabel' => 'File Path', 'type' => 'text', 'required' => true})
+            end
           end
-          if file_params['contentRef'].nil?
-            file_params['contentRef'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'ref', 'fieldLabel' => 'Version Ref', 'type' => 'text'})
+          if !file_params.key?('contentRef')
+            if options[:no_prompt]
+              # pass
+            else
+              file_params['contentRef'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'ref', 'fieldLabel' => 'Version Ref', 'type' => 'text'})
+            end
           end
         end
         return file_params

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.14"
+    VERSION = "4.2.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.14
+  version: 4.2.15
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler