morpheus-cli 3.3.1.4 → 3.3.2

data/lib/morpheus/cli/users.rb

@@ -10,7 +10,7 @@ require 'json'
 class Morpheus::Cli::Users
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
-  register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands :list, :count, :get, :add, :update, :remove
   register_subcommands :'passwd' => :change_password
   alias_subcommand :details, :get
   set_default_subcommand :list
@@ -35,7 +35,7 @@ class Morpheus::Cli::Users
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:account, :list, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:account, :list, :query, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
       opts.footer = "List users."
     end
     optparse.parse!(args)
@@ -91,6 +91,37 @@ class Morpheus::Cli::Users
     end
   end
 
+  def count(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[options]")
+      build_common_options(opts, options, [:account, :query, :remote, :dry_run])
+      opts.footer = "Get the number of users."
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
+      params = {}
+      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)
+      # print number only
+      if json_response['meta'] && json_response['meta']['total']
+        print cyan, json_response['meta']['total'], reset, "\n"
+      else
+        print yellow, "unknown", reset, "\n"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.3.1.4"
+    VERSION = "3.3.2"
   end
 end

data/lib/morpheus/cli/version_command.rb

@@ -37,7 +37,7 @@ class Morpheus::Cli::VersionCommand
       puts(banner)
       puts("  Client Version: #{client_version}")
       puts("****************************************")
-      print reset,"\n"
+      print reset
     end
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -123,7 +123,7 @@ class Morpheus::Cli::VirtualImages
         return
       end
       image = find_virtual_image_by_name_or_id(image_name)
-      exit 1 if image.nil?
+      return 1 if image.nil?
       # refetch
       json_response = @virtual_images_interface.get(image['id'])
       image = json_response['virtualImage']
@@ -179,7 +179,7 @@ class Morpheus::Cli::VirtualImages
         begin
 
       image = find_virtual_image_by_name_or_id(image_name)
-      exit 1 if image.nil?
+      return 1 if image.nil?
 
       params = options[:options] || {}
 
@@ -253,12 +253,16 @@ class Morpheus::Cli::VirtualImages
 
   def add(args)
     image_type_name = nil
+    file_url = nil
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name] -t TYPE")
       opts.on( '-t', '--type TYPE', "Virtual Image Type" ) do |val|
         image_type_name = val
       end
+      opts.on( '-U', '--url URL', "Image File URL. This can be used instead of uploading local files." ) do |val|
+        file_url = val
+      end
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -291,8 +295,15 @@ class Morpheus::Cli::VirtualImages
     end
 
     begin
-      my_option_types = add_virtual_image_option_types(image_type)
-      params = Morpheus::Cli::OptionTypes.prompt(add_virtual_image_option_types(image_type), options[:options], @api_client, options[:params])
+      my_option_types = add_virtual_image_option_types(image_type, !file_url)
+      # if options[:no_prompt]
+      #   my_option_types.each do |it| 
+      #     if it['fieldContext'] == 'virtualImageFiles'
+      #       opt['required'] = false
+      #     end
+      #   end
+      # end
+      params = Morpheus::Cli::OptionTypes.prompt(my_option_types, options[:options], @api_client, options[:params])
       virtual_image_payload = {}.merge(params)
       virtual_image_files = virtual_image_payload.delete('virtualImageFiles')
       virtual_image_payload['imageType'] = image_type['code']
@@ -304,7 +315,9 @@ class Morpheus::Cli::VirtualImages
 
       if options[:dry_run]
         print_dry_run @virtual_images_interface.dry.create(payload)
-        if !virtual_image_files.empty?
+        if file_url
+          print_dry_run @virtual_images_interface.dry.upload_by_url(":id", file_url)
+        elsif virtual_image_files && !virtual_image_files.empty?
           virtual_image_files.each do |key, filename|
             print_dry_run @virtual_images_interface.dry.upload(":id", "(Contents of file #{filename})")
           end
@@ -322,7 +335,15 @@ class Morpheus::Cli::VirtualImages
       end
 
       # now upload the file, do this in the background maybe?
-      if !virtual_image_files.empty?
+      if file_url
+        unless options[:quiet]
+          print cyan, "Uploading file by url #{file_url} ...", reset, "\n"
+        end
+        upload_json_response = @virtual_images_interface.upload_by_url(virtual_image['id'], file_url)
+        if options[:json]
+          print JSON.pretty_generate(upload_json_response)
+        end
+      elsif virtual_image_files && !virtual_image_files.empty?
         virtual_image_files.each do |key, filename|
           unless options[:quiet]
             print cyan, "Uploading file (#{key}) #{filename} ...", reset, "\n"
@@ -349,41 +370,67 @@ class Morpheus::Cli::VirtualImages
 
   def add_file(args)
     image_type_name = nil
+    file_url = nil
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name] [filepath]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.on( '-U', '--url URL', "Image File URL. This can be used instead of [filepath]" ) do |val|
+        file_url = val
+      end
+      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
-    if args.count < 2
-      puts optparse
-      exit 1
-    end
     image_name = args[0]
-    filename = args[1]
-
-    connect(options)
-
-    begin
-      image = find_virtual_image_by_name_or_id(image_name)			
-      image_file = File.new(filename, 'rb')
-
-      if options[:dry_run]
-        print_dry_run @virtual_images_interface.dry.upload(image['id'], image_file)
-        return
+    filename = nil
+    if file_url
+      if args.count < 1
+        puts optparse
+        exit 1
       end
-
-      unless options[:quiet]
-        print cyan, "Uploading file #{filename} ...", reset, "\n"
+    else
+      if args.count < 2
+        puts optparse
+        exit 1
       end
+      filename = args[1]
+    end
 
-      json_response = @virtual_images_interface.upload(image['id'], image_file)
+    connect(options)
 
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-      elsif !options[:quiet]
-        print "\n", cyan, "Virtual Image #{image['name']} successfully updated.", reset, "\n\n"
-        get([image['id']])
+    begin
+      image = find_virtual_image_by_name_or_id(image_name)
+      return 1 if image.nil?
+      if file_url
+        if options[:dry_run]
+          print_dry_run @virtual_images_interface.dry.upload_by_url(image['id'], file_url)
+          return
+        end
+        unless options[:quiet]
+          print cyan, "Uploading file by url #{file_url} ...", reset, "\n"
+        end
+        json_response = @virtual_images_interface.upload_by_url(image['id'], file_url)
+        if options[:json]
+          print JSON.pretty_generate(json_response)
+        elsif !options[:quiet]
+          print "\n", cyan, "Virtual Image #{image['name']} successfully updated.", reset, "\n\n"
+          get([image['id']])
+        end
+      else
+        image_file = File.new(filename, 'rb')
+        if options[:dry_run]
+          print_dry_run @virtual_images_interface.dry.upload(image['id'], image_file)
+          return
+        end
+        unless options[:quiet]
+          print cyan, "Uploading file #{filename} ...", reset, "\n"
+        end
+        json_response = @virtual_images_interface.upload(image['id'], image_file)
+        if options[:json]
+          print JSON.pretty_generate(json_response)
+        elsif !options[:quiet]
+          print "\n", cyan, "Virtual Image #{image['name']} successfully updated.", reset, "\n\n"
+          get([image['id']])
+        end
       end
 
     rescue RestClient::Exception => e
@@ -408,7 +455,7 @@ class Morpheus::Cli::VirtualImages
     connect(options)
     begin
       image = find_virtual_image_by_name_or_id(image_name)
-      exit 1 if image.nil?
+      return 1 if image.nil?
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the virtual image filename #{filename}?")
         exit
       end
@@ -443,7 +490,7 @@ class Morpheus::Cli::VirtualImages
     connect(options)
     begin
       image = find_virtual_image_by_name_or_id(image_name)
-      exit 1 if image.nil?
+      return 1 if image.nil?
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the virtual image #{image['name']}?")
         exit
       end
@@ -480,6 +527,7 @@ class Morpheus::Cli::VirtualImages
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
         print_red_alert "Virtual Image not found by id #{id}"
+        return nil
       else
         raise e
       end
@@ -490,7 +538,7 @@ class Morpheus::Cli::VirtualImages
     json_results = @virtual_images_interface.get({name: name.to_s})
     if json_results['virtualImages'].empty?
       print_red_alert "Virtual Image not found by name #{name}"
-      exit 1
+      return nil
     end
     virtual_image = json_results['virtualImages'][0]
     return virtual_image
@@ -507,7 +555,7 @@ class Morpheus::Cli::VirtualImages
     return get_available_virtual_image_types().find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
   end
 
-  def add_virtual_image_option_types(image_type)
+  def add_virtual_image_option_types(image_type, include_file_selection=true)
     image_type_code = image_type['code']
     # todo: make api provide virtualImageType and its optionTypes.
     tmp_option_types = [
@@ -527,16 +575,22 @@ class Morpheus::Cli::VirtualImages
 
     if image_type_code == 'ami'
       tmp_option_types << {'fieldName' => 'externalId', 'fieldLabel' => 'AMI id', 'type' => 'text', 'required' => false, 'displayOrder' => 10}
-      tmp_option_types << {'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => true, 'displayOrder' => 10}
+      if include_file_selection
+        tmp_option_types << {'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => false, 'displayOrder' => 10}
+      end
     elsif image_type_code == 'vmware' || image_type_code == 'vmdk'
-      tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'OVF File', 'type' => 'file', 'required' => true, 'displayOrder' => 10}
-      tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageDescriptorFile', 'fieldLabel' => 'VMDK File', 'type' => 'file', 'required' => false, 'displayOrder' => 10}
+      if include_file_selection
+        tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'OVF File', 'type' => 'file', 'required' => false, 'displayOrder' => 10}
+        tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageDescriptorFile', 'fieldLabel' => 'VMDK File', 'type' => 'file', 'required' => false, 'displayOrder' => 10}
+      end
     elsif image_type_code == 'pxe'
       tmp_option_types << {'fieldName' => 'config.menu', 'fieldLabel' => 'Menu', 'type' => 'text', 'required' => false, 'displayOrder' => 10}
       tmp_option_types << {'fieldName' => 'imagePath', 'fieldLabel' => 'Image Path', 'type' => 'text', 'required' => true, 'displayOrder' => 10}
       tmp_option_types.reject! {|opt| ['isCloudInit', 'installAgent', 'sshUsername', 'sshPassword'].include?(opt['fieldName'])}
     else
-      tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => true, 'description' => 'Choose an image file to upload', 'displayOrder' => 10}
+      if include_file_selection
+        tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => false, 'description' => 'Choose an image file to upload', 'displayOrder' => 10}
+      end
     end
 
     return tmp_option_types

data/lib/morpheus/formatters.rb

@@ -198,39 +198,49 @@ def filter_data(data, include_fields=nil, exclude_fields=nil)
         if field.empty?
           next
         end
+
+        # supports "field as Label"
+        field_key = field.strip
+        field_label = field_key
+
+        if field.index(/\s+as\s+/)
+          field_key, field_label = field.split(/\s+as\s+/)
+          if !field_label
+            field_label = field_key
+          end
+        end
+
         if field.include?(".")
-          # could do this instead...
-          # namespaces = field.split(".")
-          # cur_data = data
-          # namespaces.each
-          #   if index != namespaces.length - 1
-          #     cur_data[ns] ||= {}
-          #   else
-          #     cur_data[ns] = get_object_value(new_data, field)
-          #   end
-          # end
-          namespaces = field.split(".")
-          cur_data = data
-          cur_filtered_data = my_data
-          namespaces.each_with_index do |ns, index|
-            if index != namespaces.length - 1
-              if cur_data
-                cur_data = cur_data[ns] || cur_data[ns.to_sym]
-              else
-                cur_data = nil
-              end
-              cur_filtered_data[ns] ||= {}
-              cur_filtered_data = cur_filtered_data[ns]
-            else
-              if cur_data.respond_to?("[]")
-                cur_filtered_data[ns] = cur_data[ns] || cur_data[ns.to_sym]
+          #if field.index(/\s+as\s+/)
+          if field_label != field_key
+            # collapse to a value
+            my_data[field_label] = get_object_value(data, field_key)
+          else
+            # keep the full object structure
+            namespaces = field.split(".")
+            cur_data = data
+            cur_filtered_data = my_data
+            namespaces.each_with_index do |ns, index|
+              if index != namespaces.length - 1
+                if cur_data
+                  cur_data = cur_data[ns] || cur_data[ns.to_sym]
+                else
+                  cur_data = nil
+                end
+                cur_filtered_data[ns] ||= {}
+                cur_filtered_data = cur_filtered_data[ns]
               else
-                cur_filtered_data[ns] = nil
+                if cur_data.respond_to?("[]")
+                  cur_filtered_data[ns] = cur_data[ns] || cur_data[ns.to_sym]
+                else
+                  cur_filtered_data[ns] = nil
+                end
               end
             end
           end
         else
-          my_data[field] = data[field] || data[field.to_sym]
+          #my_data[field] = data[field] || data[field.to_sym]
+          my_data[field_label] = data[field_key] || data[field_key.to_sym]
         end
       end
       return my_data

data/lib/morpheus/terminal.rb

@@ -208,7 +208,7 @@ module Morpheus
           @coloring = false
           Term::ANSIColor::coloring = false
         end
-        opts.on('-V','--debug', "Print extra output for debugging. ") do |json|
+        opts.on('-V','--debug', "Print extra output for debugging.") do |json|
           @terminal_log_level = Morpheus::Logging::Logger::DEBUG
           Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
           ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.3.1.4
+  version: 3.3.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,6 +165,12 @@ files:
 - lib/morpheus/api/instance_types_interface.rb
 - lib/morpheus/api/instances_interface.rb
 - lib/morpheus/api/key_pairs_interface.rb
+- lib/morpheus/api/library_container_scripts_interface.rb
+- lib/morpheus/api/library_container_templates_interface.rb
+- lib/morpheus/api/library_container_types_interface.rb
+- lib/morpheus/api/library_container_upgrades_interface.rb
+- lib/morpheus/api/library_instance_types_interface.rb
+- lib/morpheus/api/library_layouts_interface.rb
 - lib/morpheus/api/license_interface.rb
 - lib/morpheus/api/load_balancers_interface.rb
 - lib/morpheus/api/logs_interface.rb
@@ -196,6 +202,7 @@ files:
 - lib/morpheus/api/task_sets_interface.rb
 - lib/morpheus/api/tasks_interface.rb
 - lib/morpheus/api/user_groups_interface.rb
+- lib/morpheus/api/user_sources_interface.rb
 - lib/morpheus/api/users_interface.rb
 - lib/morpheus/api/virtual_images_interface.rb
 - lib/morpheus/api/whoami_interface.rb
@@ -227,6 +234,14 @@ files:
 - lib/morpheus/cli/instances.rb
 - lib/morpheus/cli/key_pairs.rb
 - lib/morpheus/cli/library.rb
+- lib/morpheus/cli/library_container_scripts_command.rb
+- lib/morpheus/cli/library_container_templates_command.rb
+- lib/morpheus/cli/library_container_types_command.rb
+- lib/morpheus/cli/library_instance_types_command.rb
+- lib/morpheus/cli/library_layouts_command.rb
+- lib/morpheus/cli/library_option_lists_command.rb
+- lib/morpheus/cli/library_option_types_command.rb
+- lib/morpheus/cli/library_upgrades_command.rb
 - lib/morpheus/cli/license.rb
 - lib/morpheus/cli/load_balancers.rb
 - lib/morpheus/cli/log_level_command.rb
@@ -235,6 +250,7 @@ files:
 - lib/morpheus/cli/man_command.rb
 - lib/morpheus/cli/mixins/accounts_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
+- lib/morpheus/cli/mixins/library_helper.rb
 - lib/morpheus/cli/mixins/monitoring_helper.rb
 - lib/morpheus/cli/mixins/print_helper.rb
 - lib/morpheus/cli/mixins/provisioning_helper.rb
@@ -263,11 +279,13 @@ files:
 - lib/morpheus/cli/security_groups.rb
 - lib/morpheus/cli/set_prompt_command.rb
 - lib/morpheus/cli/shell.rb
+- lib/morpheus/cli/sleep_command.rb
 - lib/morpheus/cli/source_command.rb
 - lib/morpheus/cli/ssl_verification_command.rb
 - lib/morpheus/cli/storage_providers_command.rb
 - lib/morpheus/cli/tasks.rb
 - lib/morpheus/cli/user_groups_command.rb
+- lib/morpheus/cli/user_sources_command.rb
 - lib/morpheus/cli/users.rb
 - lib/morpheus/cli/version.rb
 - lib/morpheus/cli/version_command.rb