morpheus-cli 3.6.3 → 3.6.4

data/lib/morpheus/cli/blueprints_command.rb

@@ -43,16 +43,15 @@ class Morpheus::Cli::BlueprintsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List blueprints."
     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
+      params.merge!(parse_list_options(options))
+
       if options[:dry_run]
         print_dry_run @blueprints_interface.dry.list(params)
         return
@@ -75,10 +74,9 @@ class Morpheus::Cli::BlueprintsCommand
       
       title = "Morpheus Blueprints"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
+
       if blueprints.empty?
         print cyan,"No blueprints found.",reset,"\n"
       else
@@ -101,7 +99,7 @@ class Morpheus::Cli::BlueprintsCommand
       opts.on( '-c', '--config', "Display raw config only. Default is YAML. Combine with -j for JSON instead." ) do
         options[:show_config] = true
       end
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :outfile, :dry_run, :remote])
       opts.footer = "Get details about a blueprint.\n" +
                     "[id] is required. This is the name or id of a blueprint."
     end
@@ -127,61 +125,48 @@ class Morpheus::Cli::BlueprintsCommand
       #json_response = @blueprints_interface.get(blueprint['id'])
       blueprint = json_response['blueprint']
 
+      # export just the config as json or yaml (default)
       if options[:show_config]
-        #print_h2 "RAW"
-        if options[:json]
-          print cyan
-          print "// JSON config for Morpheus Blueprint: #{blueprint['name']}","\n"
-          print reset
-          puts as_json(blueprint["config"])
-        else
-          print cyan
-          print "# YAML config for Morpheus Blueprint: #{blueprint['name']}","\n"
-          print reset
-          puts as_yaml(blueprint["config"])
+        unless options[:json] || options[:yaml] || options[:csv]
+          options[:yaml] = true
         end
-        return 0
+        blueprint_config = blueprint['config']
+        render_result = render_with_format(blueprint_config, options)
+        return 0 if render_result
       end
 
-      if options[:json]
-        puts as_json(json_response, options, "blueprint")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "blueprint")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv([json_response['blueprint']], options)
-        return 0
-      end
-      
+      render_result = render_with_format(json_response, options, 'blueprint')
+      return 0 if render_result
+
       print_h1 "Blueprint Details"
       
       print_blueprint_details(blueprint)
 
       if blueprint['resourcePermission'].nil?
-        print "\n", "No group access found", "\n"
+        #print "\n", "No group access found", "\n"
       else
-        print_h2 "Group Access"
-        rows = []
-        if blueprint['resourcePermission']['allSites'] || blueprint['resourcePermission']['all']
-          rows.push({"name" => 'All'})
-        end
-        if blueprint['resourcePermission']['sites']
-          blueprint['resourcePermission']['sites'].each do |site|
-            rows.push(site)
-          end
-        end
-        rows = rows.collect do |site|
-          {group: site['name'], default: site['default'] ? 'Yes' : ''}
-        end
-        # columns = [:group, :default]
-        columns = [:group]
-        print cyan
-        print as_pretty_table(rows, columns)
+        # print_h2 "Group Access"
+        # rows = []
+        # if blueprint['resourcePermission']['allSites'] || blueprint['resourcePermission']['all']
+        #   rows.push({"name" => 'All'})
+        # end
+        # if blueprint['resourcePermission']['sites']
+        #   blueprint['resourcePermission']['sites'].each do |site|
+        #     rows.push(site)
+        #   end
+        # end
+        # rows = rows.collect do |site|
+        #   {group: site['name'], default: site['default'] ? 'Yes' : ''}
+        # end
+        # # columns = [:group, :default]
+        # columns = [:group]
+        # print cyan
+        # print as_pretty_table(rows, columns)
+        # print reset,"\n"
       end
 
-      print reset,"\n"
-      
+      #print reset,"\n"
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -192,83 +177,42 @@ class Morpheus::Cli::BlueprintsCommand
     options = {}
     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)
-      end
-      opts.on('--config-yaml YAML', String, "Blueprint Config YAML") do |val|
-        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[: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, :quiet, :remote])
+      opts.on('-t', '--type TYPE', String, "Blueprint Type. Default is morpheus.") do |val|
+        options[:blueprint_type] = val.to_s
+      end
+      build_common_options(opts, options, [:options, :payload, :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."
+                    "[name] is required. This is the name of the new blueprint."
     end
     optparse.parse!(args)
     if args.count > 1
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} add expects 0-1 arguments and received #{args.count}: #{args.join(' ')}\n#{optparse}"
+      puts_error  "#{command_name} add expects 0-1 arguments and received #{args.count}: #{args}\n#{optparse}"
       return 1
     end
     options[:options] ||= {}
-    if args[0] && !options[:options]['name']
+    if args[0]
       options[:options]['name'] = args[0]
     end
     connect(options)
     begin
-      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
-        end
-        if config_file =~ /\.ya?ml\Z/
-          config_payload = YAML.load_file(config_file)
-        else
-          config_payload = JSON.parse(File.read(config_file))
-        end
-        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]
+      payload = {}
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!(passed_options) unless passed_options.empty?
       else
+        # prompt for payload
         payload = {}
-        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        payload.deep_merge!(passed_options) unless passed_options.empty?
+        if options[:blueprint_type]
+          options[:options]['type'] = options[:blueprint_type]
+        else
+          # options[:options]['type'] = 'morpheus'
+        end
         params = Morpheus::Cli::OptionTypes.prompt(add_blueprint_option_types, options[:options], @api_client, options[:params])
+        params.deep_compact!
         #blueprint_payload = params.select {|k,v| ['name', 'description', 'category'].include?(k) }
         # expects no namespace, just the config
         #payload = blueprint_payload
@@ -289,8 +233,7 @@ class Morpheus::Cli::BlueprintsCommand
         blueprint = json_response["blueprint"]
         print_green_success "Added blueprint #{blueprint['name']}"
         if !options[:no_prompt]
-          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}))
+          if options[:payload].nil? && ::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']])
@@ -312,20 +255,8 @@ class Morpheus::Cli::BlueprintsCommand
     options = {}
     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)
-      end
-      opts.on('--config-yaml YAML', String, "Blueprint Config YAML") do |val|
-        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[: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])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
       opts.footer = "Update a blueprint.\n" + 
                     "[id] is required. This is the name or id of a blueprint.\n" +
                     "[options] Available options include --name and --description. This will update only the specified values.\n" +
@@ -343,54 +274,23 @@ class Morpheus::Cli::BlueprintsCommand
     begin
 
       blueprint = find_blueprint_by_name_or_id(args[0])
-      exit 1 if blueprint.nil?
+      return 1 if blueprint.nil?
 
-      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
-        end
-        if config_file =~ /\.ya?ml\Z/
-          config_payload = YAML.load_file(config_file)
-        else
-          config_payload = JSON.parse(File.read(config_file))
-        end
-        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]
+      payload = {}
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!(passed_options) unless passed_options.empty?
       else
+        # no prompting, just merge passed options
         payload = blueprint["config"]
-        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        payload.deep_merge!(passed_options) unless passed_options.empty?
+
+        if passed_options.empty?
+          print_red_alert "Specify atleast one option to update"
+          puts optparse
+          return 1
+        end
       end
       
       if options[:dry_run]
@@ -535,7 +435,7 @@ class Morpheus::Cli::BlueprintsCommand
     optparse.parse!(args)
     if args.count != 2
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} upload-image expects 2 arguments and received #{args.count}: #{args.join(' ')}\n#{optparse}"
+      puts_error  "#{command_name} upload-image expects 2 arguments and received #{args.count}: #{args}\n#{optparse}"
       return 1
     end
     blueprint_name = args[0]
@@ -690,7 +590,7 @@ class Morpheus::Cli::BlueprintsCommand
 
     if args.count < 1
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} add-instance expects 3 arguments and received #{args.count}: #{args.join(' ')}\n#{optparse}"
+      puts_error  "#{command_name} add-instance expects 3 arguments and received #{args.count}: #{args}\n#{optparse}"
       return 1
     end
 
@@ -1248,6 +1148,7 @@ class Morpheus::Cli::BlueprintsCommand
     options = {}
     boot_order = nil
     linked_tiers = nil
+    tier_index = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id] [tier]")
       opts.on('--name VALUE', String, "Tier Name") do |val|
@@ -1259,6 +1160,9 @@ class Morpheus::Cli::BlueprintsCommand
       opts.on('--linkedTiers x,y,z', Array, "Connected Tiers.") do |val|
         linked_tiers = val
       end
+      opts.on('--tierIndex NUMBER', Array, "Tier Index. Used for Display Order") do |val|
+        tier_index = val
+      end
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1329,6 +1233,19 @@ class Morpheus::Cli::BlueprintsCommand
         end
       end
 
+      # Tier Index
+      if !tier_index
+        #v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'tierIndex', 'fieldLabel' => 'Tier Index', 'type' => 'number', 'required' => false, 'description' => 'Sequence order for displaying app instances by tier. 0-N', 'defaultValue' => tier['tierIndex']}], options[:options])
+        #tier_index = v_prompt['tierIndex']
+        tier_index = (tiers.size - 1)
+      end
+
+      if tier_index.to_s == 'null'
+        tier.delete('tierIndex')
+      elsif tier_index
+        tier['tierIndex'] = tier_index.to_i
+      end
+
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
       payload = blueprint["config"]
@@ -1370,6 +1287,7 @@ class Morpheus::Cli::BlueprintsCommand
     new_tier_name = nil
     boot_order = nil
     linked_tiers = nil
+    tier_index = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id] [tier]")
       opts.on('--name VALUE', String, "Tier Name") do |val|
@@ -1381,13 +1299,16 @@ class Morpheus::Cli::BlueprintsCommand
       opts.on('--linkedTiers x,y,z', Array, "Connected Tiers") do |val|
         linked_tiers = val
       end
+      opts.on('--tierIndex NUMBER', String, "Tier Index. Used for Display Order") do |val|
+        tier_index = val.to_i
+      end
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
     if args.count != 2
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} update-tier expects 2 arguments and received #{args.count}: #{args.join(' ')}\n#{optparse}"
+      puts_error  "#{command_name} update-tier expects 2 arguments and received #{args.count}: #{args}\n#{optparse}"
       return 1
     end
     blueprint_name = args[0]
@@ -1409,15 +1330,18 @@ class Morpheus::Cli::BlueprintsCommand
       end
       tier = tiers[tier_name]
 
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
       
       if options[:no_prompt]
-        if !(new_tier_name || boot_order || linked_tiers)
+        if !(new_tier_name || boot_order || linked_tiers || tier_index || !passed_options.empty?)
           print_error Morpheus::Terminal.angry_prompt
           puts_error  "#{command_name} update-tier requires an option to update.\n#{optparse}"
           return 1
         end
       end
 
+      tier.deep_merge!(passed_options) unless passed_options.empty?
+
       # prompt update tier
       # Name
       if !new_tier_name
@@ -1474,6 +1398,13 @@ class Morpheus::Cli::BlueprintsCommand
         end
       end
 
+      # Tier Index
+      if tier_index.to_s == 'null'
+        tier.delete('tierIndex')
+      elsif tier_index
+        tier['tierIndex'] = tier_index.to_i
+      end
+
       # ok, make api request
       blueprint["config"]["tiers"] = tiers
       payload = blueprint["config"]
@@ -1508,7 +1439,7 @@ class Morpheus::Cli::BlueprintsCommand
 
     if args.count < 2
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} remove-tier expects 2 arguments and received #{args.count}: #{args.join(' ')}\n#{optparse}"
+      puts_error  "#{command_name} remove-tier expects 2 arguments and received #{args.count}: #{args}\n#{optparse}"
       return 1
     end
     blueprint_name = args[0]
@@ -1575,7 +1506,7 @@ class Morpheus::Cli::BlueprintsCommand
 
     if args.count < 3
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} connect-tiers expects 3 arguments and received #{args.count}: #{args.join(' ')}\n#{optparse}"
+      puts_error  "#{command_name} connect-tiers expects 3 arguments and received #{args.count}: #{args}\n#{optparse}"
       # puts optparse
       return 1
     end
@@ -1673,7 +1604,7 @@ class Morpheus::Cli::BlueprintsCommand
 
     if args.count < 3
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} disconnect-tiers expects 3 arguments and received #{args.count}: #{args.join(' ')}\n#{optparse}"
+      puts_error  "#{command_name} disconnect-tiers expects 3 arguments and received #{args.count}: #{args}\n#{optparse}"
       # puts optparse
       return 1
     end
@@ -1869,11 +1800,10 @@ class Morpheus::Cli::BlueprintsCommand
 
   def add_blueprint_option_types(connected=true)
     [
-      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
-      # 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' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for this app'},
+      {'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => (connected ? get_available_blueprint_types() : []), 'required' => true, 'defaultValue' => 'morpheus'},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false},
+      {'fieldName' => 'category', 'fieldLabel' => 'Category', 'type' => 'text', 'required' => false},
       #{'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'selectOptions' => (connected ? get_available_groups() : []), 'required' => true}
     ]
   end
@@ -1897,7 +1827,7 @@ class Morpheus::Cli::BlueprintsCommand
 
   def update_blueprint_option_types(connected=true)
     list = add_blueprint_option_types(connected)
-    list = list.reject {|it| ["group"].include? it['fieldName'] }
+    list = list.select {|it| ["name","decription","category"].include? it['fieldName'] }
     list.each {|it| it['required'] = false }
     list
   end
@@ -2064,14 +1994,36 @@ class Morpheus::Cli::BlueprintsCommand
       "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'
+      "Visibility" => 'visibility',
+      "Group Access" => lambda {|it| 
+        group_access_str = ""
+        begin
+          rows = []
+          if blueprint['resourcePermission']['allSites'] || blueprint['resourcePermission']['all']
+            rows.push({"name" => 'All'})
+          end
+          if blueprint['resourcePermission']['sites']
+            blueprint['resourcePermission']['sites'].each do |site|
+              rows.push(site)
+            end
+          end
+          group_access_str = rows.collect {|it| it['default'] ? "#{it['name']} (default)" : "#{it['name']}"}.join(',')
+        rescue => ex
+          Morpheus::Logging::DarkPrinter.puts "Error parsing group access: #{ex}" if Morpheus::Logging.debug?
+        end
+        group_access_str
+      }
     }
     print_description_list(description_cols, blueprint)
     # print_h2 "Tiers"
     if blueprint["config"] && blueprint["config"]["tiers"] && blueprint["config"]["tiers"].keys.size != 0
       print cyan
       #puts as_yaml(blueprint["config"]["tiers"])
-      blueprint["config"]["tiers"].each do |tier_name, tier_config|
+      tiers = blueprint["config"]["tiers"]
+      sorted_tiers = tiers.collect {|k,v| [k,v] }.sort {|a,b| a[1]['tierIndex'] <=> b[1]['tierIndex'] }
+      sorted_tiers.each do |tier_obj|
+        tier_name = tier_obj[0]
+        tier_config = tier_obj[1]
         # print_h2 "Tier: #{tier_name}"
         print_h2 tier_name
         # puts "  Instances:"