morpheus-cli 3.6.2 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b96e9a323b6252c8aea83546061d49935d48d468b06c88b2aea362a04024bb4
-  data.tar.gz: 45517a33a6c41ab8f97b4c83195cf2ba9c864aa44301eb8ede39243250f63608
+  metadata.gz: 9c4ff5dbc24449eb5603e8f786653d613a1e204e03c5f5071647074127c7144e
+  data.tar.gz: '08e8a66410060ac421d790ab7b0ace8c3e0e2d923b99080bc686efae00047ebc'
 SHA512:
-  metadata.gz: ea362685980a7a97f65c62af61cb0ee45fae02f73684599ba7290b1c411087d70b345f9d0488550721d8e174ddd824ad43383d95f03a8c7d9fb80018362accab
-  data.tar.gz: 9382c219bd8d7078c258c6568d034ef64c6a6b8ca496818ec84295208c3c7ff1c541e07b1801f7af4aff7507acacb81b6c155c08f3deb92f2b6b4131b71d5aa9
+  metadata.gz: 4da0dd9d22fe6907b5c8adf120a22650802a310eacfa3b499963e6df240eebec5d13fd8462d7497ddbaed48af27fe9069a64a806e819bd09f0a0e2402518882b
+  data.tar.gz: 2329a3d24c1a24e7b12c71bd8b5ae6dec2997577d89a3eb2926fef3d7e1dffa6be0f03c46be7518ece5c0e9e81cee4c9d8bc0753b434654802459df631f47241

data/lib/morpheus/api/blueprints_interface.rb

@@ -73,12 +73,11 @@ class Morpheus::BlueprintsInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
-  # unused, prefer /options/instanceTypes
-  # def list_types(options={})
-  #   url = "#{@base_url}/api/blueprints/types"
-  #   headers = { params: {}, authorization: "Bearer #{@access_token}" }
-  #   headers[:params].merge!(options)
-  #   execute(method: :get, url: url, headers: headers)
-  # end
+  def list_types(options={})
+    url = "#{@base_url}/api/blueprints/types"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    execute(method: :get, url: url, headers: headers)
+  end
 
 end

data/lib/morpheus/cli/apps.rb

@@ -110,13 +110,16 @@ class Morpheus::Cli::Apps
       #   options[:cloud] = val
       # end
       opts.on('--config JSON', String, "App Config JSON") do |val|
-        options['config'] = JSON.parse(val.to_s)
+        options[:config] = JSON.parse(val.to_s)
       end
       opts.on('--config-yaml YAML', String, "App Config YAML") do |val|
-        options['config'] = YAML.load(val.to_s)
+        options[:config] = YAML.load(val.to_s)
       end
       opts.on('--config-file FILE', String, "App Config from a local JSON or YAML file") do |val|
-        options['configFile'] = val.to_s
+        options[:config_file] = val.to_s
+      end
+      opts.on('--config-dir DIRECTORY', String, "Blueprint Config from a local directory, merging all JSON or YAML files") do |val|
+        options[:config_dir] = val.to_s
       end
       build_common_options(opts, options, [:options, :json, :dry_run, :quiet])
       opts.footer = "Create a new app.\n" +
@@ -140,12 +143,12 @@ class Morpheus::Cli::Apps
       end
 
       payload = {}
-      config_payload = {}
-      if options['config']
-        config_payload = options['config']
+      if options[:config]
+        config_payload = options[:config]
         payload = config_payload
-      elsif options['configFile']
-        config_file = File.expand_path(options['configFile'])
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      elsif options[:config_file]
+        config_file = File.expand_path(options[:config_file])
         if !File.exists?(config_file) || !File.file?(config_file)
           print_red_alert "File not found: #{config_file}"
           return false
@@ -156,9 +159,35 @@ class Morpheus::Cli::Apps
           config_payload = JSON.parse(File.read(config_file))
         end
         payload = config_payload
+      elsif options[:config_dir]
+        config_dir = File.expand_path(options[:config_dir])
+        if !Dir.exists?(config_dir) || !File.directory?(config_dir)
+          print_red_alert "Directory not found: #{config_dir}"
+          return false
+        end
+        merged_payload = {}
+        config_files = []
+        config_files += Dir["#{config_dir}/*.json"]
+        config_files += Dir["#{config_dir}/*.yml"]
+        config_files += Dir["#{config_dir}/*.yaml"]
+        if config_files.empty?
+          print_red_alert "No .json/yaml files found in config directory: #{config_dir}"
+          return false
+        end
+        config_files.each do |config_file|
+          if config_file =~ /\.ya?ml\Z/
+            config_payload = YAML.load_file(config_file)
+          else
+            config_payload = JSON.parse(File.read(config_file))
+          end
+          merged_payload.deep_merge!(config_payload)
+        end
+        payload = merged_payload
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
       else
         # prompt for Name, Description, Group, Environment
         payload = {}
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
         params = Morpheus::Cli::OptionTypes.prompt(add_app_option_types, options[:options], @api_client, options[:params])
         params = params.deep_compact! # remove nulls and blank strings
         template_id = params.delete('blueprint')

data/lib/morpheus/cli/blueprints_command.rb

@@ -6,6 +6,7 @@ class Morpheus::Cli::BlueprintsCommand
   include Morpheus::Cli::ProvisioningHelper
   set_command_name :'blueprints'
   register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands :'types' => :list_types
   register_subcommands :duplicate
   register_subcommands :'upload-image' => :upload_image
   register_subcommands :'update-permissions' => :update_permissions
@@ -192,16 +193,19 @@ class Morpheus::Cli::BlueprintsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       opts.on('--config JSON', String, "Blueprint Config JSON") do |val|
-        options['config'] = JSON.parse(val.to_s)
+        options[:config] = JSON.parse(val.to_s)
       end
       opts.on('--config-yaml YAML', String, "Blueprint Config YAML") do |val|
-        options['config'] = YAML.load(val.to_s)
+        options[:config] = YAML.load(val.to_s)
       end
       opts.on('--config-file FILE', String, "Blueprint Config from a local JSON or YAML file") do |val|
-        options['configFile'] = val.to_s
+        options[:config_file] = val.to_s
+      end
+      opts.on('--config-dir DIRECTORY', String, "Blueprint Config from a local directory, merging all JSON or YAML files") do |val|
+        options[:config_dir] = val.to_s
       end
       build_option_type_options(opts, options, add_blueprint_option_types(false))
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:options, :json, :dry_run, :quiet, :remote])
       opts.footer = "Create a new blueprint.\n" + 
                     "[name] is optional and can be passed as --name or inside the config instead."
                     "[--config] or [--config-file] can be used to define the blueprint."
@@ -218,13 +222,13 @@ class Morpheus::Cli::BlueprintsCommand
     end
     connect(options)
     begin
-      request_payload = nil
-      config_payload = {}
-      if options['config']
-        config_payload = options['config']
-        request_payload = config_payload
-      elsif options['configFile']
-        config_file = File.expand_path(options['configFile'])
+      payload = nil
+      if options[:config]
+        config_payload = options[:config]
+        payload = config_payload
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      elsif options[:config_file]
+        config_file = File.expand_path(options[:config_file])
         if !File.exists?(config_file) || !File.file?(config_file)
           print_red_alert "File not found: #{config_file}"
           return false
@@ -234,29 +238,59 @@ class Morpheus::Cli::BlueprintsCommand
         else
           config_payload = JSON.parse(File.read(config_file))
         end
-        request_payload = config_payload
+        payload = config_payload
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      elsif options[:config_dir]
+        config_dir = File.expand_path(options[:config_dir])
+        if !Dir.exists?(config_dir) || !File.directory?(config_dir)
+          print_red_alert "Directory not found: #{config_dir}"
+          return false
+        end
+        merged_payload = {}
+        config_files = []
+        config_files += Dir["#{config_dir}/*.json"]
+        config_files += Dir["#{config_dir}/*.yml"]
+        config_files += Dir["#{config_dir}/*.yaml"]
+        if config_files.empty?
+          print_red_alert "No .json/yaml files found in config directory: #{config_dir}"
+          return false
+        end
+        config_files.each do |config_file|
+          if config_file =~ /\.ya?ml\Z/
+            config_payload = YAML.load_file(config_file)
+          else
+            config_payload = JSON.parse(File.read(config_file))
+          end
+          merged_payload.deep_merge!(config_payload)
+        end
+        payload = merged_payload
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
       else
+        payload = {}
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
         params = Morpheus::Cli::OptionTypes.prompt(add_blueprint_option_types, options[:options], @api_client, options[:params])
-        blueprint_payload = params.select {|k,v| ['name', 'description', 'category'].include?(k) }
+        #blueprint_payload = params.select {|k,v| ['name', 'description', 'category'].include?(k) }
         # expects no namespace, just the config
-        request_payload = blueprint_payload
+        #payload = blueprint_payload
+        payload.deep_merge!(params)
       end
 
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.create(request_payload)
+        print_dry_run @blueprints_interface.dry.create(payload)
         return
       end
 
-      json_response = @blueprints_interface.create(request_payload)
+      json_response = @blueprints_interface.create(payload)
 
       if options[:json]
         print JSON.pretty_generate(json_response)
         print "\n"
-      else
+      elsif !options[:quiet]
         blueprint = json_response["blueprint"]
         print_green_success "Added blueprint #{blueprint['name']}"
         if !options[:no_prompt]
-          if ::Morpheus::Cli::OptionTypes::confirm("Would you like to add a tier now?", options.merge({default: false}))
+          prompt_for_tier = options[:config].nil? && options[:config_file].nil? && options[:config_dir].nil?
+          if prompt_for_tier && ::Morpheus::Cli::OptionTypes::confirm("Would you like to add a tier now?", options.merge({default: false}))
             add_tier([blueprint['id']])
             while ::Morpheus::Cli::OptionTypes::confirm("Add another tier?", options.merge({default: false})) do
               add_tier([blueprint['id']])
@@ -267,7 +301,7 @@ class Morpheus::Cli::BlueprintsCommand
           end
         end
       end
-
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -279,13 +313,16 @@ class Morpheus::Cli::BlueprintsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id] [options]")
       opts.on('--config JSON', String, "Blueprint Config JSON") do |val|
-        options['config'] = JSON.parse(val.to_s)
+        options[:config] = JSON.parse(val.to_s)
       end
       opts.on('--config-yaml YAML', String, "Blueprint Config YAML") do |val|
-        options['config'] = YAML.load(val.to_s)
+        options[:config] = YAML.load(val.to_s)
       end
       opts.on('--config-file FILE', String, "Blueprint Config from a local JSON or YAML file") do |val|
-        options['configFile'] = val.to_s
+        options[:config_file] = val.to_s
+      end
+      opts.on('--config-dir DIRECTORY', String, "Blueprint Config from a local directory, merging all JSON or YAML files") do |val|
+        options[:config_dir] = val.to_s
       end
       build_option_type_options(opts, options, update_blueprint_option_types(false))
       build_common_options(opts, options, [:options, :json, :dry_run, :quiet, :remote])
@@ -308,13 +345,13 @@ class Morpheus::Cli::BlueprintsCommand
       blueprint = find_blueprint_by_name_or_id(args[0])
       exit 1 if blueprint.nil?
 
-      request_payload = nil
-      config_payload = {}
-      if options['config']
-        config_payload = options['config']
-        request_payload = config_payload
-      elsif options['configFile']
-        config_file = options['configFile']
+      payload = nil
+      if options[:config]
+        config_payload = options[:config]
+        payload = config_payload
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      elsif options[:config_file]
+        config_file = options[:config_file]
         if !File.exists?(config_file)
           print_red_alert "File not found: #{config_file}"
           return false
@@ -324,36 +361,44 @@ class Morpheus::Cli::BlueprintsCommand
         else
           config_payload = JSON.parse(File.read(config_file))
         end
-        request_payload = config_payload
-      else
-        # update just name,description,category
-        # preserve all other attributes of the config..
-
-        #params = Morpheus::Cli::OptionTypes.prompt(update_blueprint_option_types, options[:options], @api_client, options[:params])
-        params = options[:options] || {}
-
-        if params.empty?
-          # print_red_alert "Specify atleast one option to update"
-          print_red_alert "Specify atleast one option to update.\nOr use --config or --config-file to replace the entire config."
-          puts optparse
-          exit 1
+        payload = config_payload
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      elsif options[:config_dir]
+        config_dir = File.expand_path(options[:config_dir])
+        if !Dir.exists?(config_dir) || !File.directory?(config_dir)
+          print_red_alert "Directory not found: #{config_dir}"
+          return false
         end
-
-        #puts "parsed params is : #{params.inspect}"
-        blueprint_payload = params.select {|k,v| ['name','description','category'].include?(k) }
-        # expects no namespace, just the config
-        # preserve all other attributes of the config.
-        request_payload = blueprint["config"].merge(blueprint_payload)
-        # todo maybe: put name, description and category at the front.
-        # request_payload = blueprint_payload.merge(blueprint["config"].merge(blueprint_payload))
+        merged_payload = {}
+        config_files = []
+        config_files += Dir["#{config_dir}/*.json"]
+        config_files += Dir["#{config_dir}/*.yml"]
+        config_files += Dir["#{config_dir}/*.yaml"]
+        if config_files.empty?
+          print_red_alert "No .json/yaml files found in config directory: #{config_dir}"
+          return false
+        end
+        config_files.each do |config_file|
+          if config_file =~ /\.ya?ml\Z/
+            config_payload = YAML.load_file(config_file)
+          else
+            config_payload = JSON.parse(File.read(config_file))
+          end
+          merged_payload.deep_merge!(config_payload)
+        end
+        payload = merged_payload
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      else
+        payload = blueprint["config"]
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
       end
       
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.update(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.update(blueprint['id'], payload)
         return
       end
 
-      json_response = @blueprints_interface.update(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.update(blueprint['id'], payload)
 
       if options[:json]
         print JSON.pretty_generate(json_response)
@@ -548,9 +593,9 @@ class Morpheus::Cli::BlueprintsCommand
       exit 1
     end
 
-    request_payload = {"blueprint" => {}}
+    payload = {"blueprint" => {}}
     if args[1]
-      request_payload["blueprint"]["name"] = args[1]
+      payload["blueprint"]["name"] = args[1]
     end
 
     connect(options)
@@ -561,10 +606,10 @@ class Morpheus::Cli::BlueprintsCommand
       #   exit
       # end
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.duplicate(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.duplicate(blueprint['id'], payload)
         return
       end
-      json_response = @blueprints_interface.duplicate(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.duplicate(blueprint['id'], payload)
 
       if options[:json]
         print JSON.pretty_generate(json_response)
@@ -713,14 +758,14 @@ class Morpheus::Cli::BlueprintsCommand
 
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
-      request_payload = {blueprint: blueprint}
+      payload = {blueprint: blueprint}
       
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.update(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.update(blueprint['id'], payload)
         return 0
       end
 
-      json_response = @blueprints_interface.update(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.update(blueprint['id'], payload)
 
       if options[:json]
         puts JSON.pretty_generate(json_response)
@@ -871,14 +916,14 @@ class Morpheus::Cli::BlueprintsCommand
 
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
-      request_payload = {blueprint: blueprint}
+      payload = {blueprint: blueprint}
       
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.update(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.update(blueprint['id'], payload)
         return 0
       end
 
-      json_response = @blueprints_interface.update(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.update(blueprint['id'], payload)
 
       if options[:json]
         puts JSON.pretty_generate(json_response)
@@ -1055,13 +1100,13 @@ class Morpheus::Cli::BlueprintsCommand
 
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
-      request_payload = {blueprint: blueprint}
+      payload = {blueprint: blueprint}
       
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.update(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.update(blueprint['id'], payload)
         return
       end
-      json_response = @blueprints_interface.update(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.update(blueprint['id'], payload)
 
       if options[:json]
         puts JSON.pretty_generate(json_response)
@@ -1177,13 +1222,13 @@ class Morpheus::Cli::BlueprintsCommand
 
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
-      request_payload = {blueprint: blueprint}
+      payload = {blueprint: blueprint}
       
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.update(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.update(blueprint['id'], payload)
         return
       end
-      json_response = @blueprints_interface.update(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.update(blueprint['id'], payload)
 
       if options[:json]
         puts JSON.pretty_generate(json_response)
@@ -1286,14 +1331,14 @@ class Morpheus::Cli::BlueprintsCommand
 
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
-      request_payload = blueprint["config"]
-      # request_payload = {blueprint: blueprint}
+      payload = blueprint["config"]
+      # payload = {blueprint: blueprint}
       
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.update(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.update(blueprint['id'], payload)
         return
       end
-      json_response = @blueprints_interface.update(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.update(blueprint['id'], payload)
 
       if options[:json]
         puts JSON.pretty_generate(json_response)
@@ -1431,14 +1476,14 @@ class Morpheus::Cli::BlueprintsCommand
 
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
-      request_payload = blueprint["config"]
-      # request_payload = {blueprint: blueprint}
+      payload = blueprint["config"]
+      # payload = {blueprint: blueprint}
       
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.update(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.update(blueprint['id'], payload)
         return
       end
-      json_response = @blueprints_interface.update(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.update(blueprint['id'], payload)
 
       if options[:json]
         puts JSON.pretty_generate(json_response)
@@ -1495,15 +1540,15 @@ class Morpheus::Cli::BlueprintsCommand
       
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
-      request_payload = blueprint["config"]
-      # request_payload = {blueprint: blueprint}
+      payload = blueprint["config"]
+      # payload = {blueprint: blueprint}
       
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.update(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.update(blueprint['id'], payload)
         return
       end
 
-      json_response = @blueprints_interface.update(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.update(blueprint['id'], payload)
 
 
       if options[:json]
@@ -1594,14 +1639,14 @@ class Morpheus::Cli::BlueprintsCommand
 
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
-      request_payload = blueprint["config"]
-      # request_payload = {blueprint: blueprint}
+      payload = blueprint["config"]
+      # payload = {blueprint: blueprint}
       
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.update(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.update(blueprint['id'], payload)
         return
       end
-      json_response = @blueprints_interface.update(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.update(blueprint['id'], payload)
 
 
       if options[:json]
@@ -1684,14 +1729,14 @@ class Morpheus::Cli::BlueprintsCommand
 
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
-      request_payload = blueprint["config"]
-      # request_payload = {blueprint: blueprint}
+      payload = blueprint["config"]
+      # payload = {blueprint: blueprint}
       
       if options[:dry_run]
-        print_dry_run @blueprints_interface.dry.update(blueprint['id'], request_payload)
+        print_dry_run @blueprints_interface.dry.update(blueprint['id'], payload)
         return
       end
-      json_response = @blueprints_interface.update(blueprint['id'], request_payload)
+      json_response = @blueprints_interface.update(blueprint['id'], payload)
 
 
       if options[:json]
@@ -1755,6 +1800,70 @@ class Morpheus::Cli::BlueprintsCommand
 
   end
 
+  def list_types(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List blueprint types."
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params = {}
+      [:phrase, :offset, :max, :sort, :direction].each do |k|
+        params[k] = options[k] unless options[k].nil?
+      end
+      if options[:dry_run]
+        print_dry_run @blueprints_interface.dry.list_types(params)
+        return
+      end
+
+      json_response = @blueprints_interface.list_types(params)
+      blueprint_types = json_response['types']
+
+      if options[:json]
+        puts as_json(json_response, options, "types")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response['types'], options)
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "types")
+        return 0
+      end
+
+      
+      title = "Morpheus Blueprint Types"
+      subtitles = []
+      if params[:phrase]
+        subtitles << "Search: #{params[:phrase]}".strip
+      end
+      print_h1 title, subtitles
+      if blueprint_types.empty?
+        print cyan,"No blueprint types found.",reset,"\n"
+      else
+        rows = blueprint_types.collect do |blueprint_type|
+          {
+            code: blueprint_type['code'],
+            name: blueprint_type['name']
+          }
+        end
+        columns = [:code, :name]
+        print cyan
+        print as_pretty_table(rows, columns, options)
+        print reset
+        # print_results_pagination(json_response)
+      end
+      print reset,"\n"
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
 
 
@@ -1762,11 +1871,30 @@ class Morpheus::Cli::BlueprintsCommand
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
-      {'fieldName' => 'category', 'fieldLabel' => 'Category', 'type' => 'text', 'required' => false, 'displayOrder' => 3},
+      # skip Type for now because other types need to use --config anyhow
+      #{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => (connected ? get_available_blueprint_types() : []), 'required' => true, 'defaultValue' => 'morpheus', 'displayOrder' => 3},
+      {'fieldName' => 'category', 'fieldLabel' => 'Category', 'type' => 'text', 'required' => false, 'displayOrder' => 4},
       #{'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'selectOptions' => (connected ? get_available_groups() : []), 'required' => true}
     ]
   end
 
+  def get_available_blueprint_types(refresh=false)
+    if !@available_blueprint_types || refresh
+      begin
+        # results = @options_interface.options_for_source('blueprintTypes',{})
+        results = @blueprints_interface.list_types({})
+        @available_blueprint_types = results['types'].collect {|it|
+          {"name" => (it["name"] || it["code"]), "value" => (it["code"] || it["value"])}
+        }
+      rescue RestClient::Exception => e
+        # older version
+        @available_blueprint_types = [{"name" => "Morpheus", "value" => "morpheus"}, {"name" => "Terraform", "value" => "terraform"}, {"name" => "CloudFormation", "value" => "cloudFormation"}, {"name" => "ARM template", "value" => "arm"}]
+      end
+    end
+    #puts "get_available_blueprints() rtn: #{@available_blueprints.inspect}"
+    return @available_blueprint_types
+  end
+
   def update_blueprint_option_types(connected=true)
     list = add_blueprint_option_types(connected)
     list = list.reject {|it| ["group"].include? it['fieldName'] }
@@ -1842,6 +1970,7 @@ class Morpheus::Cli::BlueprintsCommand
         id: blueprint['id'],
         name: blueprint['name'],
         description: blueprint['description'],
+        type: blueprint['type'].kind_of?(Hash) ? blueprint['type']['name'] : blueprint['type'],
         category: blueprint['category'],
         tiers_summary: format_blueprint_tiers_summary(blueprint)
       }
@@ -1856,6 +1985,7 @@ class Morpheus::Cli::BlueprintsCommand
       :id,
       :name,
       :description,
+      :type,
       :category,
       {:tiers_summary => {:display_name => "TIERS", :max_width => tiers_col_width} }
     ]
@@ -1931,6 +2061,7 @@ class Morpheus::Cli::BlueprintsCommand
       "ID" => 'id',
       "Name" => 'name',
       "Description" => 'description',
+      "Type" => lambda {|it| it['type'].kind_of?(Hash) ? it['type']['name'] : it['type'] },
       "Category" => 'category',
       "Image" => lambda {|it| it['config'] ? (it['config']['image'] == '/assets/apps/template.png' ? '(default)' : it['config']['image']) : '' },
       "Visibility" => 'visibility'

data/lib/morpheus/cli/instances.rb

@@ -903,7 +903,7 @@ class Morpheus::Cli::Instances
         if containers.empty?
           print yellow,"No containers found for instance.",reset,"\n"
         else
-
+          containers = containers.sort { |x,y| x['id'] <=> y['id'] }
           rows = containers.collect {|container| 
             stats = container['stats']
             cpu_usage_str = !stats ? "" : generate_usage_bar((stats['usedCpu'] || stats['cpuUsage']).to_f, 100, {max_bars: 10})
@@ -1015,7 +1015,7 @@ class Morpheus::Cli::Instances
       
 
       containers = json_response['containers']
-
+      containers = containers.sort { |x,y| x['id'] <=> y['id'] }
       title = "Instance Containers: #{instance['name']} (#{instance['instanceType']['name']})"
       print_h1 title
       if containers.empty?

data/lib/morpheus/cli/packages_command.rb

@@ -8,7 +8,7 @@ class Morpheus::Cli::LibraryPackagesCommand
   include Morpheus::Cli::LibraryHelper
 
   set_command_name :'packages'
-  register_subcommands :list, :search, :get, :install, :update, :remove, :export
+  register_subcommands :list, :search, :get, :install, :update, :remove, :export, :build
   register_subcommands :'install-file' => :install_file
 
   # hide until this is released

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.2"
+    VERSION = "3.6.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler