morpheus-cli 4.2.21 → 4.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e42e74a1ee8d23e7b91134313dbcb6ba8b42857973c8b33057e8bb433a1d5f3
-  data.tar.gz: 05e7210bcd6a08b00feb395c04ea3b109c0c58c54b95c163d5c5ef84505dddc5
+  metadata.gz: f1e56f81e53557586c3a19751c97163f5c63ce1bda3ea04e5eadd54d7e1c08e0
+  data.tar.gz: 24c543afa2832100919d5451b8d8954952132db4b421cffe889882b5f7ef34e9
 SHA512:
-  metadata.gz: 6206a6bfdada390d10a4b7202794fdde6a0f0edafc5df7025e053c991d23b576be989f73d2cc95d51927600d5fb11f9393951659097c9038ce3d9a038a64b344
-  data.tar.gz: a08c1b2a452b868e15f30cae19d56ae4fd817fcf441cee05ab87fed718e7b933211430dd41dfb3060714526fe1d318865844d57bf2e8dea2cd0a489d7cec58f1
+  metadata.gz: 682d8dafc50d15c216470971f5c78ca09cba8feafa2d7f1cf0462a6368f88377a627411ba3d4287ff1669d321153be02f4db2e955606620d6a5bf8425b055e23
+  data.tar.gz: 60b6787aacf5b2275197c496a3ff9bc9018fe70e897def95bacb54268dbdf97d5dc362e3d8f7bbfb7b0db0b18cc8028ae99b2e1f2540bb821485c21ee27b945d

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 4.2.21
+RUN gem install morpheus-cli -v 4.2.22
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/commands/standard/curl_command.rb

@@ -9,15 +9,20 @@ class Morpheus::Cli::CurlCommand
   set_command_hidden
 
   def handle(args)
-    split_args = args.join(" ").split(" -- ")
-    args = split_args[0].split(" ")
-    curl_args = split_args[1] ? split_args[1].split(" ") : []
+    # support syntax for arbitrary curl args after " -- " 
+    # eg. curl /api/instances -- -ksv
+    split_index = args.index("--")
+    curl_args = []
+    if split_index
+      if args.length > (split_index + 1)
+        curl_args = args[(split_index + 1)..-1]
+      end
+      args = args[0..(split_index - 1)]
+    end
     curl_method = nil
     curl_data = nil
     curl_verbsose = false
     show_progress = false
-    # puts "args is : #{args}"
-    # puts "curl_args is : #{curl_args}"
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus curl [path] -- [*args]"
@@ -98,16 +103,27 @@ EOT
     end
     curl_cmd << " \"#{url}\""
     if @access_token
-      curl_cmd << " -H \"Authorization: Bearer #{@access_token}\""
+      if !(options[:headers] && options[:headers]['Authorization'])
+        curl_cmd << " -H \"Authorization: Bearer #{@access_token}\""
+      end
     end
     if curl_data
       #todo: curl_data.gsub("'","\\'")
       curl_cmd << " --data '#{curl_data}'"
+      if api_path !~ /^\/?oauth/
+        if !(options[:headers] && options[:headers]['Content-Type'])
+          curl_cmd << " -H \"Content-Type: application/json\""
+        end
+      end
+    end
+    if options[:headers]
+      options[:headers].each do |k,v|
+        curl_cmd << " -H \"#{k}: #{v}\""
+      end
     end
     if !curl_args.empty?
       curl_cmd << " " + curl_args.join(' ')
     end
-    
     # Morpheus::Logging::DarkPrinter.puts "#{curl_cmd}" if Morpheus::Logging.debug?
     curl_cmd_str = options[:scrub] ? Morpheus::Logging.scrub_message(curl_cmd) : curl_cmd
 

data/lib/morpheus/cli/jobs_command.rb

@@ -102,15 +102,15 @@ class Morpheus::Cli::JobsCommand
         if stats = json_response['stats']
           label_width = 17
 
-          print_h2 "Executions Stats - Last 7 Days"
+          print_h2 "Execution Stats - Last 7 Days"
           print cyan
 
           print "Jobs".rjust(label_width, ' ') + ": #{stats['jobCount']}\n"
           print "Executions Today".rjust(label_width, ' ') + ": #{stats['todayCount']}\n"
           print "Daily Executions".rjust(label_width, ' ') + ": " + stats['executionsPerDay'].join(' | ') + "\n"
           print "Total Executions".rjust(label_width, ' ') + ": #{stats['execCount']}\n"
-          print "Completed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execSuccessRate'].to_f, 100) + "#{stats['execSuccess']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
-          print "Failed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execFailedRate'].to_f, 100) + "#{stats['execFailed']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+          print "Completed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execSuccessRate'].to_f, 100, {bar_color:green}) + "#{stats['execSuccess']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+          print "Failed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execFailedRate'].to_f, 100, {bar_color:red}) + "#{stats['execFailed']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
         end
         print reset,"\n"
       end
@@ -304,7 +304,7 @@ class Morpheus::Cli::JobsCommand
           job_options = @jobs_interface.options(job_type_id)
 
           # prompt task / workflow
-          if job_type['code'] == 'morpheus.task'
+          if ['morpheus.task.jobType', 'morpheus.task'].include?(job_type['code'])
             params['task'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'task.id', 'fieldLabel' => 'Task', 'type' => 'select', 'required' => true, 'optionSource' => 'tasks'}], options[:options], @api_client, {})['task']
           else
             params['workflow'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'workflow.id', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => true, 'optionSource' => 'operationTaskSets'}], options[:options], @api_client, {})['workflow']
@@ -320,10 +320,11 @@ class Morpheus::Cli::JobsCommand
             exit 1
           end
           params['task'] = {'id' => task['id']}
-          job_type_id = load_job_type_id_by_code('morpheus.task')
+          job_type_id = load_job_type_id_by_code('morpheus.task.jobType') || load_job_type_id_by_code('morpheus.task')
         end
 
         # workflow
+        task_set = nil
         if !options[:workflow].nil?
           task_set = find_by_name_or_id('task_set', options[:workflow])
 
@@ -332,8 +333,29 @@ class Morpheus::Cli::JobsCommand
             exit 1
           end
           params['workflow'] = {'id' => task_set['id']}
-          job_type_id = load_job_type_id_by_code('morpheus.workflow')
+          job_type_id = load_job_type_id_by_code('morpheus.workflow.jobType') || load_job_type_id_by_code('morpheus.workflow')
         end
+        # load workflow if we havent yet
+        if (params['workflow'] && params['workflow']['id']) && task_set.nil?
+          task_set = find_by_name_or_id('task_set', params['workflow']['id'])
+          if task_set.nil?
+            print_red_alert "Workflow #{params['workflow']['id']} not found"
+            exit 1
+          end
+        end
+        # prompt for custom options for workflow
+        custom_option_types = task_set ? task_set['optionTypes'] : nil
+        if custom_option_types && custom_option_types.size() > 0
+          # they are all returned in a single array right now, so skip prompting for the jobType optionTypes
+          custom_option_types.reject! { |it| it['code'] && it['code'].include?('job.type') }
+          custom_option_types = custom_option_types.collect {|it|
+            it['fieldContext'] = 'customOptions'
+            it
+          }
+          custom_options = Morpheus::Cli::OptionTypes.prompt(custom_option_types, options[:options], @api_client, {})
+          params['customOptions'] = custom_options['customOptions']
+        end
+
 
         # load options based upon job type + task / taskset
         job_options = @jobs_interface.options(job_type_id, {'taskId' => params['task'] ? params['task']['id'] : nil, 'workflowId' => params['workflow'] ? params['workflow']['id'] : nil})

data/lib/morpheus/cli/network_pools_command.rb

@@ -596,22 +596,28 @@ class Morpheus::Cli::NetworkPoolsCommand
   def add_ip(args)
     options = {}
     params = {}
+    next_free_ip = false
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[network-pool] [ip]")
+      opts.banner = subcommand_usage("[network-pool] [ip] [--next]")
       opts.on('--ip-address VALUE', String, "IP Address for this network pool IP") do |val|
         options[:options]['ipAddress'] = val
       end
+      opts.on('--next-free-ip', '--next-free-ip', "Use the next available ip address. This can be used instead of specifying an ip address") do
+        next_free_ip = true
+      end
       opts.on('--hostname VALUE', String, "Hostname for this network pool IP") do |val|
         options[:options]['hostname'] = val
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
       opts.footer = "Create a new network pool IP." + "\n" +
                     "[network-pool] is required. This is the name or id of a network pool.\n" +
-                    "[ip] is required and can be passed as --ip-address instead."
+                    "[ip] is required or --next-free-ip to use the next available address instead."
     end
     optparse.parse!(args)
-    if args.count < 1 || args.count > 2
-      raise_command_error "wrong number of arguments, expected 1-2 and got (#{args.count}) #{args}\n#{optparse}"
+    if next_free_ip
+      verify_args!(args:args, count:1, optparse:optparse)
+    else
+      verify_args!(args:args, min:1, max:2, optparse:optparse)
     end
     connect(options)
     begin
@@ -639,8 +645,10 @@ class Morpheus::Cli::NetworkPoolsCommand
         payload['networkPoolIp'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
         # IP Address
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'ipAddress', 'fieldLabel' => 'IP Address', 'type' => 'text', 'required' => true, 'description' => 'IP Address for this network pool IP.'}], options[:options])
-        payload['networkPoolIp']['ipAddress'] = v_prompt['ipAddress'] unless v_prompt['ipAddress'].to_s.empty?
+        unless next_free_ip
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'ipAddress', 'fieldLabel' => 'IP Address', 'type' => 'text', 'required' => true, 'description' => 'IP Address for this network pool IP.'}], options[:options])
+          payload['networkPoolIp']['ipAddress'] = v_prompt['ipAddress'] unless v_prompt['ipAddress'].to_s.empty?
+        end
 
         # Hostname
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname for this network pool IP.'}], options[:options])

data/lib/morpheus/cli/service_plans_command.rb

@@ -409,9 +409,9 @@ class Morpheus::Cli::ServicePlanCommand
           while Morpheus::Cli::OptionTypes.confirm("Add #{price_sets.empty? ? '' : 'another '}price set?", {:default => false}) do
             price_unit = prompt_price_unit(options)
 
-            avail_price_sets ||= @price_sets_interface.list['priceSets'].collect {|it| {'name' => it['name'], 'value' => it['id'], 'priceUnit' => it['priceUnit']}}
+            avail_price_sets ||= @price_sets_interface.list({'priceUnit' => price_unit, 'max' => 10000})['priceSets'].collect {|it| {'name' => it['name'], 'value' => it['id'], 'priceUnit' => it['priceUnit']}}
 
-            if price_set_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'priceSet', 'type' => 'select', 'fieldLabel' => 'Price Set', 'selectOptions' => avail_price_sets.reject {|it| it['priceUnit'] != price_unit}, 'required' => false, 'description' => 'Select Price.'}],options[:options],@api_client,{}, options[:no_prompt], true)['priceSet']
+            if price_set_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'priceSet', 'type' => 'select', 'fieldLabel' => 'Price Set', 'selectOptions' => avail_price_sets, 'required' => false, 'description' => 'Select Price.'}],options[:options],@api_client,{}, options[:no_prompt], true)['priceSet']
               price_set = avail_price_sets.find {|it| it['value'] == price_set_id}
               price_sets << {'id' => price_set['value'], 'priceUnit' => price_set['priceUnit']}
               avail_price_sets.reject! {|it| it['value'] == price_set_id}

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.21"
+    VERSION = "4.2.22"
   end
 end

data/lib/morpheus/cli/workflows.rb

@@ -623,7 +623,7 @@ class Morpheus::Cli::Workflows
           #raise_command_error "missing required option: --instance, --host or --appliance\n#{optparse}"
         end
 
-        # todo: prompt to workflow optionTypes for customOptions
+        # prompt to workflow optionTypes for customOptions
         custom_options = nil
         if workflow['optionTypes'] && workflow['optionTypes'].size() > 0
           custom_option_types = workflow['optionTypes'].collect {|it|

metadata

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