morpheus-cli 5.5.1.4 → 5.5.2

data/lib/morpheus/cli/commands/clouds.rb

@@ -7,6 +7,7 @@ class Morpheus::Cli::Clouds
 
   register_subcommands :list, :count, :get, :add, :update, :remove, :refresh, :security_groups, :apply_security_groups, :types => :list_cloud_types
   register_subcommands :wiki, :update_wiki
+  register_subcommands({:'update-logo' => :update_logo,:'update-dark-logo' => :update_dark_logo})
   #register_subcommands :firewall_disable, :firewall_enable
   alias_subcommand :details, :get
   set_default_subcommand :list
@@ -342,6 +343,10 @@ class Morpheus::Cli::Clouds
       opts.on('--credential VALUE', String, "Credential ID or \"local\"" ) do |val|
         options[:options]['credential'] = val
       end
+      opts.on('--default-cloud-logos', "Reset logos to default cloud logos, removing any custom logo and dark logo" ) do
+        options[:options]['defaultCloudLogos'] = true
+      end
+      
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -416,6 +421,9 @@ class Morpheus::Cli::Clouds
     query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on('--remove-resources [on|off]', ['on','off'], "Remove Associated Resources. Default is off.") do |val|
+        query_params[:removeResources] = val.nil? ? 'on' : val
+      end
       opts.on( '-f', '--force', "Force Remove" ) do
         query_params[:force] = 'on'
       end
@@ -953,6 +961,106 @@ class Morpheus::Cli::Clouds
     end
   end
 
+  def update_logo(args)
+    options = {}
+    params = {}
+    filename = nil
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name] [file]")
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = <<-EOT
+Update the logo for a cloud.
+[name] is required. This is the name or id of a cloud.
+[file] is required. This is the path of the logo file
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    layout_id = args[0]
+    filename = args[1]
+    begin
+      cloud = find_cloud_by_name_or_id(args[0])
+      return 1 if cloud.nil?
+      logo_file = nil
+      if filename == 'null'
+        logo_file = 'null' # clear it
+      else
+        filename = File.expand_path(filename)
+        if !File.exists?(filename)
+          print_red_alert "File not found: #{filename}"
+          exit 1
+        end
+        logo_file = File.new(filename, 'rb')
+      end
+      @clouds_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clouds_interface.dry.update_logo(cloud['id'], logo_file)
+        return
+      end
+      json_response = @clouds_interface.update_logo(cloud['id'], logo_file)
+      if options[:json]
+        print JSON.pretty_generate(json_response), "\n"
+        return 0
+      end
+      print_green_success "Updated cloud #{cloud['name']} logo"
+      _get(cloud['id'], params, options)
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  def update_dark_logo(args)
+    options = {}
+    params = {}
+    filename = nil
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name] [file]")
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = <<-EOT
+Update the logo for a cloud.
+[name] is required. This is the name or id of a cloud.
+[file] is required. This is the path of the dark logo file
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    layout_id = args[0]
+    filename = args[1]
+    begin
+      cloud = find_cloud_by_name_or_id(args[0])
+      return 1 if cloud.nil?
+      dark_logo_file = nil
+      if filename == 'null'
+        dark_logo_file = 'null' # clear it
+      else
+        filename = File.expand_path(filename)
+        if !File.exists?(filename)
+          print_red_alert "File not found: #{filename}"
+          exit 1
+        end
+        dark_logo_file = File.new(filename, 'rb')
+      end
+      @clouds_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clouds_interface.dry.update_logo(cloud['id'], nil, dark_logo_file)
+        return
+      end
+      json_response = @clouds_interface.update_logo(cloud['id'], nil, dark_logo_file)
+      if options[:json]
+        print JSON.pretty_generate(json_response), "\n"
+        return 0
+      end
+      print_green_success "Updated cloud #{cloud['name']} dark logo"
+      _get(cloud['id'], params, options)
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
   private
 
   def cloud_list_column_definitions(options)
@@ -986,7 +1094,7 @@ class Morpheus::Cli::Clouds
 
     if cloud_type && cloud_type['optionTypes']
       if !cloud_type['optionTypes'].find {|opt| opt['type'] == 'credential'}
-        tmp_option_types << {'fieldName' => 'type', 'fieldLabel' => 'Credentials', 'type' => 'credential', 'optionSource' => 'credentials', 'required' => true, 'defaultValue' => 'local', 'config' => {'credentialTypes' => ['username-password']}, 'displayOrder' => 7}
+        tmp_option_types << {'fieldName' => 'type', 'fieldLabel' => 'Credentials', 'type' => 'credential', 'optionSource' => 'credentials', 'required' => true, 'defaultValue' => 'local', 'config' => {'credentialTypes' => get_cloud_type_credential_types(cloud_type['code'])}, 'displayOrder' => 7}
         cloud_type['optionTypes'].select {|opt| ['username', 'password', 'serviceUsername', 'servicePassword'].include?(opt['fieldName'])}.each {|opt| opt['localCredential'] = true}
       end
       # adjust displayOrder to put these at the end
@@ -1043,4 +1151,22 @@ class Morpheus::Cli::Clouds
       {'fieldName' => 'content', 'fieldLabel' => 'Content', 'type' => 'textarea', 'required' => false, 'displayOrder' => 3, 'description' => 'The content (markdown) of the wiki page.'}
     ]
   end
+
+  def get_cloud_type_credential_types(cloud_type_code)
+    case cloud_type_code
+    when "amazon", "alibaba"
+      ['access-key-secret']
+    when "azure","azurestack"
+      ['client-id-secret']
+    when "google"
+      ['email-private-key']
+    when "softlayer"
+      ['username-api-key']
+    when "digitalocean"
+      ['username-api-key']
+    else
+      ['username-password']
+    end
+  end
+
 end

data/lib/morpheus/cli/commands/clusters.rb

@@ -51,8 +51,15 @@ class Morpheus::Cli::Clusters
 
   def list(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List clusters."
     end
@@ -62,7 +69,6 @@ class Morpheus::Cli::Clusters
     end
     connect(options)
     begin
-      params = {}
       params.merge!(parse_list_options(options))
       @clusters_interface.setopts(options)
       if options[:dry_run]
@@ -203,6 +209,8 @@ class Morpheus::Cli::Clusters
       description_cols = {
           "ID" => 'id',
           "Name" => 'name',
+          "Description" => 'description',
+          "Labels" => lambda {|it| format_list(it['labels']) rescue '' },
           "Type" => lambda { |it| it['type']['name'] },
           #"Group" => lambda { |it| it['site']['name'] },
           "Cloud" => lambda { |it| it['zone']['name'] },
@@ -373,15 +381,19 @@ class Morpheus::Cli::Clusters
       opts.on( '--resource-name NAME', "Resource Name" ) do |val|
         options[:resourceName] = val.to_s
       end
-      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang' (sets server tags only)") do |val|
         options[:metadata] = val
       end
-      opts.on('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+      opts.on('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang' (sets server tags only)") do |val|
         options[:metadata] = val
       end
       opts.add_hidden_option('--metadata')
-      opts.on('--labels LIST', String, "Tags") do |val|
-        options[:labels] = val
+      opts.on('-l', '--labels [LIST]', String, "Labels (sets both cluster and server)") do |val|
+        options[:labels] = parse_labels(val)
+        options[:resource_labels] ||= options[:labels]
+      end
+      opts.on('--resource-labels [LIST]', String, "Resource Labels (override server labels)") do |val|
+        options[:resource_labels] = parse_labels(val)
       end
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
         options[:group] = val
@@ -439,6 +451,13 @@ class Morpheus::Cli::Clusters
         if options[:description]
           payload['cluster']['description'] = options[:description]
         end
+        if options[:labels]
+          payload['cluster']['labels'] = options[:labels]
+        end
+        if options[:resource_labels]
+          payload['cluster']['server'] ||= {}
+          payload['cluster']['server']['labels'] = options[:resource_labels]
+        end
       else
         cluster_payload = {}
         server_payload = {"config" => {}}
@@ -517,13 +536,20 @@ class Morpheus::Cli::Clusters
         description = options[:description] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'type' => 'text', 'fieldLabel' => 'Description', 'required' => false, 'description' => 'Resource Description.'}],options[:options],@api_client,{})['description']
         cluster_payload['description'] = description if description
 
+        # Labels
         labels = options[:labels]
-
         if !labels && !options[:no_prompt]
-          labels = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'type' => 'text', 'fieldLabel' => 'Resource Labels', 'required' => false, 'description' => 'Resource Labels.'}],options[:options],@api_client,{})['labels']
+          labels = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'type' => 'text', 'fieldLabel' => 'Labels', 'required' => false, 'description' => 'Resource Labels.'}],options[:options],@api_client,{})['labels']
+        end
+        if labels
+          cluster_payload['labels'] = labels
+          server_payload['labels'] = labels
         end
 
-        server_payload['labels'] = labels if labels
+        # --resource-labels to override
+        if options[:resource_labels]
+          server_payload['labels'] = options[:resource_labels]
+        end
 
         # Cloud / Zone
         cloud_id = nil
@@ -733,6 +759,9 @@ class Morpheus::Cli::Clusters
       opts.on("--description [TEXT]", String, "Updates Cluster Description") do |val|
         options[:description] = val.to_s
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:labels] = parse_labels(val)
+      end
       opts.on("--api-url [TEXT]", String, "Updates Cluster API Url") do |val|
         options[:apiUrl] = val.to_s
       end
@@ -782,6 +811,7 @@ class Morpheus::Cli::Clusters
         cluster_payload = {}
         cluster_payload['name'] = options[:name] if !options[:name].empty?
         cluster_payload['description'] = options[:description] if !options[:description].empty?
+        cluster_payload['labels'] = options[:labels] if !options[:labels].nil?
         cluster_payload['enabled'] = options[:active] if !options[:active].nil?
         cluster_payload['managed'] = options[:managed] if !options[:managed].nil?
         cluster_payload['serviceUrl'] = options[:apiUrl] if !options[:apiUrl].nil?
@@ -1135,8 +1165,8 @@ class Morpheus::Cli::Clusters
         options[:metadata] = val
       end
       opts.add_hidden_option('--metadata')
-      opts.on('--labels LIST', String, "Tags") do |val|
-        options[:labels] = val
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:labels] = parse_labels(val)
       end
       add_server_options(opts, options)
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
@@ -3630,7 +3660,7 @@ class Morpheus::Cli::Clusters
     rows = clusters.collect do |cluster|
       {
           id: cluster['id'],
-          display_name: cluster['displayName'],
+          labels: truncate_string(format_list(cluster['labels']), 30),
           name: cluster['name'],
           type: (cluster['type']['name'] rescue ''),
           layout: (cluster['layout']['name'] rescue ''),
@@ -3640,7 +3670,7 @@ class Morpheus::Cli::Clusters
       }
     end
     columns = [
-        :id, :name, :display_name, :type, :layout, :workers, :cloud, :status
+        :id, :name, :labels, :type, :layout, :workers, :cloud, :status
     ]
     print as_pretty_table(rows, columns, opts)
   end

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

@@ -3,183 +3,162 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::CurlCommand
   include Morpheus::Cli::CliCommand
   set_command_name :curl
-  set_command_hidden
 
   def handle(args)
-    # 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
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = "Usage: morpheus curl [path] -- [*args]"
+      opts.banner = "Usage: morpheus curl [path]"
       opts.on( '-p', '--pretty', "Print result as parsed JSON. Alias for -j" ) do
         options[:json] = true
       end
       opts.on( '-X', '--request METHOD', "HTTP request method. Default is GET" ) do |val|
         curl_method = val
       end
-      opts.on( '-v', '--verbose', "Print verbose output." ) do
-        curl_verbsose = true
+      opts.on( '--post', "Set the HTTP request method to POST" ) do
+        curl_method = "POST"
+      end
+      opts.on( '--put', "Set the HTTP request method to PUT" ) do
+        curl_method = "POST"
+      end
+      opts.on( '--delete', "Set the HTTP request method to DELETE" ) do
+        curl_method = "DELETE"
       end
       opts.on( '--data DATA', String, "HTTP request body for use with POST and PUT, typically JSON." ) do |val|
         curl_data = val
       end
-      opts.on( '--progress', '--progress', "Display progress output by excluding the -s option." ) do
-        show_progress = true
+      opts.on('--absolute', "Absolute path, value can be used to prevent automatic using the automatic /api/ path prefix to the path by default.") do
+        options[:absolute_path] = true
+      end
+      opts.on('--inspect', "Inspect response, prints headers. By default only the body is printed.") do
+        options[:inspect_response] = true
       end
-      build_common_options(opts, options, [:dry_run, :json, :remote])
-      opts.add_hidden_option('--curl')
-      #opts.add_hidden_option('--scrub')
+      build_standard_api_options(opts, options)
       opts.footer = <<-EOT
-This invokes the `curl` command with url "appliance_url/$0
-and includes the authorization header -H "Authorization: Bearer access_token"
-Arguments for the curl command should be passed after ' -- '
-Example: morpheus curl "/api/servers/1" -- -XGET -sv
+Execute an HTTP request against the remote appliance api to an arbitrary path.
+[path] is required. This is the path to path to request. By default 
+By default the "/api" prefix is included in the request path.
+The --absolute option ban be used to supress this.
+
+Examples: 
+    morpheus curl "/api/whoami"
+    morpheus curl whoami
+    morpheus curl apps -r demo
 
 EOT
     end
+
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      return false
-    end
-    
-    if !command_available?("curl")
-      print "#{red}The 'curl' command is not available on your system.#{reset}\n"
-      return false
-    end
+    verify_args!(args:args, optparse:optparse, count: 1)
     
+    # establish api client with connection, skips verification so check for appliance is done afterwards
     @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
-
     if !@appliance_name
       raise_command_error "#{command_name} requires a remote to be specified, use -r [remote] or set the active remote with `remote use`"
     end
 
-    # curry --insecure to curl
-    if options[:insecure] || !Morpheus::RestClient.ssl_verification_enabled?
-      #curl_args.unshift "-k"
-      curl_args.unshift "--insecure"
-    end
-
-    if !@appliance_url
-      raise "Unable to determine remote appliance url"
-      print "#{red}Unable to determine remote appliance url.#{reset}\n"
-      return false
-    end
-
-    # determine curl url
-    url = nil
+    # determine curl url, base_url is automatically applied
     api_path = args[0].to_s.strip
-    # allow absolute path for the current appliance url only
-    if api_path.match(/^#{Regexp.escape(@appliance_url)}/)
-      url = api_path
+    # by default /api/ prefix is prepended
+    if options[:absolute_path] || api_path.start_with?("http:") || api_path.start_with?("https:")
+      api_path = api_path
     else
-      api_path = api_path.sub(/^\//, "") # strip leading slash
-      url = "#{@appliance_url.chomp('/')}/#{api_path}"
-    end
-    curl_cmd = "curl"
-    if show_progress == false
-      curl_cmd << " -s"
-    end
-    if curl_verbsose
-      curl_cmd << " -v"
+      api_path = "/#{api_path}" unless api_path.start_with?("/")
+      api_path = "/api#{api_path}" unless api_path.start_with?("/api")
     end
-    if curl_method
-      curl_cmd << " -X#{curl_method}"
-    end
-    curl_cmd << " \"#{url}\""
-    if @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
+      
+    # build query parameters from --query k=v
+    query_params = parse_query_options(options)
+
+    # build payload from --payload '{}' and --option k=v
+    payload = parse_payload(options)
 
+    request_opts = {}
+    request_opts[:method] = curl_method ? curl_method.to_s.downcase.to_sym : :get
+    request_opts[:url] = api_path
+    request_opts[:headers] = options[:headers] if options[:headers]
+    request_opts[:params] = query_params
+    request_opts[:payload] = payload # if [:post, :put].include?(request_opts[:method])
+    request_opts[:parse_json] = false
+    @api_client.setopts(options)
     if options[:dry_run]
-      print cyan
-      print "#{cyan}#{curl_cmd_str}#{reset}"
-      print "\n\n"
-      print reset
-      return 0
+      print_dry_run @api_client.dry.execute(request_opts)
+      return
     end
-    exit_code, err = 0, nil
-    # print cyan
-    # print "#{cyan}#{curl_cmd_str}#{reset}"
-    # print "\n\n"
-    print reset
-    # print result
-    curl_output = `#{curl_cmd}`
+    api_response = nil
+    json_response = nil
+    begin
+      api_response = @api_client.execute(request_opts)
+    rescue ::RestClient::Exception => e
 
-    if $?.success? != true
-      exit_code = $?.exitstatus
-      err = "curl command exited non-zero"
-    end
-    json_response = {}
-    other_output = nil
-    if options[:json] || options[:yaml] || options[:csv]
-      output_lines = curl_output.split("\n")
-      last_line = output_lines.pop
-      if output_lines.size > 0
-        other_output = output_lines.join("\n")
+      exit_code = 1
+      err = e.message
+      #raise e
+      api_response = e.response
+      # did not get a response?
+      if api_response.nil?
+        print_rest_exception(e, options)
+        return 1, e.message
       end
+    end
+    if api_response.nil?
+      print_rest_exception(e, options)
+      return 1, e.message
+    end
+    response_is_ok = (api_response.code.to_i >= 200 && api_response.code.to_i < 400)
+    response_is_json = api_response.headers[:content_type].to_s.start_with?("application/json")
+    if response_is_json && options[:inspect_response] != true
+      # render as json by default, so -f just works
+      # options[:json] = true unless options[:csv] ||  options[:yaml]
       begin
-        json_response = JSON.parse(last_line)
-      rescue => ex
-        puts_error curl_output
-        print_red_alert "failed to parse curl result as JSON data Error: #{ex.message}"
-
-        exit_code = 2
-        err = "failed to parse curl result as JSON data Error: #{ex.message}"
-        return exit_code, err
+        json_response = JSON.parse(api_response.body.to_s)
+      rescue => e
+        puts_error "Failed to parse response as JSON. Error: #{e}"
+        # json_response = {}
+      end
+      # this should be default behavior, but use the first key if it is a Hash or Array
+      object_key = nil
+      if json_response && json_response.keys.first && [Hash,Array].include?(json_response[json_response.keys.first].class)
+        object_key = json_response.keys.first
+      end
+      render_response(json_response, options, object_key) do
+        output = ""
+        output << red if !response_is_ok
+        # just render the json by default, non pretty..
+        output << JSON.fast_generate(json_response)
+        output << "\n"
+        output << reset
+        if exit_code == 1
+          print output
+        elsif
+          print_error output
+        end
       end
     else
-      other_output = curl_output
-    end
-    curl_object_key = nil # json_response.keys.first
-    render_response(json_response, options, curl_object_key) do
-      puts other_output
+      output = ""
+      output << red if !response_is_ok
+      if options[:inspect_response]
+        # instead http response (version and headers)
+        output << "HTTP/#{api_response.net_http_res.http_version} #{api_response.code}\n"
+        api_response.net_http_res.each_capitalized.each do |k,v|
+          output << "#{k}: #{v}\n"
+        end
+        output << "\n"
+        output << api_response.body.to_s
+      else
+        output << api_response.body.to_s
+      end
+      output << "\n"
+      output << reset
+      if exit_code == 0
+        print output
+      elsif
+        print_error output
+      end
     end
     return exit_code, err
   end
 
-  def command_available?(cmd)
-    has_it = false
-    begin
-      system("which #{cmd} > /dev/null 2>&1")
-      has_it = $?.success?
-    rescue => e
-      raise e
-    end
-    return has_it
-  end
-
 end