morpheus-cli 4.2.18 → 5.0.0

data/lib/morpheus/cli/cli_command.rb

@@ -194,7 +194,7 @@ module Morpheus
           if option_type['placeHolder']
             value_label = option_type['placeHolder']
           elsif option_type['type'] == 'checkbox'
-            value_label = 'on|off' # or.. true|false
+            value_label = '[on|off]' # or.. true|false
           elsif option_type['type'] == 'number'
             value_label = 'NUMBER'
           elsif option_type['type'] == 'multiSelect'
@@ -204,12 +204,16 @@ module Morpheus
           # elsif option['type'] == 'select'
           end
           opts.on("--#{full_field_name} #{value_label}", String, description) do |val|
-            # attempt to parse JSON, this allows blank arrays for multiSelect like --tenants []
-            if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
-              begin
-                val = JSON.parse(val)
-              rescue
-                Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+            if option_type['type'] == 'checkbox'
+              val = (val.to_s != 'false' && val.to_s != 'off')
+            else
+              # attempt to parse JSON, this allows blank arrays for multiSelect like --tenants []
+              if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
+                begin
+                  val = JSON.parse(val)
+                rescue
+                  Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+                end
               end
             end
             cur_namespace = custom_options
@@ -489,13 +493,17 @@ module Morpheus
 
           when :query, :query_filters
             # arbitrary query parameters in the format -Q "category=web&phrase=nginx"
+            # or pass it many times like -Q foo=bar -Q hello=world
             opts.on( '-Q', '--query PARAMS', "Query parameters. PARAMS format is 'foo=bar&category=web'" ) do |val|
-              options[:query_filters_raw] = val
-              options[:query_filters] = {}
-              # todo: smarter parsing
+              if options[:query_filters_raw] && !options[:query_filters_raw].empty?
+                options[:query_filters_raw] += ("&" + val)
+              else
+                options[:query_filters_raw] = val
+              end
+              options[:query_filters] ||= {}
               val.split('&').each do |filter| 
                 k, v = filter.split('=')
-                # allow "woot:true instead of woot=true"
+                # allow woot:true instead of woot=true
                 if (k.include?(":") && v == nil)
                   k, v = k.split(":")
                 end
@@ -524,6 +532,12 @@ module Morpheus
               end
             end
 
+          when :find_by_name
+            opts.on('--find-by-name', "Always treat the identifier argument as a name, never an ID. Useful for specifying names that look like numbers. eg. '1234'" ) do
+              options[:find_by_name] = true
+            end
+            # opts.add_hidden_option('--find-by-name') if opts.is_a?(Morpheus::Cli::OptionParser)
+
           when :remote
             opts.on( '-r', '--remote REMOTE', "Remote name. The current remote is used by default." ) do |val|
               options[:remote] = val
@@ -1237,17 +1251,18 @@ module Morpheus
           end
         end
         if options[:outfile]
+          full_outfile = File.expand_path(options[:outfile])
           if output
             print_to_file(output, options[:outfile], options[:overwrite])
-            print "#{cyan}Wrote output to file #{options[:outfile]} (#{File.size(options[:outfile])} B)\n" unless options[:quiet]
+            print "#{cyan}Wrote output to file #{options[:outfile]} (#{File.size(full_outfile)} B)\n" unless options[:quiet]
           else
             # uhhh ok lets try this
-            Morpheus::Logging::DarkPrinter.puts "using experimental feature: --outfile without a common format like json, yml or csv" if Morpheus::Logging.debug?
+            Morpheus::Logging::DarkPrinter.puts "using experimental feature: --out without a common format like json, yml or csv" if Morpheus::Logging.debug?
             result = with_stdout_to_file(options[:outfile], options[:overwrite], 'w+', &block)
-            print "#{cyan}Wrote output to file #{options[:outfile]} (#{File.size(options[:outfile])} B)\n" unless options[:quiet]
-            if result
+            if result && result != 0
               return result
             end
+            print "#{cyan}Wrote output to file #{options[:outfile]} (#{File.size(full_outfile)} B)\n" unless options[:quiet]
             return 0, nil
           end
         else

data/lib/morpheus/cli/cloud_resource_pools_command.rb

@@ -326,6 +326,9 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource pool") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--default-pool [on|off]', String, "Set resource pool as the default") do |val|
+        options['defaultPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a resource pool." + "\n" +
                     "[cloud] is required. This is the name or id of the cloud."
@@ -437,6 +440,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
         else
           payload['resourcePool']['active'] = true
         end
+
+        # Default
+        if options['defaultPool'] != nil
+          payload['resourcePool']['defaultPool'] = options['defaultPool']
+        end
         
         # Visibility
         if options['visibility'] != nil
@@ -552,6 +560,9 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource pool") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--default-pool [on|off]', String, "Set resource pool as the default") do |val|
+        options['defaultPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a resource pool." + "\n" +
                     "[cloud] is required. This is the name or id of the cloud." + "\n"
@@ -641,6 +652,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
         if options['active'] != nil
           payload['resourcePool']['active'] = options['active']
         end
+
+        # Default
+        if options['defaultPool'] != nil
+          payload['resourcePool']['defaultPool'] = options['defaultPool']
+        end
         
         # Visibility
         if options['visibility'] != nil

data/lib/morpheus/cli/clouds.rb

@@ -46,11 +46,15 @@ class Morpheus::Cli::Clouds
       opts.on( '-t', '--type TYPE', "Cloud Type" ) do |val|
         options[:zone_type] = val
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
       opts.footer = "List clouds."
     end
     optparse.parse!(args)
     connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     begin
       if options[:zone_type]
         cloud_type = cloud_type_for_name(options[:zone_type])
@@ -71,15 +75,7 @@ class Morpheus::Cli::Clouds
       end
 
       json_response = @clouds_interface.list(params)
-      if options[:json]
-        puts as_json(json_response, options, "zones")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "zones")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response['zones'], options)
-      else
+      render_response(json_response, options, 'zones') do
         clouds = json_response['zones']
         title = "Morpheus Clouds"
         subtitles = []
@@ -99,6 +95,7 @@ class Morpheus::Cli::Clouds
         end
         print reset,"\n"
       end
+      return 0, nil
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

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/commands/standard/source_command.rb

@@ -14,7 +14,7 @@ class Morpheus::Cli::SourceCommand
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus #{command_name} [file] [file2]"
       build_common_options(opts, options, [])
-      opts.footer = "This will execute a file, treatin it as a script of morpheus commands"
+      opts.footer = "This will execute a file as a script where each line is a morpheus command or expression."
     end
     optparse.parse!(args)
     if args.count < 1

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

@@ -0,0 +1,76 @@
+require 'morpheus/cli/cli_command'
+require 'json'
+
+# This is for use in dotfile scripts and the shell..
+class Morpheus::Cli::UpdateCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :update
+
+  def handle(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name}"
+      opts.on( '-f', '--force', "Force Update, executes update even if latest version is already installed." ) do
+        options[:force] = true
+      end
+      build_common_options(opts, options, [:dry_run, :quiet])
+      opts.footer = "This will update the morpheus command line interface to the latest version.\nThis is done by executing the system command: `gem update #{morpheus_gem_name}`"
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:0)
+
+    current_version = Morpheus::Cli::VERSION
+    latest_version = get_latest_version()
+    latest_version = latest_version
+    
+    if current_version == latest_version && !options[:force]
+      unless options[:quiet]
+        print cyan, "The latest version is already installed. (#{latest_version})", "\n", reset
+      end
+      return 0, nil
+    end
+
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to update the #{morpheus_gem_name} gem from version #{current_version} to version #{latest_version}?")
+      return 9, "aborted command"
+    end
+
+    gem_update_command = "gem update #{morpheus_gem_name}"
+
+    if options[:dry_run]
+      unless options[:quiet]
+        print "\n"
+        print "#{cyan}#{bold}#{dark}COMMAND#{reset}\n"
+        puts gem_update_command
+        print "\n", reset
+      end
+      return 0, nil
+    end
+    
+    # ok, update it
+    if options[:quiet]
+      system(gem_update_command)
+    else
+      `#{gem_update_command}`
+    end
+
+    if $?.success?
+      return 0, nil
+    else
+      return $?.exitstatus, "update failed"
+    end
+
+  end
+
+  protected
+
+  def morpheus_gem_name
+    'morpheus-cli'
+  end
+
+  def get_latest_version
+    result = HTTP.get("https://rubygems.org/api/v1/gems/#{morpheus_gem_name}.json")
+    json_response = JSON.parse(result.body)
+    json_response["version"]
+  end
+
+end

data/lib/morpheus/cli/containers_command.rb

@@ -35,6 +35,9 @@ class Morpheus::Cli::ContainersCommand
       opts.on( nil, '--actions', "Display Available Actions" ) do
         options[:include_available_actions] = true
       end
+      opts.on( nil, '--costs', "Display Cost and Price" ) do
+        options[:include_costs] = true
+      end
       opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "running,failed"
         if !val.to_s.empty?
@@ -99,6 +102,8 @@ class Morpheus::Cli::ContainersCommand
         "Name" => lambda {|it| it['server'] ? it['server']['name'] : '(no server)' }, # there is a server.displayName too?
         "Type" => lambda {|it| it['containerType'] ? it['containerType']['name'] : '' },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        # "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        # "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Instance" => lambda {|it| it['instance'] ? it['instance']['name'] : '' },
         "Host" => lambda {|it| it['server'] ? it['server']['name'] : '' },
         "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
@@ -133,6 +138,15 @@ class Morpheus::Cli::ContainersCommand
         end
       end
 
+      if options[:include_costs]
+        print_h2 "Container Cost"
+        cost_columns = {
+          "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+          "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        }
+        print_description_list(cost_columns, container)
+      end
+
       print reset, "\n"
 
       # refresh until a status is reached

data/lib/morpheus/cli/deployments.rb

@@ -388,7 +388,7 @@ EOT
       deployment = find_deployment_by_name_or_id(args[0])
       return 1 if deployment.nil?
     else
-      deployment_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'deploymentId', 'fieldLabel' => 'Deployment', 'type' => 'select', 'required' => true, 'description' => 'Deployment to add version to', 'optionSource' => lambda {
+      deployment_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'deploymentId', 'fieldLabel' => 'Deployment', 'type' => 'select', 'required' => true, 'description' => 'Deployment to add version to', 'optionSource' => lambda { |api_client, api_params|
         @deployments_interface.list(max:10000)['deployments'].collect {|it|
           {'name' => it['name'], 'value' => it['id']}
         }

data/lib/morpheus/cli/hosts.rb

@@ -119,6 +119,10 @@ class Morpheus::Cli::Hosts
     end
     optparse.parse!(args)
     connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     begin
       params.merge!(parse_list_options(options))
       account = nil
@@ -392,6 +396,9 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on( nil, '--costs', "Display Cost and Price" ) do
+        options[:include_costs] = true
+      end
       opts.on('--refresh [SECONDS]', String, "Refresh until status is provisioned,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "provisioned,failed"
         if !val.to_s.empty?
@@ -453,7 +460,7 @@ class Morpheus::Cli::Hosts
       title = "Host Details"
       print_h1 title, [], options
       print cyan
-      print_description_list({
+      server_columns = {
         "ID" => 'id',
         "Name" => 'name',
         "Description" => 'description',
@@ -463,12 +470,23 @@ class Morpheus::Cli::Hosts
         "Type" => lambda {|it| it['computeServerType'] ? it['computeServerType']['name'] : 'unmanaged' },
         "Platform" => lambda {|it| it['serverOs'] ? it['serverOs']['name'].upcase : 'N/A' },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Agent" => lambda {|it| it['agentInstalled'] ? "#{server['agentVersion'] || ''} updated at #{format_local_dt(server['lastAgentUpdate'])}" : '(not installed)' },
         "Status" => lambda {|it| format_server_status(it) },
         "Nodes" => lambda {|it| it['containers'] ? it['containers'].size : 0 },
         "Power" => lambda {|it| format_server_power_state(it) },
-      }, server)
+      }
       
+      if server['hourlyCost'].to_f == 0
+        server_columns.delete("Cost")
+      end
+      if server['hourlyPrice'].to_f == 0 || server['hourlyPrice'] == server['hourlyCost']
+        server_columns.delete("Price")
+      end
+
+      print_description_list(server_columns, server)
+
       if server['statusMessage']
         print_h2 "Status Message", options
         if server['status'] == 'failed'
@@ -485,6 +503,16 @@ class Morpheus::Cli::Hosts
 
       print_h2 "Host Usage", options
       print_stats_usage(stats)
+
+      if options[:include_costs]
+        print_h2 "Host Cost"
+        cost_columns = {
+          "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+          "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        }
+        print_description_list(cost_columns, server)
+      end
+
       print reset, "\n"
 
 

data/lib/morpheus/cli/instances.rb

@@ -96,7 +96,10 @@ class Morpheus::Cli::Instances
       opts.footer = "List instances."
     end
     optparse.parse!(args)
-    verify_args!(args:args, count:0, optparse:optparse)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       params.merge!(parse_list_options(options))
@@ -1148,6 +1151,9 @@ class Morpheus::Cli::Instances
       opts.on( nil, '--scaling', "Display Instance Scaling Settings" ) do
         options[:include_scaling] = true
       end
+      opts.on( nil, '--costs', "Display Cost and Price" ) do
+        options[:include_costs] = true
+      end
       opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "running,failed"
         if !val.to_s.empty?
@@ -1249,6 +1255,8 @@ class Morpheus::Cli::Instances
         "Layout" => lambda {|it| it['layout'] ? it['layout']['name'] : '' },
         "Version" => lambda {|it| it['instanceVersion'] },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        # "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        # "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Environment" => 'instanceContext',
         "Labels" => lambda {|it| it['tags'] ? it['tags'].join(',') : '' },
         "Metadata" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
@@ -1304,6 +1312,16 @@ class Morpheus::Cli::Instances
         print_h2 "Instance Usage", options
         print_stats_usage(stats)
       end
+
+      if options[:include_costs]
+        print_h2 "Instance Cost"
+        cost_columns = {
+          "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+          "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        }
+        print_description_list(cost_columns, instance)
+      end
+
       print reset, "\n"
 
       # if options[:include_lb]