morpheus-cli 4.2.18 → 5.0.0

data/lib/morpheus/cli/ping.rb

@@ -199,7 +199,6 @@ EOT
               "Version" => lambda {|it| appliance[:build_version] },
               # "Active" => lambda {|it| it[:active] ? "Yes " + format_is_current() : "No" },
               "Response Time" => lambda {|it| format_duration_seconds(took_sec) },
-              #"Response Time" => lambda {|it| format_sig_dig(took_sec, 3) + "s" rescue "" },
               # "Error" => lambda {|it| error_string },
               "Status" => lambda {|it| format_appliance_status(appliance, cyan) },
             }

data/lib/morpheus/cli/projects_command.rb

@@ -102,7 +102,7 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[project]")
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_get_options(opts, options, [:find_by_name])
       opts.footer = <<-EOT
 Get details about a project.
 [project] is required. This is the name or id of a project.
@@ -127,8 +127,8 @@ EOT
       end
       return
     end
-    project = find_project_by_name_or_id(id)
-    exit 1 if project.nil?
+    project = options[:find_by_name] ? find_project_by_name(id) : find_project_by_name_or_id(id)
+    return 1, "project not found by '#{id}'" if project.nil?
     # refetch it by id
     json_response = {'project' => project}
     unless id.to_s =~ /\A\d{1,}\Z/
@@ -332,7 +332,7 @@ EOT
       opts.on('--remove-resources LIST', Array, "Remove Resources, comma separated list of resource names or IDs to remove.") do |list|
         remove_resource_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      build_standard_update_options(opts, options)
+      build_standard_update_options(opts, options, [:find_by_name])
       opts.footer = <<-EOT
 Update a project.
 [project] is required. This is the name or id of a project.
@@ -342,7 +342,7 @@ EOT
     verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
     exit_code, err = 0, nil
-    project = find_project_by_name_or_id(args[0])
+    project = options[:find_by_name] ? find_project_by_name(args[0]) : find_project_by_name_or_id(args[0])
     return 1, "project not found by '#{args[0]}'" if project.nil?
     # construct payload
     if options[:payload]
@@ -433,7 +433,7 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[project]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      build_standard_remove_options(opts, options, [:find_by_name])
       # opts.on( '-f', '--force', "Force Delete" ) do
       #   params[:force] = true
       # end
@@ -446,7 +446,7 @@ EOT
     verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
     exit_code, err = 0, nil
-    project = find_project_by_name_or_id(args[0])
+    project = options[:find_by_name] ? find_project_by_name(args[0]) : find_project_by_name_or_id(args[0])
     return 1, "project not found by '#{args[0]}'" if project.nil?
     unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the project #{project['name']}?")
       return 9, "aborted command"

data/lib/morpheus/cli/provisioning_licenses_command.rb

@@ -478,7 +478,7 @@ class Morpheus::Cli::ProvisioningLicensesCommand
 
   def add_license_option_types
     [
-      {'fieldName' => 'licenseType', 'fieldLabel' => 'License Type', 'type' => 'select', 'optionSource' => lambda { 
+      {'fieldName' => 'licenseType', 'fieldLabel' => 'License Type', 'type' => 'select', 'optionSource' => lambda { |api_client, api_params| 
         # @options_interface.options_for_source("licenseTypes", {})['data']
         get_license_types_dropdown()
       }, 'required' => true, 'displayOrder' => 1},
@@ -493,7 +493,7 @@ class Morpheus::Cli::ProvisioningLicensesCommand
         # @options_interface.options_for_source("virtualImages", {})['data']
         get_virtual_images_dropdown()
       }, 'displayOrder' => 9},
-      {'fieldName' => 'tenants', 'fieldLabel' => 'Tenants', 'type' => 'multiSelect', 'optionSource' => lambda { 
+      {'fieldName' => 'tenants', 'fieldLabel' => 'Tenants', 'type' => 'multiSelect', 'optionSource' => lambda { |api_client, api_params| 
         @options_interface.options_for_source("allTenants", {})['data']
       }, 'displayOrder' => 10},
     ]

data/lib/morpheus/cli/remote.rb

@@ -137,7 +137,6 @@ EOT
             check_str
           },
           "Response Time" => lambda {|it| format_duration_milliseconds(it[:last_check][:took]) rescue "" },
-          #"Response Time" => lambda {|it| format_sig_dig((it[:last_check][:took]/ 1000.to_f), 3) + "s" rescue "" },
           "Error" => {display_method: lambda {|it| 
             error_str = it[:last_check] ? it[:last_check][:error].to_s : "" 
             error_str
@@ -1283,7 +1282,6 @@ EOT
         end
       },
       "Response Time" => lambda {|it| format_duration_milliseconds(it[:last_check][:took]) rescue "" },
-      #"Response Time" => lambda {|it| format_sig_dig((it[:last_check][:took]/ 1000.to_f), 3) + "s" rescue "" },
       "Status" => lambda {|it| format_appliance_status(it, cyan) },
       "Error" => lambda {|it| 
         error_str = it[:last_check] ? it[:last_check][:error] : "" 

data/lib/morpheus/cli/roles.rb

@@ -13,7 +13,7 @@ class Morpheus::Cli::Roles
   include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::WhoamiHelper
-  register_subcommands :list, :get, :add, :update, :remove, :'list-permissions', :'update-feature-access', :'update-global-group-access', :'update-group-access', :'update-global-cloud-access', :'update-cloud-access', :'update-global-instance-type-access', :'update-instance-type-access', :'update-global-blueprint-access', :'update-blueprint-access'
+  register_subcommands :list, :get, :add, :update, :remove, :'list-permissions', :'update-feature-access', :'update-global-group-access', :'update-group-access', :'update-global-cloud-access', :'update-cloud-access', :'update-global-instance-type-access', :'update-instance-type-access', :'update-global-blueprint-access', :'update-blueprint-access', :'update-global-catalog-item-type-access', :'update-catalog-item-type-access', :'update-persona-access'
   alias_subcommand :details, :get
   set_default_subcommand :list
 
@@ -101,12 +101,20 @@ class Morpheus::Cli::Roles
       opts.on('-b','--blueprint-access', "Display Blueprint Access") do
         options[:include_blueprint_access] = true
       end
-      opts.on('-a','--all-access', "Display All Access Lists") do
+      opts.on(nil,'--catalog-item-type-access', "Display Catalog Item Type Access") do
+        options[:include_catalog_item_types_access] = true
+      end
+      opts.on(nil,'--personas', "Display Persona Access") do
+        options[:include_personas_access] = true
+      end
+      opts.on('-a','--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_blueprint_access] = true
+        options[:include_catalog_item_types_access] = true
+        options[:include_personas_access] = true
       end
       build_standard_get_options(opts, options)
       opts.footer = <<-EOT
@@ -198,6 +206,7 @@ EOT
           rows = rows.select {|row| row[:code].to_s =~ phrase_regexp || row[:name].to_s =~ phrase_regexp }
         end
         print as_pretty_table(rows, [:code, :name, :access], options)
+        print reset,"\n"
       else
         print cyan,"Use --permissions to list permissions","\n"
       end
@@ -208,6 +217,7 @@ EOT
         {"Clouds" => lambda {|it| get_access_string(it['globalZoneAccess']) } },
         {"Instance Types" => lambda {|it| get_access_string(it['globalInstanceTypeAccess']) } },
         {"Blueprints" => lambda {|it| get_access_string(it['globalAppTemplateAccess'] || it['globalBlueprintAccess']) } },
+        {"Catalog Item Types" => lambda {|it| get_access_string(it['globalCatalogItemTypeAccess']) } },
       ], options)
 
       #print_h2 "Group Access: #{get_access_string(json_response['globalSiteAccess'])}", options
@@ -225,6 +235,7 @@ EOT
         else
           print cyan,"Use -g, --group-access to list custom access","\n"
         end
+        print reset,"\n"
       else
         # print "\n"
         # print cyan,bold,"Group Access: #{get_access_string(json_response['globalSiteAccess'])}",reset,"\n"
@@ -246,6 +257,7 @@ EOT
         else
           print cyan,"Use -c, --cloud-access to list custom access","\n"
         end
+        print reset,"\n"
       else
         # print "\n"
         # print cyan,bold,"Cloud Access: #{get_access_string(json_response['globalZoneAccess'])}",reset,"\n"
@@ -267,6 +279,7 @@ EOT
         else
           print cyan,"Use -i, --instance-type-access to list custom access","\n"
         end
+        print reset,"\n"
       else
         # print "\n"
         # print cyan,bold,"Instance Type Access: #{get_access_string(json_response['globalInstanceTypeAccess'])}",reset,"\n"
@@ -290,12 +303,54 @@ EOT
         else
           print cyan,"Use -b, --blueprint-access to list custom access","\n"
         end
+        print reset,"\n"
       else
         # print "\n"
         # print cyan,bold,"Blueprint Access: #{get_access_string(json_response['globalAppTemplateAccess'])}",reset,"\n"
       end
-      print reset,"\n"
+
+      
+      catalog_item_type_global_access = json_response['globalCatalogItemTypeAccess']
+      catalog_item_type_permissions = json_response['catalogItemTypePermissions'] || []
+      print cyan
+      # print_h2 "catalog_item_type Access: #{get_access_string(json_response['globalCatalogItemTypeAccess'])}", options
+      # print "\n"
+      if catalog_item_type_global_access == 'custom'
+        print_h2 "Catalog Item Type Access", options
+        if options[:include_catalog_item_types_access]
+          rows = catalog_item_type_permissions.collect do |it|
+            {
+              name: it['name'],
+              access: format_access_string(it['access'], ["none","read","full"]),
+            }
+          end
+          print as_pretty_table(rows, [:name, :access], options)
+        else
+          print cyan,"Use -b, --catalog-item-type-access to list custom access","\n"
+        end
+      else
+        # print "\n"
+        # print cyan,bold,"Catalog Item Type Access: #{get_access_string(json_response['globalCatalogItemTypeAccess'])}",reset,"\n"
+      end
+      
+
+      persona_permissions = json_response['personaPermissions'] || json_response['personas'] || []
+      if options[:include_catalog_item_types_access]
+        print_h2 "Persona Access", options
+        rows = persona_permissions.collect do |it|
+          {
+            name: it['name'],
+            access: format_access_string(it['access'], ["none","read","full"]),
+          }
+        end
+        print as_pretty_table(rows, [:name, :access], options)
+        print reset,"\n"        
+      end
+
+      # print reset,"\n"
+      
     end
+
     return 0, nil
   end
 
@@ -449,6 +504,10 @@ EOT
           end
         end
 
+        # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona', 'type' => 'select', 'optionSource' => 'personas', 'description' => 'Default Persona'}], options[:options], @api_client)
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona', 'type' => 'select', 'selectOptions' => [{'name'=>'Service Catalog','value'=>'serviceCatalog'},{'name'=>'Standard','value'=>'standard'}], 'description' => 'Default Persona'}], options[:options], @api_client)
+        role_payload['defaultPersona'] = {'code' => v_prompt['defaultPersona']} unless v_prompt['defaultPersona'].to_s.strip.empty?
+
         payload = {"role" => role_payload}
       end
       @roles_interface.setopts(options)
@@ -1267,6 +1326,249 @@ EOT
     end
   end
 
+  def update_global_catalog_item_type_access(args)
+    usage = "Usage: morpheus roles update-global-catalog-item-type-access [name] [full|custom|none]"
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name] [full|custom|none]")
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+
+    if args.count < 2
+      puts optparse
+      exit 1
+    end
+    name = args[0]
+    access_value = args[1].to_s.downcase
+    if !['full', 'custom', 'none'].include?(access_value)
+      puts optparse
+      exit 1
+    end
+
+
+    connect(options)
+    begin
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
+      role = find_role_by_name_or_id(account_id, name)
+      exit 1 if role.nil?
+
+      params = {permissionCode: 'CatalogItemType', access: access_value}
+      @roles_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @roles_interface.dry.update_permission(account_id, role['id'], params)
+        return
+      end
+      json_response = @roles_interface.update_permission(account_id, role['id'], params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Role #{role['authority']} global catalog item type access updated"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update_catalog_item_type_access(args)
+    options = {}
+    catalog_item_type_id = nil
+    access_value = nil
+    do_all = false
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      opts.on( '--catalog-item-type ID', String, "Catalog Item Type ID or Name" ) do |val|
+        catalog_item_type_id = val
+      end
+      opts.on( nil, '--all', "Update all catalog item types at once." ) do
+        do_all = true
+      end
+      opts.on( '--access VALUE', String, "Access value [full|none]" ) do |val|
+        access_value = val
+      end
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Update role access for an catalog item type or all types.\n" +
+                    "[name] is required. This is the name or id of a role.\n" + 
+                    "--catalog-item-type or --all is required. This is the name or id of a catalog item type.\n" + 
+                    "--access is required. This is the new access value."
+    end
+    optparse.parse!(args)
+
+    if args.count < 1
+      puts optparse
+      return 1
+    end
+    name = args[0]
+    # support old usage: [name] [catalog_item_type] [access]
+    catalog_item_type_id ||= args[1]
+    access_value ||= args[2]
+
+    if (!catalog_item_type_id && !do_all) || !access_value
+      puts_error optparse
+      return 1
+    end
+    
+    access_value = access_value.to_s.downcase
+
+    if !['full', 'none'].include?(access_value)
+      puts optparse
+      return 1
+    end
+
+    connect(options)
+    begin
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
+      role = find_role_by_name_or_id(account_id, name)
+      return 1 if role.nil?
+
+      role_json = @roles_interface.get(account_id, role['id'])
+      catalog_item_type_global_access = role_json['globalCatalogItemTypeAccess']
+      catalog_item_type_permissions = role_json['catalogItemTypePermissions'] || []
+      if catalog_item_type_global_access != 'custom'
+        print "\n", red, "Global Catalog Item Type Access is currently: #{catalog_item_type_global_access.to_s.capitalize}"
+        print "\n", "You must first set it to Custom via `morpheus roles update-global-catalog-item-type-access \"#{name}\" custom`"
+        print "\n\n", reset
+        return 1
+      end
+
+      # hacky, but support name or code lookup via the list returned in the show payload
+      catalog_item_type = nil
+      if !do_all
+        if catalog_item_type_id.to_s =~ /\A\d{1,}\Z/
+          catalog_item_type = catalog_item_type_permissions.find {|b| b['id'] == catalog_item_type_id.to_i }
+        else
+          catalog_item_type = catalog_item_type_permissions.find {|b| b['name'] == catalog_item_type_id }
+        end
+        if catalog_item_type.nil?
+          print_red_alert "Catalog Item Type not found: '#{catalog_item_type_id}'"
+          return 1
+        end
+      end
+
+      params = {}
+      if do_all
+        params['allCatalogItemTypes'] = true
+      else
+        params['catalogItemTypeId'] = catalog_item_type['id']
+      end
+      params['access'] = access_value
+      @roles_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @roles_interface.dry.update_catalog_item_type(account_id, role['id'], params)
+        return
+      end
+      json_response = @roles_interface.update_catalog_item_type(account_id, role['id'], params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        if do_all
+          print_green_success "Role #{role['authority']} access updated for all catalog item types"
+        else
+          print_green_success "Role #{role['authority']} access updated for catalog item type #{catalog_item_type['name']}"
+        end
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update_persona_access(args)
+    options = {}
+    persona_id = nil
+    access_value = nil
+    do_all = false
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name] [serviceCatalog|standard]")
+      opts.on( '--persona CODE', String, "Persona Code" ) do |val|
+        persona_id = val
+      end
+      opts.on( nil, '--all', "Update all personas at once." ) do
+        do_all = true
+      end
+      opts.on( '--access VALUE', String, "Access value [full|none]" ) do |val|
+        access_value = val
+      end
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Update role access for an persona or personas.\n" +
+                    "[name] is required. This is the name or id of a role.\n" + 
+                    "--persona or --all is required. This is the code of a persona.\n" + 
+                    "--access is required. This is the new access value."
+    end
+    optparse.parse!(args)
+
+    if args.count < 1
+      puts optparse
+      return 1
+    end
+    name = args[0]
+    # support old usage: [name] [persona] [access]
+    persona_id ||= args[1]
+    access_value ||= args[2]
+
+    if (!persona_id && !do_all) || !access_value
+      puts_error optparse
+      return 1
+    end
+    
+    access_value = access_value.to_s.downcase
+
+    if !['full', 'none'].include?(access_value)
+      puts optparse
+      return 1
+    end
+
+    connect(options)
+    begin
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
+      role = find_role_by_name_or_id(account_id, name)
+      return 1 if role.nil?
+
+      role_json = @roles_interface.get(account_id, role['id'])
+      
+      # no lookup right now, pass the code serviceCatalog|standard
+      persona_code = persona_id
+
+      params = {}
+      if do_all
+        params['allPersonas'] = true
+      else
+        params['personaCode'] = persona_code
+      end
+      params['access'] = access_value
+      @roles_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @roles_interface.dry.update_persona(account_id, role['id'], params)
+        return
+      end
+      json_response = @roles_interface.update_persona(account_id, role['id'], params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        if do_all
+          print_green_success "Role #{role['authority']} access updated for all personas"
+        else
+          print_green_success "Role #{role['authority']} access updated for persona #{persona_code}"
+        end
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
   
   def add_role_option_types