morpheus-cli 3.3.2.6.2 → 3.3.2.7

data/lib/morpheus/cli/policies_command.rb

@@ -64,9 +64,7 @@ class Morpheus::Cli::PoliciesCommand
       elsif options[:cloud]
         cloud = find_cloud_by_name_or_id(options[:cloud])
       end
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       if options[:dry_run]
         if group
           print_dry_run @group_policies_interface.dry.list(group['id'], params)
@@ -87,14 +85,11 @@ class Morpheus::Cli::PoliciesCommand
         json_response = @policies_interface.list(params)
       end
       policies = json_response["policies"]
-      if options[:include_fields]
-        json_response = {"policies" => filter_data(policies, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "policies")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "policies")
         return 0
       elsif options[:csv]
         puts records_as_csv(policies, options)
@@ -111,9 +106,7 @@ class Morpheus::Cli::PoliciesCommand
       if params[:global]
         subtitles << "(Global)".strip
       end
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if policies.empty?
         print cyan,"No policies found.",reset,"\n"
@@ -191,14 +184,11 @@ class Morpheus::Cli::PoliciesCommand
       json_response = {'policy' => policy}  # skip redundant request
       # json_response = @policies_interface.get(policy['id'])
       policy = json_response['policy']
-      if options[:include_fields]
-        json_response = {'policy' => filter_data(policy, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "policy")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "policy")
         return 0
       elsif options[:csv]
         puts records_as_csv([policy], options)

data/lib/morpheus/cli/power_scheduling_command.rb

@@ -36,41 +36,26 @@ class Morpheus::Cli::PowerSchedulingCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
-
+      params.merge!(parse_list_options(options))
       if options[:dry_run]
         print_dry_run @power_scheduling_interface.dry.list(params)
         return
       end
-
       json_response = @power_scheduling_interface.list(params)
-      if options[:include_fields]
-        json_response = {"powerScheduleTypes" => filter_data(json_response["powerScheduleTypes"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "powerScheduleTypes")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['powerScheduleTypes'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "powerScheduleTypes")
         return 0
       end
       schedules = json_response['powerScheduleTypes']
       title = "Morpheus Power Schedules"
       subtitles = []
-      # if group
-      #   subtitles << "Group: #{group['name']}".strip
-      # end
-      # if cloud
-      #   subtitles << "Cloud: #{cloud['name']}".strip
-      # end
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if schedules.empty?
         print cyan,"No power schedules found.",reset,"\n"
@@ -129,14 +114,11 @@ class Morpheus::Cli::PowerSchedulingCommand
       schedule = json_response['powerScheduleType']
       instances = json_response['instances'] || []
       servers = json_response['servers'] || []
-      if options[:include_fields]
-        json_response = {"powerScheduleType" => filter_data(json_response["powerScheduleType"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "powerScheduleType")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "powerScheduleType")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['schedule']], options)

data/lib/morpheus/cli/recent_activity_command.rb

@@ -44,35 +44,35 @@ class Morpheus::Cli::RecentActivityCommand
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
       params = {}
-      [:phrase, :offset, :max, :sort, :direction, :start, :end].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       if options[:dry_run]
         print_dry_run @dashboard_interface.dry.recent_activity(account_id, params)
         return
       end
       json_response = @dashboard_interface.recent_activity(account_id, params)
+
       if options[:json]
-        if options[:include_fields]
-          json_response = {"activity" => filter_data(json_response["activity"], options[:include_fields]) }
-        end
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options, "activity")
         return 0
-      end
-      if options[:csv]
-        puts records_as_csv(json_response["activity"], options)
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "activity")
         return 0
-      end
-      if options[:yaml]
-        if options[:include_fields]
-          json_response = {"activity" => filter_data(json_response["activity"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+      elsif options[:csv]
+        # strip date lines
+        json_response['activity'] = json_response['activity'].reject {|it| it.keys.size == 1 && it.keys[0] == 'date' }
+        puts records_as_csv(json_response['activity'], options)
         return 0
       end
-
-      print_h1 "Recent Activity"
+      title = "Recent Activity"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      if options[:start]
+        subtitles << "Start: #{options[:start]}"
+      end
+      if options[:end]
+        subtitles << "End: #{options[:end]}"
+      end
+      print_h1 title, subtitles
       print cyan
       items = json_response["activity"]
       if items.empty?

data/lib/morpheus/cli/remote.rb

@@ -35,7 +35,7 @@ class Morpheus::Cli::Remote
       opts.on("-a",'--all', "Show all the appliance activity details") do
         show_all_activity = true
       end
-      build_common_options(opts, options, [:json, :csv, :fields])
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields])
       opts.footer = <<-EOT
 This outputs a list of the configured remote appliances. It also indicates
 the current appliance. The current appliance is where morpheus will send 
@@ -52,15 +52,14 @@ EOT
     #   raise_command_error "You have no appliances configured. See the `remote add` command."
     # end
     
+    json_response = {"appliances" => appliances}
     if options[:json]
-      json_response = {"appliances" => appliances} # mock payload
-      if options[:include_fields]
-        json_response = {"appliances" => filter_data(appliances, options[:include_fields]) }
-      end
-      puts as_json(json_response, options)
+      puts as_json(json_response, options, "appliances")
       return 0
-    end
-    if options[:csv]
+    elsif options[:yaml]
+      puts as_yaml(json_response, options, "appliances")
+      return 0
+    elsif options[:csv]
       puts records_as_csv(appliances, options)
       return 0
     end

data/lib/morpheus/cli/storage_providers_command.rb

@@ -41,23 +41,18 @@ class Morpheus::Cli::StorageProvidersCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       if options[:dry_run]
         print_dry_run @storage_providers_interface.dry.list(params)
         return
       end
       json_response = @storage_providers_interface.list(params)
       storage_providers = json_response["storageProviders"]
-      if options[:include_fields]
-        json_response = {"storageProviders" => filter_data(storage_providers, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "storageProviders")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "storageProviders")
         return 0
       elsif options[:csv]
         puts records_as_csv(storage_providers, options)
@@ -65,9 +60,7 @@ class Morpheus::Cli::StorageProvidersCommand
       end
       title = "Morpheus Storage Providers"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if storage_providers.empty?
         print cyan,"No storage providers found.",reset,"\n"
@@ -131,14 +124,11 @@ class Morpheus::Cli::StorageProvidersCommand
       json_response = {'storageProvider' => storage_provider}  # skip redundant request
       # json_response = @storage_providers_interface.get(storage_provider['id'])
       storage_provider = json_response['storageProvider']
-      if options[:include_fields]
-        json_response = {'storageProvider' => filter_data(storage_provider, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "storageProvider")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "storageProvider")
         return 0
       elsif options[:csv]
         puts records_as_csv([storage_provider], options)

data/lib/morpheus/cli/tasks.rb

@@ -41,19 +41,13 @@ class Morpheus::Cli::Tasks
       json_response = @tasks_interface.get(params)
       # print result and return output
       if options[:json]
-        if options[:include_fields]
-          json_response = {"tasks" => filter_data(json_response["tasks"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "tasks")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['tasks'], options)
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"tasks" => filter_data(json_response["tasks"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "tasks")
         return 0
       else
         title = "Morpheus Tasks"
@@ -113,12 +107,10 @@ class Morpheus::Cli::Tasks
         json_response = @tasks_interface.get(task['id'])
       end
       if options[:json]
-        json_response = {"task" => filter_data(json_response["task"], options[:include_fields]) } if options[:include_fields]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "task")
         return 0
       elsif options[:yaml]
-        json_response = {"task" => filter_data(json_response["task"], options[:include_fields]) } if options[:include_fields]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "task")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['task']], options)

data/lib/morpheus/cli/user_groups_command.rb

@@ -31,41 +31,26 @@ class Morpheus::Cli::UserGroupsCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
-
+      params.merge!(parse_list_options(options))
       if options[:dry_run]
         print_dry_run @user_groups_interface.dry.list(nil, params)
         return
       end
-
       json_response = @user_groups_interface.list(nil, params)
-      if options[:include_fields]
-        json_response = {"userGroups" => filter_data(json_response["userGroups"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "userGroups")
         return 0
       elsif options[:csv]
-        puts records_as_csv(json_response['userGroups'], options)
+        puts records_as_csv(json_response["userGroups"], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "userGroups")
         return 0
       end
       user_groups = json_response['userGroups']
       title = "Morpheus User Groups"
       subtitles = []
-      # if group
-      #   subtitles << "Group: #{group['name']}".strip
-      # end
-      # if cloud
-      #   subtitles << "Cloud: #{cloud['name']}".strip
-      # end
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if user_groups.empty?
         print cyan,"No user groups found.",reset,"\n"
@@ -113,14 +98,11 @@ class Morpheus::Cli::UserGroupsCommand
       json_response = @user_groups_interface.get(nil, user_group['id'])
       user_group = json_response['userGroup']
       users = user_group['users'] || []
-      if options[:include_fields]
-        json_response = {"userGroup" => filter_data(json_response["userGroup"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "userGroup")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "userGroup")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['userGroup']], options)

data/lib/morpheus/cli/user_sources_command.rb

@@ -70,17 +70,14 @@ class Morpheus::Cli::UserSourcesCommand
       end
 
       json_response = @user_sources_interface.list(account_id, params)
-      if options[:include_fields]
-        json_response = {"userSources" => filter_data(json_response["userSources"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "userSources")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['userSources'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "userSources")
         return 0
       end
       user_sources = json_response['userSources']
@@ -155,14 +152,11 @@ class Morpheus::Cli::UserSourcesCommand
       end
       
       #user_source = json_response['userSource']
-      if options[:include_fields]
-        json_response = {"userSource" => filter_data(json_response["userSource"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "userSource")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "userSource")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['userSource']], options)
@@ -695,17 +689,14 @@ class Morpheus::Cli::UserSourcesCommand
       end
 
       json_response = @user_sources_interface.list_types(params)
-      if options[:include_fields]
-        json_response = {"userSourceTypes" => filter_data(json_response["userSourceTypes"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "userSourceTypes")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['userSourceTypes'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "userSourceTypes")
         return 0
       end
       user_source_types = json_response['userSourceTypes']
@@ -764,15 +755,12 @@ class Morpheus::Cli::UserSourcesCommand
         return
       end
       json_response = @user_sources_interface.get_type(user_source_type_id, params)
-      user_source_type = json_response['userSourceType']
-      if options[:include_fields]
-        json_response = {"userSource" => filter_data(user_source_type, options[:include_fields]) }
-      end
+      user_source_type = json_response["userSourceType"]
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "userSourceType")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "userSourceType")
         return 0
       elsif options[:csv]
         puts records_as_csv([user_source_type], options)

data/lib/morpheus/cli/users.rb

@@ -46,23 +46,18 @@ class Morpheus::Cli::Users
       account_id = account ? account['id'] : nil
 
       params = {}
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       if options[:dry_run]
         print_dry_run @users_interface.dry.list(account_id, params)
         return
       end
       json_response = @users_interface.list(account_id, params)
       users = json_response['users']
-      if options[:include_fields]
-        json_response = {"users" => filter_data(users, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "users")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "users")
         return 0
       elsif options[:csv]
         puts records_as_csv(users, options)
@@ -73,9 +68,7 @@ class Morpheus::Cli::Users
         if account
           subtitles << "Account: #{account['name']}".strip
         end
-        if params[:phrase]
-          subtitles << "Search: #{params[:phrase]}".strip
-        end
+        subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
         if users.empty?
           puts yellow,"No users found.",reset
@@ -177,16 +170,12 @@ class Morpheus::Cli::Users
       
       json_response =  {'user' => user}
       # json_response['user']['featurePermissions'] = user_feature_permissions if options[:include_feature_access]
-
-      if options[:include_fields]
-        json_response = {'user' => filter_data(user, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "user")
         puts as_json(@users_interface.feature_permissions(account_id, user['id']), options) if options[:include_feature_access]
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "user")
         puts as_yaml(@users_interface.feature_permissions(account_id, user['id']), options) if options[:include_feature_access]
         return 0
       elsif options[:csv]