morpheus-cli 4.2.6 → 4.2.7

data/lib/morpheus/cli/network_routers_command.rb

@@ -207,7 +207,7 @@ class Morpheus::Cli::NetworkRoutersCommand
         print_h2 "Tenant Permissions"
         print cyan
         description_cols = {
-            "Visibility" => lambda{|it| it['permissions']['visibility']},
+            "Visibility" => lambda{|it| (it['permissions']['visibility'] || '').capitalize},
             "Tenants" => lambda{|it|
               accounts = (it['permissions']['tenantPermissions'] || {})['accounts'] || []
               accounts.count > 0 ? accounts.join(', ') : ''

data/lib/morpheus/cli/price_sets_command.rb

@@ -64,7 +64,7 @@ class Morpheus::Cli::PriceSetsCommand
 
       price_sets = json_response['priceSets']
       if price_sets.empty?
-        print yellow,"No price sets found.",reset,"\n"
+        print cyan,"No price sets found.",reset,"\n"
       else
         rows = price_sets.collect do |it|
           {
@@ -166,7 +166,7 @@ class Morpheus::Cli::PriceSetsCommand
         end
         print as_pretty_table(rows, [:id, :name, :pricing], options)
       else
-        print yellow,"No prices.",reset,"\n"
+        print cyan,"No prices.",reset,"\n"
       end
       print reset,"\n"
       return 0

data/lib/morpheus/cli/provisioning_licenses_command.rb

@@ -4,7 +4,7 @@ class Morpheus::Cli::ProvisioningLicensesCommand
   include Morpheus::Cli::CliCommand
   set_command_name :'provisioning-licenses'
   register_subcommands :list, :get, :add, :update, :remove, :reservations, :'list-types'
-  set_command_hidden
+
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @provisioning_licenses_interface = @api_client.provisioning_licenses

data/lib/morpheus/cli/remote.rb

@@ -334,6 +334,9 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :quiet, :dry_run, :remote])
+      opts.on('-a', '--all', "Check all remotes.") do
+        checkall = true
+      end
       opts.footer = <<-EOT
 Check the status of a remote appliance.
 [name] is optional. This is the name of a remote.  Default is the current remote. Can be passed as 'all'. to perform remote check-all.
@@ -341,7 +344,9 @@ This makes a request to the configured appliance url and updates the status and
 EOT
     end
     optparse.parse!(args)
-    
+    if checkall == true
+      return _check_all_appliances(options)
+    end
     if args.count == 0
       id_list = ['current']
     else

data/lib/morpheus/cli/reports_command.rb

@@ -513,7 +513,7 @@ class Morpheus::Cli::ReportsCommand
       report_types = json_response['reportTypes']
       
       if report_types.empty?
-        print yellow,"No report types found.",reset,"\n"
+        print cyan,"No report types found.",reset,"\n"
       else
         columns = {
           "NAME" => 'name',

data/lib/morpheus/cli/security_group_rules.rb

@@ -175,7 +175,7 @@ EOT
       rules = json_response['rules']
       print_h1 "Morpheus Security Group Rules for Security Group ID: #{security_group_id}"
       if rules.empty?
-        print yellow,"No Security Group Rules currently configured.",reset,"\n"
+        print yellow,"No security group rules currently configured.",reset,"\n"
       else
         rules = rules.sort {|x,y| x["id"] <=> y["id"] }
         rules.each do |rule|

data/lib/morpheus/cli/security_groups.rb

@@ -64,7 +64,7 @@ class Morpheus::Cli::SecurityGroups
       security_groups = json_response['securityGroups']
       
       if security_groups.empty?
-        print yellow,"No security groups found.",reset,"\n"
+        print cyan,"No security groups found.",reset,"\n"
       else
         active_id = @active_security_group[@appliance_name.to_sym]
         # table_color = options[:color] || cyan
@@ -289,6 +289,9 @@ class Morpheus::Cli::SecurityGroups
           options['tenants'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
+      opts.on('--can-manage LIST', Array, "Tenant Can Manage, comma separated list of account IDs that can manage") do |list|
+        options['canManage'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
       opts.on('--visibility [private|public]', String, "Visibility") do |val|
         options['visibility'] = val
       end
@@ -385,9 +388,10 @@ class Morpheus::Cli::SecurityGroups
         end
 
         # Tenants
-        if options['tenants']
+        if options['tenants'] || options['canManage']
           payload['tenantPermissions'] = {}
-          payload['tenantPermissions']['accounts'] = options['tenants']
+          payload['tenantPermissions']['accounts'] = ((options['tenants'] || []) + (options['canManage'] || [])).uniq
+          payload['tenantPermissions']['canManageAccounts'] = options['canManage'] if options['canManage']
         end
 
         # Visibility
@@ -459,6 +463,9 @@ class Morpheus::Cli::SecurityGroups
           options['tenants'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
+      opts.on('--can-manage LIST', Array, "Tenant Can Manage, comma separated list of account IDs that can manage") do |list|
+        options['canManage'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
       opts.on('--visibility [private|public]', String, "Visibility") do |val|
         options['visibility'] = val
       end
@@ -507,9 +514,10 @@ class Morpheus::Cli::SecurityGroups
         end
 
         # Tenants
-        if options['tenants']
+        if options['tenants'] || options['canManage']
           payload['tenantPermissions'] = {}
-          payload['tenantPermissions']['accounts'] = options['tenants']
+          payload['tenantPermissions']['accounts'] = ((options['tenants'] || []) + (options['canManage'] || [])).uniq
+          payload['tenantPermissions']['canManageAccounts'] = options['canManage'] if options['canManage']
         end
 
         # Visibility

data/lib/morpheus/cli/service_plans_command.rb

@@ -74,7 +74,7 @@ class Morpheus::Cli::ServicePlanCommand
 
       plans = json_response['servicePlans']
       if plans.empty?
-        print yellow,"No service plans found.",reset,"\n"
+        print cyan,"No service plans found.",reset,"\n"
       else
         rows = plans.collect do |it|
           {
@@ -221,7 +221,7 @@ class Morpheus::Cli::ServicePlanCommand
         ]
         print as_pretty_table(rows, columns, options)
       else
-        print yellow,"No price sets.",reset,"\n"
+        print cyan,"No price sets.",reset,"\n"
       end
 
       print_permissions(service_plan['permissions'], ['plans', 'groupDefaults'])

data/lib/morpheus/cli/user_groups_command.rb

@@ -127,13 +127,9 @@ class Morpheus::Cli::UserGroupsCommand
       print_description_list(description_cols, user_group)
 
       ## Users
-      if users.size == 1
-        print_h2 "User (1)"
-      else
-        print_h2 "Users (#{users.size})"
-      end
+      print_h2 "Users (#{users.size})"
       if users.size == 0
-        print yellow,"No users",reset,"\n"
+        print cyan,"No users",reset,"\n"
       else
         user_columns = [
           {"ID" => lambda {|user| user['id'] } },

data/lib/morpheus/cli/user_settings_command.rb

@@ -364,23 +364,38 @@ class Morpheus::Cli::UserSettingsCommand
     raw_args = args
     options = {}
     params = {}
+    client_id = nil
+    all_clients = false
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[client-id]")
+      opts.on("--all", "--all", "Clear tokens for all Client IDs instead of a specific client.") do
+        all_clients = true
+      end
+      # opts.on("--client-id", "Client ID. eg. morph-api, morph-cli") do |val|
+      #   params['clientId'] = val.to_s
+      # end
       opts.on("--user-id ID", String, "User ID") do |val|
         params['userId'] = val.to_s
       end
       build_common_options(opts, options, [:payload, :options, :json, :dry_run, :quiet, :remote])
       opts.footer = "Clear API access token for a specific client.\n" +
-                    "[client-id] is required. This is the id of an api client."
+                    "[client-id] or --all is required. This is the id of an api client."
     end
     optparse.parse!(args)
     connect(options)
-    if args.count != 1
+    if args.count > 1 || (args.count == 0 && all_clients == false)
       print_error Morpheus::Terminal.angry_prompt
       puts_error  "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
       return 1
     end
-    params['clientId'] = args[0]
+    if args[0]
+      params['clientId'] = args[0]
+    end
+    if params['clientId'] == 'all'
+      params.delete('clientId')
+      all_clients = true
+      # clears all when clientId is omitted, no api parameter needed.
+    end
     begin
       payload = {}
       @user_settings_interface.setopts(options)
@@ -400,9 +415,20 @@ class Morpheus::Cli::UserSettingsCommand
       # if params['clientId'] == Morpheus::APIClient::CLIENT_ID
       #   logout_result = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).logout
       # end
-      print_green_success "Cleared #{params['clientId']} access token"
+      success_msg = "Success"
+      if all_clients
+        success_msg = "Cleared all access tokens"
+      else
+        success_msg = "Cleared #{params['clientId']} access token"
+      end
+      if params['userId']
+        success_msg << " for user #{params['userId']}"
+      end
+      print_green_success success_msg
       if params['clientId'] == Morpheus::APIClient::CLIENT_ID
-        print yellow,"Your current access token is no longer valid, you will need to login again.",reset,"\n"
+        if params['userId'].nil? # should check against current user id
+          print yellow,"Your current access token is no longer valid, you will need to login again.",reset,"\n"
+        end
       end
       # get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (params['userId'] ? ['--user-id', params['userId'].to_s] : [])
       # get(get_args)

data/lib/morpheus/cli/user_sources_command.rb

@@ -187,7 +187,7 @@ class Morpheus::Cli::UserSourcesCommand
         print_description_list(columns, user_source_config)
         # print reset,"\n"
       else
-        print yellow,"No config found.","\n",reset
+        print cyan,"No config found.","\n",reset
       end
 
       role_mappings = user_source['roleMappings']
@@ -204,7 +204,7 @@ class Morpheus::Cli::UserSourcesCommand
         print as_pretty_table(role_mappings, role_mapping_columns)
         print "\n",reset
       else
-        print yellow,"No role mappings found for this user source.","\n",reset
+        print cyan,"No role mappings found for this user source.","\n",reset
       end
       return 0
     rescue RestClient::Exception => e
@@ -801,7 +801,7 @@ class Morpheus::Cli::UserSourcesCommand
         ]
         print as_pretty_table(my_option_types, columns)
       else
-        print yellow,"No option types found.","\n",reset
+        print cyan,"No option types found.","\n",reset
       end
 
       print reset,"\n"

data/lib/morpheus/cli/users.rb

@@ -10,6 +10,7 @@ require 'json'
 class Morpheus::Cli::Users
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
+  include Morpheus::Cli::WhoamiHelper
   register_subcommands :list, :count, :get, :add, :update, :remove, :permissions
   register_subcommands :'passwd' => :change_password
   alias_subcommand :details, :get
@@ -21,7 +22,6 @@ class Morpheus::Cli::Users
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @whoami_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).whoami
     @users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
     @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
     @roles_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).roles
@@ -113,25 +113,39 @@ class Morpheus::Cli::Users
 
   def get(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[username]")
-      opts.on('-f','--feature-access', "Display Feature Access") do |val|
-        options[:include_feature_access] = true
-      end
-      # opts.on(nil,'--group-access', "Display Group Access") do
-      #   options[:include_group_access] = true
-      # end
-      # opts.on(nil,'--cloud-access', "Display Cloud Access") do
-      #   options[:include_cloud_access] = true
-      # end
-      # opts.on(nil,'--instance-type-access', "Display Instance Type Access") do
-      #   options[:include_instance_type_access] = true
-      # end
+      opts.on(nil,'--feature-access', "Display Feature Access") do |val|
+        options[:include_features_access] = true
+        params['includeAccess'] = true
+      end
+      opts.on(nil,'--group-access', "Display Group Access") do
+        options[:include_sites_access] = true
+        params['includeAccess'] = true
+      end
+      opts.on(nil,'--cloud-access', "Display Cloud Access") do
+        options[:include_zones_access] = true
+        params['includeAccess'] = true
+      end
+      opts.on(nil,'--instance-type-access', "Display Instance Type Access") do
+        options[:include_instance_types_access] = true
+        params['includeAccess'] = true
+      end
+      opts.on(nil,'--blueprint-access', "Display Blueprint Access") do
+        options[:include_app_templates_access] = true
+        params['includeAccess'] = true
+      end
       opts.on(nil,'--all', "Display All Access Lists") do
-        options[:include_feature_access] = true
-        options[:include_group_access] = true
-        options[:include_cloud_access] = true
-        options[:include_instance_type_access] = true
+        options[:include_features_access] = true
+        options[:include_sites_access] = true
+        options[:include_zones_access] = true
+        options[:include_instance_types_access] = true
+        options[:include_app_templates_access] = true
+        params['includeAccess'] = true
+      end
+      opts.on('-i', '--include-none-access', "Include Items with 'None' Access in Access List") do
+        options[:display_none_access] = true
       end
       build_common_options(opts, options, [:account, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Get details about a user." + "\n" +
@@ -151,44 +165,50 @@ class Morpheus::Cli::Users
       @users_interface.setopts(options)
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @users_interface.dry.get(account_id, args[0].to_i, {includePermissions:true})
+          print_dry_run @users_interface.dry.get(account_id, args[0].to_i, params)
         else
-          print_dry_run @users_interface.dry.get(account_id, {username: args[0]})
+          print_dry_run @users_interface.dry.get(account_id, {username: args[0]}, params)
         end
-        # if options[:include_feature_access]
-        #   print_dry_run @users_interface.dry.feature_permissions(account_id, ":id")
-        # end
         return
       end
-      # todo: users_response = @users_interface.list(account_id, {name: name})
-      #       there may be response data outside of user that needs to be displayed
-      user = find_user_by_username_or_id(account_id, args[0])
-      return 1 if user.nil?
-      
+
+      if args[0].to_s =~ /\A\d{1,}\Z/
+        user_id = args[0].to_i
+      else
+        user = find_user_by_username(account_id, args[0])
+
+        if user.nil?
+          print_red_alert "User #{args[0]} not found"
+          exit 1
+        end
+        user_id = user['id']
+      end
+
+      user = @users_interface.get(account_id, user_id, params)['user']
+
+      if user.nil?
+        print_red_alert "User #{args[0]} not found"
+        exit 1
+      end
+
+      is_tenant_account = current_account['id'] != user['account']['id']
+
       json_response =  {'user' => user}
-      # json_response['user']['featurePermissions'] = user_feature_permissions if options[:include_feature_access]
+
       if options[:json]
         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, "user")
-        #puts as_yaml(@users_interface.feature_permissions(account_id, user['id']), options) if options[:include_feature_access]
         return 0
       elsif options[:csv]
         puts records_as_csv([user], options)
         return 0
-      else
-        user_feature_permissions_json = nil
-        user_feature_permissions = nil
-        if options[:include_feature_access]
-          user_feature_permissions_json = @users_interface.feature_permissions(account_id, user['id'])
-          # permissions (Array) has replaced featurePermissions (map)
-          user_feature_permissions = user_feature_permissions_json['permissions'] || user_feature_permissions_json['featurePermissions']
-        end
-        print_h1 "User Details", options
-        print cyan
-        description_cols = {
+      end
+
+      print_h1 "User Details", options
+      print cyan
+      description_cols = {
           "ID" => 'id',
           "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
           # "First" => 'firstName',
@@ -200,34 +220,33 @@ class Morpheus::Cli::Users
           "Role" => lambda {|it| format_user_role_names(it) },
           "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
           "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
-        }
-        print_description_list(description_cols, user)
-
-
-        if options[:include_feature_access] && user_feature_permissions
-          if user_feature_permissions
-            print_h2 "Feature Permissions", options
-            print cyan
-            if user_feature_permissions.is_a?(Array)
-              rows = user_feature_permissions.collect do |it|
-                {name: it['name'], code: it['code'], access: get_access_string(it['access']) }
-              end
-              print as_pretty_table(rows, [:name, :code, :access], options)
+      }
+      print_description_list(description_cols, user)
+
+      available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type', 'app_templates' => 'Blueprint'}
+      available_field_options.each do |field, label|
+        if !(field == 'sites' && is_tenant_account) && options["include_#{field}_access".to_sym]
+          access = user['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]
+          access = access.reject {|it| it['access'] == 'none'} if !options[:display_none_access]
+
+          print_h2 "#{label} Access", options
+          print cyan
+
+          if access.count > 0
+            access.each {|it| it['access'] = get_access_string(it['access'])}
+
+            if ['features', 'instance_types'].include?(field)
+              print as_pretty_table(access, [:name, :code, :access], options)
             else
-              rows = user_feature_permissions.collect do |code, access|
-                {code: code, access: get_access_string(access) }
-              end
-              print as_pretty_table(rows, [:code, :access], options)
+              print as_pretty_table(access, [:name, :access], options)
             end
-            
           else
-            puts yellow,"No permissions found.",reset
+            println yellow,"No #{label} Access Found.",reset
           end
         end
-
-        print cyan
-        print reset,"\n"
       end
+      print cyan
+      print reset,"\n"
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       return 1
@@ -239,7 +258,10 @@ class Morpheus::Cli::Users
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[username]")
       build_common_options(opts, options, [:account, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "Display Permissions for a user." + "\n" +
+      opts.on('-i', '--include-none-access', "Include Items with 'None' Access in Access List") do
+        options[:display_none_access] = true
+      end
+      opts.footer = "Display Access for a user." + "\n" +
                     "[username] is required. This is the username or id of a user."
     end
     optparse.parse!(args)
@@ -257,46 +279,51 @@ class Morpheus::Cli::Users
       return 1 if user.nil?
       @users_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @users_interface.dry.feature_permissions(account_id, user['id'])
+        print_dry_run @users_interface.dry.permissions(account_id, user['id'])
         return
       end
-      
-      json_response = @users_interface.feature_permissions(account_id, user['id'])
-      # json_response['user']['featurePermissions'] = user_feature_permissions if options[:include_feature_access]
+
+      is_tenant_account = current_account['id'] != user['account']['id']
+
+      json_response = @users_interface.permissions(account_id, user['id'])
+
       if options[:json]
-        puts as_json(json_response, options, 'permissions')
+        puts as_json(json_response, options, 'access')
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options, 'permissions')
+        puts as_yaml(json_response, options, 'access')
         return 0
       elsif options[:csv]
-        puts records_as_csv(json_response['permissions'], options)
+        puts records_as_csv(json_response['access'], options)
         return 0
-      else
-        user_feature_permissions = nil
-        # permissions (Array) has replaced featurePermissions (map)
-        user_feature_permissions = json_response['permissions'] || json_response['featurePermissions']
-        print_h1 "User Permissions: #{user['username']}", options
-        if user_feature_permissions
+      end
+
+      print_h1 "User Permissions: #{user['username']}", options
+
+      available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type', 'app_templates' => 'Blueprint'}
+      available_field_options.each do |field, label|
+        if !(field == 'sites' && is_tenant_account)
+          access = json_response['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]
+          access = access.reject {|it| it['access'] == 'none'} if !options[:display_none_access]
+
+          print_h2 "#{label} Access", options
           print cyan
-          if user_feature_permissions.is_a?(Array)
-            rows = user_feature_permissions.collect do |it|
-              {name: it['name'], code: it['code'], access: get_access_string(it['access']) }
+
+          if access.count > 0
+            access.each {|it| it['access'] = get_access_string(it['access'])}
+
+            if ['features', 'instance_types'].include?(field)
+              print as_pretty_table(access, [:name, :code, :access], options)
+            else
+              print as_pretty_table(access, [:name, :access], options)
             end
-            print as_pretty_table(rows, [:name, :code, :access], options)
           else
-            rows = user_feature_permissions.collect do |code, access|
-              {code: code, access: get_access_string(access) }
-            end
-            print as_pretty_table(rows, [:code, :access], options)
+            println yellow,"No #{label} Access Found.",reset
           end
-          
-        else
-          print yellow,"No permissions found.",reset,"\n"
         end
-        print reset,"\n"
-        return 0
       end
+      print cyan
+      print reset,"\n"
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       return 1