morpheus-cli 4.1.8 → 4.1.9

data/lib/morpheus/cli/cli_command.rb

@@ -228,7 +228,7 @@ module Morpheus
                     nested_options = nested_options[name_element]
                   else
                     val = custom_option_args[1]
-                    if val.to_s[0] == '{' && val.to_s[-1] == '}'
+                    if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
                       begin
                         val = JSON.parse(val)
                       rescue
@@ -240,7 +240,7 @@ module Morpheus
                 end
               else
                 val = custom_option_args[1]
-                if val.to_s[0] == '{' && val.to_s[-1] == '}'
+                if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
                   begin
                     val = JSON.parse(val)
                   rescue
@@ -897,6 +897,7 @@ module Morpheus
       end
 
       # parse the parameters provided by the common :list options
+      # this includes the :query options too via parse_query_options().
       # returns Hash of params the format {"phrase": => "foobar", "max": 100}
       def parse_list_options(options={})
         list_params = {}
@@ -908,6 +909,16 @@ module Morpheus
           end
         end
         # arbitrary filters
+        list_params.merge!(parse_query_options(options))
+        
+        return list_params
+      end
+
+      # parse the parameters provided by the common :query (:query_filters) options
+      # returns Hash of params the format {"phrase": => "foobar", "max": 100}
+      def parse_query_options(options={})
+        list_params = {}
+        # arbitrary filters
         if options[:query_filters]
           options[:query_filters].each do |k, v|
             if k

data/lib/morpheus/cli/cli_registry.rb

@@ -80,6 +80,7 @@ module Morpheus
           elsif has_command?(command_name)
             instance.get(command_name).new.handle(args)
           else
+            # todo: need to just return error instead of raise
             raise Morpheus::Cli::CommandError.new("'#{command_name}' is not a command. See 'morpheus --help'.")
           end
         end

data/lib/morpheus/cli/clusters.rb

@@ -41,7 +41,7 @@ class Morpheus::Cli::Clusters
     @servers_interface = @api_client.servers
     @server_types_interface = @api_client.server_types
     @options_interface = @api_client.options
-    @active_group_id = Morpheus::Cli::Groups.active_group
+    @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
     @provision_types_interface = @api_client.provision_types
     @service_plans_interface = @api_client.service_plans
     @user_groups_interface = @api_client.user_groups
@@ -837,6 +837,21 @@ class Morpheus::Cli::Clusters
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[cluster]")
+      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start timestamp. Default is 30 days ago.") do |val|
+        options[:start] = parse_time(val) #.utc.iso8601
+      end
+      opts.on('--end TIMESTAMP','--end TIMESTAMP', "End timestamp. Default is now.") do |val|
+        options[:end] = parse_time(val) #.utc.iso8601
+      end
+      opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
+        params['level'] = params['level'] ? [params['level'], val].flatten : val
+      end
+      opts.on('--table', '--table', "Format ouput as a table.") do
+        options[:table] = true
+      end
+      opts.on('-a', '--all', "Display all details: entire message." ) do
+        options[:details] = true
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -848,28 +863,39 @@ class Morpheus::Cli::Clusters
       cluster = find_cluster_by_name_or_id(args[0])
       params = {}
       params.merge!(parse_list_options(options))
-      params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      params['query'] = params.delete('phrase') if params['phrase']
+      params['startMs'] = (options[:start].to_i * 1000) if options[:start]
+      params['endMs'] = (options[:end].to_i * 1000) if options[:end]
       @logs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.cluster_logs(cluster['id'], params)
         return
       end
       json_response = @logs_interface.cluster_logs(cluster['id'], params)
-      render_result = render_with_format(json_response, options, 'data')
+      render_result = json_response['logs'] ? render_with_format(json_response, options, 'logs') : render_with_format(json_response, options, 'data')
       return 0 if render_result
 
       logs = json_response
       title = "Cluster Logs: #{cluster['name']}"
       subtitles = parse_list_subtitles(options)
+      if options[:start]
+        subtitles << "Start: #{options[:start]}".strip
+      end
+      if options[:end]
+        subtitles << "End: #{options[:end]}".strip
+      end
       if params[:query]
         subtitles << "Search: #{params[:query]}".strip
       end
-      # todo: startMs, endMs, sorts insteaad of sort..etc
+      if params['level']
+        subtitles << "Level: #{params['level']}"
+      end
+      logs = json_response['data'] || json_response['logs']
       print_h1 title, subtitles, options
-      if logs['data'].empty?
+      if logs.empty?
         puts "#{cyan}No logs found.#{reset}"
       else
-        logs['data'].each do |log_entry|
+        logs.each do |log_entry|
           log_level = ''
           case log_entry['level']
           when 'INFO'
@@ -923,7 +949,7 @@ class Morpheus::Cli::Clusters
           payload['permissions'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
         end
       else
-        payload = {"permissions" => prompt_permissions(options)}
+        payload = {"permissions" => prompt_permissions(options.merge({:available_plans => namespace_service_plans}))}
       end
 
       @clusters_interface.setopts(options)
@@ -2623,7 +2649,7 @@ class Morpheus::Cli::Clusters
       opts.on('--active [on|off]', String, "Enable datastore") do |val|
         options[:active] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
-      add_perms_options(opts, options, ['planAccess', 'groupAccessDefaults'])
+      add_perms_options(opts, options, ['plans', 'groupDefaults'])
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a cluster datastore.\n" +
           "[cluster] is required. This is the name or id of an existing cluster.\n" +
@@ -2655,7 +2681,7 @@ class Morpheus::Cli::Clusters
         payload = {'datastore' => {}}
         payload['datastore']['active'] = options[:active].nil? ? (Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'description' => 'Datastore Active', 'defaultValue' => true}], options[:options], @api_client))['active'] == 'on' : options[:active]
 
-        perms = prompt_permissions(options, datastore['owner']['id'] == current_user['accountId'] ? ['planAccess', 'groupAccessDefaults'] : ['planAccess', 'groupAccessDefaults', 'visibility', 'tenants'])
+        perms = prompt_permissions(options.merge({:available_plans => namespace_service_plans}), datastore['owner']['id'] == current_user['accountId'] ? ['plans', 'groupDefaults'] : ['plans', 'groupDefaults', 'visibility', 'tenants'])
         perms_payload = {}
         perms_payload['resourcePermissions'] = perms['resourcePermissions'] if !perms['resourcePermissions'].nil?
         perms_payload['tenantPermissions'] = perms['tenantPermissions'] if !perms['tenantPermissions'].nil?
@@ -3102,7 +3128,7 @@ class Morpheus::Cli::Clusters
       return 1 if cluster.nil?
       params = {}
       params.merge!(parse_list_options(options))
-      # params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      # params['query'] = params.delete('phrase') if params['phrase']
       @clusters_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @clusters_interface.dry.history(cluster['id'], params)
@@ -3234,7 +3260,6 @@ class Morpheus::Cli::Clusters
       return 1 if cluster.nil?
       params = {}
       params.merge!(parse_list_options(options))
-      params[:query] = params.delete(:phrase) unless params[:phrase].nil?
       @clusters_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @clusters_interface.dry.history_details(cluster['id'], process_id, params)
@@ -3643,7 +3668,9 @@ class Morpheus::Cli::Clusters
   end
 
   def namespace_service_plans
-    @service_plans_interface.list({'provisionable' => 'any', 'provisionTypeId' => @provision_types_interface.list({'code' => 'docker'})['provisionTypes'].first['id']})['servicePlans'] rescue []
+    @service_plans_interface.list({'provisionable' => 'any', 'provisionTypeId' => @provision_types_interface.list({'code' => 'docker'})['provisionTypes'].first['id']})['servicePlans'].collect {|it|
+      {"name" => it["name"], "value" => it["id"]}
+    } rescue []
   end
 
   def get_cloud_type(id)
@@ -3848,66 +3875,6 @@ class Morpheus::Cli::Clusters
     end
   end
 
-  def add_perms_options(opts, options, excludes = [])
-    if !excludes.include?('groupAccess')
-      opts.on('--group-access-all [on|off]', String, "Toggle Access for all groups.") do |val|
-        options[:groupAccessAll] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
-      end
-      opts.on('--group-access LIST', Array, "Group Access, comma separated list of group IDs.") do |list|
-        if list.size == 1 && list[0] == 'null' # hacky way to clear it
-          options[:groupAccessList] = []
-        else
-          options[:groupAccessList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
-        end
-      end
-      if !excludes.include?('groupAccessDefaults')
-        opts.on('--group-defaults LIST', Array, "Group Default Selection, comma separated list of group IDs") do |list|
-          if list.size == 1 && list[0] == 'null' # hacky way to clear it
-            options[:groupDefaultsList] = []
-          else
-            options[:groupDefaultsList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
-          end
-        end
-      end
-    end
-
-    if !excludes.include?('planAccess')
-      opts.on('--plan-access-all [on|off]', String, "Toggle Access for all service plans.") do |val|
-        options[:planAccessAll] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
-      end
-      opts.on('--plan-access LIST', Array, "Service Plan Access, comma separated list of plan IDs.") do |list|
-        if list.size == 1 && list[0] == 'null' # hacky way to clear it
-          options[:planAccessList] = []
-        else
-          options[:planAccessList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
-        end
-      end
-      opts.on('--plan-defaults LIST', Array, "Plan Default Selection, comma separated list of plan IDs") do |list|
-        if list.size == 1 && list[0] == 'null' # hacky way to clear it
-          options[:planDefaultsList] = []
-        else
-          options[:planDefaultsList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
-        end
-      end
-    end
-
-    if !excludes.include?('visibility')
-      opts.on('--visibility [private|public]', String, "Visibility") do |val|
-        options[:visibility] = val
-      end
-    end
-
-    if !excludes.include?('tenants')
-      opts.on('--tenants LIST', Array, "Tenant Access, comma separated list of account IDs") do |list|
-        if list.size == 1 && list[0] == 'null' # hacky way to clear it
-          options[:tenants] = []
-        else
-          options[:tenants] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
-        end
-      end
-    end
-  end
-
   def prompt_resource_pool(group, cloud, service_plan, provision_type, options)
     resource_pool = nil
 
@@ -3962,7 +3929,7 @@ class Morpheus::Cli::Clusters
     rtn['description'] = options[:description] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'description' => 'Namespace Description', 'required' => false}], options[:options], @api_client)['description']
     rtn['active'] = options[:active].nil? ? (Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'description' => 'Namespace Active', 'defaultValue' => true}], options[:options], @api_client))['active'] == 'on' : options[:active]
 
-    perms = prompt_permissions(options)
+    perms = prompt_permissions(options.merge({:available_plans => namespace_service_plans}))
     if perms['resourcePool'] && !perms['resourcePool']['visibility'].nil?
       rtn['visibility'] = perms['resourcePool']['visibility']
       perms.delete('resourcePool')
@@ -3971,147 +3938,6 @@ class Morpheus::Cli::Clusters
     rtn
   end
 
-  def prompt_permissions(options, excludes = [])
-    all_groups = nil
-    group_access = nil
-    all_plans = nil
-    plan_access = nil
-
-    # Group Access
-    if !excludes.include?('groupAccess')
-      if !options[:groupAccessAll].nil?
-        all_groups = options[:groupAccessAll]
-      end
-
-      if !options[:groupAccessList].empty?
-        group_access = options[:groupAccessList].collect {|site_id| {'id' => site_id.to_i}} || []
-      elsif !options[:no_prompt]
-        available_groups = get_available_groups
-
-        if available_groups.empty?
-          #print_red_alert "No available groups"
-          #exit 1
-        elsif available_groups.count > 1
-          available_groups.unshift({"id" => '0', "name" => "All", "value" => "all"})
-
-          # default to all
-          group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group Access', 'selectOptions' => available_groups, 'required' => false, 'description' => 'Add Group Access.'}], options[:options], @api_client, {})['group']
-
-          if !group_id.nil?
-            if group_id == 'all'
-              all_groups = true
-            else
-              group_access = (excludes.include?('groupAccessDefaults') ? [{'id' => group_id}] : [{'id' => group_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_groups.find{|it| it['id'] == group_id}['name']}' as default?", {:default => false})}])
-            end
-            available_groups = available_groups.reject {|it| it['value'] == group_id}
-
-            while !group_id.nil? && !available_groups.empty? && Morpheus::Cli::OptionTypes.confirm("Add another group access?", {:default => false})
-              group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group Access', 'selectOptions' => available_groups, 'required' => false, 'description' => 'Add Group Access.'}], options[:options], @api_client, {})['group']
-
-              if !group_id.nil?
-                if group_id == 'all'
-                  all_groups = true
-                else
-                  group_access ||= []
-                  group_access << (excludes.include?('groupAccessDefaults') ? {'id' => group_id} : {'id' => group_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_groups.find{|it| it['id'] == group_id}['name']}' as default?", {:default => false})})
-                end
-                available_groups = available_groups.reject {|it| it['value'] == group_id}
-              end
-            end
-          end
-        end
-      end
-    end
-
-    # Plan Access
-    if !excludes.include?('planAccess')
-      if !options[:planAccessAll].nil?
-        all_plans = options[:planAccessAll]
-      end
-
-      if !options[:planAccessList].empty?
-        plan_access = options[:planAccessList].collect {|plan_id| {'id' => plan_id.to_i}}
-      elsif !options[:no_prompt]
-        available_plans = namespace_service_plans.collect {|it| {'id' => it['id'], 'name' => it['name'], 'value' => it['id']} }
-
-        if available_plans.empty?
-          #print_red_alert "No available plans"
-          #exit 1
-        elsif !available_plans.empty? && !options[:no_prompt]
-          available_plans.unshift({"id" => '0', "name" => "All", "value" => "all"})
-
-          # default to all
-          plan_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Service Plan Access', 'selectOptions' => available_plans, 'required' => false, 'description' => 'Add Service Plan Access.'}], options[:options], @api_client, {})['plan']
-
-          if !plan_id.nil?
-            if plan_id == 'all'
-              all_plans = true
-            else
-              plan_access = [{'id' => plan_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_plans.find{|it| it['id'] == plan_id}['name']}' as default?", {:default => false})}]
-            end
-
-            available_plans = available_plans.reject {|it| it['value'] == plan_id}
-
-            while !plan_id.nil? && !available_plans.empty? && Morpheus::Cli::OptionTypes.confirm("Add another service plan access?", {:default => false})
-              plan_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Service Plan Access', 'selectOptions' => available_plans, 'required' => false, 'description' => 'Add Service Plan Access.'}], options[:options], @api_client, {})['plan']
-
-              if !plan_id.nil?
-                if plan_id == 'all'
-                  all_plans = true
-                else
-                  plan_access ||= []
-                  plan_access << {'id' => plan_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_plans.find{|it| it['id'] == plan_id}['name']}' as default?", {:default => false})}
-                end
-                available_plans = available_plans.reject {|it| it['value'] == plan_id}
-              end
-            end
-          end
-        end
-      end
-    end
-
-    resource_perms = {}
-    resource_perms['all'] = all_groups if !all_groups.nil?
-    resource_perms['sites'] = group_access if !group_access.nil?
-    resource_perms['allPlans'] = all_plans if !all_plans.nil?
-    resource_perms['plans'] = plan_access if !plan_access.nil?
-
-    permissions = {'resourcePermissions' => resource_perms}
-
-    available_accounts = @accounts_interface.list()['accounts'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
-    accounts = []
-
-    # Prompts for multi tenant
-    if available_accounts.count > 1
-      visibility = options[:visibility] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'visibility', 'fieldLabel' => 'Tenant Permissions Visibility', 'type' => 'select', 'defaultValue' => 'private', 'required' => true, 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}]}], options[:options], @api_client, {})['visibility']
-
-      permissions['resourcePool'] = {'visibility' => visibility}
-
-      # Tenants
-      if !excludes.include?('tenants')
-        if !options[:tenants].nil?
-          accounts = options[:tenants].collect {|id| id.to_i}
-        elsif !options[:no_prompt]
-          account_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'account_id', 'type' => 'select', 'fieldLabel' => 'Add Tenant', 'selectOptions' => available_accounts, 'required' => false, 'description' => 'Add Tenant Permissions.'}], options[:options], @api_client, {})['account_id']
-
-          if !account_id.nil?
-            accounts << account_id
-            available_accounts = available_accounts.reject {|it| it['value'] == account_id}
-
-            while !available_accounts.empty? && (account_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'account_id', 'type' => 'select', 'fieldLabel' => 'Add Another Tenant', 'selectOptions' => available_accounts, 'required' => false, 'description' => 'Add Tenant Permissions.'}], options[:options], @api_client, {})['account_id'])
-              if !account_id.nil?
-                accounts << account_id
-                available_accounts = available_accounts.reject {|it| it['value'] == account_id}
-              end
-            end
-          end
-        end
-        permissions['tenantPermissions'] = {'accounts' => accounts}
-      end
-    end
-    permissions
-  end
-
   def update_wiki_page_option_types
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => false, 'displayOrder' => 1, 'description' => 'The name of the wiki page for this instance. Default is the instance name.'},
@@ -4120,64 +3946,4 @@ class Morpheus::Cli::Clusters
     ]
   end
 
-  def print_permissions(permissions)
-    if permissions.nil?
-      print_h2 "Permissions"
-      print yellow,"No permissions found.",reset,"\n"
-    else
-      if !permissions['resourcePermissions'].nil?
-        print_h2 "Group Access"
-        rows = []
-        if permissions['resourcePermissions']['all']
-          rows.push({group: 'All'})
-        end
-        if permissions['resourcePermissions']['sites']
-          permissions['resourcePermissions']['sites'].each do |site|
-            rows.push({group: site['name'], default: site['default'] ? 'Yes' : ''})
-          end
-        end
-        if rows.empty?
-          print yellow,"No group access",reset,"\n"
-        else
-          columns = [:group, :default]
-          print cyan
-          print as_pretty_table(rows, columns)
-        end
-
-        print_h2 "Plan Access"
-        rows = []
-        if permissions['resourcePermissions']['allPlans']
-          rows.push({plan: 'All'})
-        end
-        if permissions['resourcePermissions']['plans']
-          permissions['resourcePermissions']['plans'].each do |plan|
-            rows.push({plan: plan['name'], default: plan['default'] ? 'Yes' : ''})
-          end
-        end
-        if rows.empty?
-          print yellow,"No plan access",reset,"\n"
-        else
-          columns = [:plan, :default]
-          print cyan
-          print as_pretty_table(rows, columns)
-        end
-
-        if !permissions['tenantPermissions'].nil?
-          print_h2 "Tenant Permissions"
-          if !permissions['resourcePool'].nil?
-            print cyan
-            print "Visibility: #{permissions['resourcePool']['visibility'].to_s.capitalize}".center(20)
-            print "\n"
-          end
-          if !permissions['tenantPermissions'].nil?
-            print cyan
-            print "Accounts: #{permissions['tenantPermissions']['accounts'].join(', ')}".center(20)
-            print "\n"
-          end
-        end
-        print "\n"
-      end
-    end
-  end
-
 end