morpheus-cli 5.5.2.2 → 5.5.3.1

data/lib/morpheus/cli/commands/archives_command.rb

@@ -383,7 +383,6 @@ class Morpheus::Cli::ArchivesCommand
   end
 
   def remove_bucket(args)
-    full_command_string = "#{command_name} remove #{args.join(' ')}".strip
     options = {}
     query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -414,7 +413,7 @@ class Morpheus::Cli::ArchivesCommand
       end
       @archive_buckets_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @archive_buckets_interface.dry.destroy(archive_bucket['id'], query_params), full_command_string
+        print_dry_run @archive_buckets_interface.dry.destroy(archive_bucket['id'], query_params)
         return 0
       end
       json_response = @archive_buckets_interface.destroy(archive_bucket['id'], query_params)
@@ -470,7 +469,7 @@ class Morpheus::Cli::ArchivesCommand
       puts_error  "#{command_name} missing argument: [local-file]\n#{optparse}"
       return 1
     end
-    if !File.exists?(local_file_path)
+    if !File.exist?(local_file_path)
       print_error Morpheus::Terminal.angry_prompt
       puts_error  "#{command_name} bad argument: [local-file]\nFile '#{local_file_path}' was not found.\n#{optparse}"
       return 1
@@ -595,7 +594,7 @@ class Morpheus::Cli::ArchivesCommand
       else
 
         # upload file
-        if !File.exists?(local_file_path) && !File.file?(local_file_path)
+        if !File.exist?(local_file_path) && !File.file?(local_file_path)
           print_error Morpheus::Terminal.angry_prompt
           puts_error  "#{command_name} bad argument: [local-file]\nFile '#{local_file_path}' was not found.\n#{optparse}"
           return 1
@@ -886,7 +885,6 @@ class Morpheus::Cli::ArchivesCommand
   end
 
   def get_file(args)
-    full_command_string = "#{command_name} get-file #{args.join(' ')}".strip
     options = {}
     max_links = 10
     max_history = 10
@@ -929,9 +927,9 @@ class Morpheus::Cli::ArchivesCommand
       @archive_files_interface.setopts(options)
       if options[:dry_run]
         if file_id
-          print_dry_run @archive_files_interface.dry.get(file_id, params), full_command_string
+          print_dry_run @archive_files_interface.dry.get(file_id, params)
         else
-          print_dry_run @archive_buckets_interface.dry.list_files(bucket_id, file_path, params), full_command_string
+          print_dry_run @archive_buckets_interface.dry.list_files(bucket_id, file_path, params)
         end
         return 0
       end
@@ -1211,7 +1209,6 @@ class Morpheus::Cli::ArchivesCommand
   end
 
   def download_file(args)
-    full_command_string = "#{command_name} download #{args.join(' ')}".strip
     options = {}
     outfile = nil
     do_overwrite = false
@@ -1256,15 +1253,15 @@ class Morpheus::Cli::ArchivesCommand
       #   outfile = File.join(outfile, File.basename(full_file_path))
       # end
       outfile = File.expand_path(outfile)
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         outfile = File.join(outfile, File.basename(full_file_path))
       end
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         print_red_alert "[local-file] is invalid. It is the name of an existing directory: #{outfile}"
         return 1
       end
       destination_dir = File.dirname(outfile)
-      if !Dir.exists?(destination_dir)
+      if !Dir.exist?(destination_dir)
         if do_mkdir
           print cyan,"Creating local directory #{destination_dir}",reset,"\n"
           FileUtils.mkdir_p(destination_dir)
@@ -1273,7 +1270,7 @@ class Morpheus::Cli::ArchivesCommand
           return 1
         end
       end
-      if File.exists?(outfile)
+      if File.exist?(outfile)
         if do_overwrite
           # uhh need to be careful wih the passed filepath here..
           # don't delete, just overwrite.
@@ -1288,11 +1285,10 @@ class Morpheus::Cli::ArchivesCommand
       begin
         @archive_files_interface.setopts(options)
         if options[:dry_run]
-          # print_dry_run @archive_files_interface.dry.download_file_by_path(full_file_path), full_command_string
           if use_public_url
-            print_dry_run @archive_files_interface.dry.download_public_file_by_path_chunked(full_file_path, outfile), full_command_string
+            print_dry_run @archive_files_interface.dry.download_public_file_by_path_chunked(full_file_path, outfile)
           else
-            print_dry_run @archive_files_interface.dry.download_file_by_path_chunked(full_file_path, outfile), full_command_string
+            print_dry_run @archive_files_interface.dry.download_file_by_path_chunked(full_file_path, outfile)
           end
           return 0
         end
@@ -1322,7 +1318,7 @@ class Morpheus::Cli::ArchivesCommand
             print red + "ERROR" + reset + " HTTP #{http_response.code}" + "\n"
           end
           # F it, just remove a bad result
-          if File.exists?(outfile) && File.file?(outfile)
+          if File.exist?(outfile) && File.file?(outfile)
             Morpheus::Logging::DarkPrinter.puts "Deleting bad file download: #{outfile}" if Morpheus::Logging.debug?
             File.delete(outfile)
           end
@@ -1348,7 +1344,6 @@ class Morpheus::Cli::ArchivesCommand
   end
 
   def read_file(args)
-    full_command_string = "archives read #{args.join(' ')}".strip
     options = {}
     outfile = nil
     do_overwrite = false
@@ -1374,7 +1369,7 @@ class Morpheus::Cli::ArchivesCommand
       full_file_path = "#{bucket_id}/#{file_path}".squeeze('/')
       @archive_files_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @archive_files_interface.dry.download_file_by_path(full_file_path), full_command_string
+        print_dry_run @archive_files_interface.dry.download_file_by_path(full_file_path)
         return 1
       end
       if archive_file['rawSize'].to_i > 1024
@@ -1497,7 +1492,6 @@ class Morpheus::Cli::ArchivesCommand
   end
 
   def download_file_link(args)
-    full_command_string = "archives download-link #{args.join(' ')}".strip
     options = {}
     outfile = nil
     do_overwrite = false
@@ -1533,15 +1527,15 @@ class Morpheus::Cli::ArchivesCommand
       # full_file_path = args[0]
       outfile = File.expand_path(args[1])
       # [local-file] must include the full file name when downloading a link
-      # if Dir.exists?(outfile)
+      # if Dir.exist?(outfile)
       #   outfile = File.join(outfile, File.basename(archive_file['name']))
       # end
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         print_red_alert "[local-file] is invalid. It is the name of an existing directory: #{outfile}"
         return 1
       end
       destination_dir = File.dirname(outfile)
-      if !Dir.exists?(destination_dir)
+      if !Dir.exist?(destination_dir)
         if do_mkdir
           print cyan,"Creating local directory #{destination_dir}",reset,"\n"
           FileUtils.mkdir_p(destination_dir)
@@ -1550,7 +1544,7 @@ class Morpheus::Cli::ArchivesCommand
           return 1
         end
       end
-      if File.exists?(outfile)
+      if File.exist?(outfile)
         if do_overwrite
           # uhh need to be careful wih the passed filepath here..
           # don't delete, just overwrite.
@@ -1566,8 +1560,7 @@ class Morpheus::Cli::ArchivesCommand
       end
       @archive_files_interface.setopts(options)
       if options[:dry_run]
-        # print_dry_run @archive_files_interface.dry.download_file_by_path(full_file_path), full_command_string
-        print_dry_run @archive_files_interface.dry.download_file_by_link_chunked(link_key, outfile), full_command_string
+        print_dry_run @archive_files_interface.dry.download_file_by_link_chunked(link_key, outfile)
         return 1
       end
       if !options[:quiet]
@@ -1591,7 +1584,7 @@ class Morpheus::Cli::ArchivesCommand
           print red + "ERROR" + reset + " HTTP #{http_response.code}" + "\n"
         end
         # F it, just remove a bad result
-        if File.exists?(outfile) && File.file?(outfile)
+        if File.exist?(outfile) && File.file?(outfile)
           Morpheus::Logging::DarkPrinter.puts "Deleting bad file download: #{outfile}" if Morpheus::Logging.debug?
           File.delete(outfile)
         end
@@ -1608,7 +1601,6 @@ class Morpheus::Cli::ArchivesCommand
   end
 
   def download_bucket_zip(args)
-    full_command_string = "#{command_name} download-bucket #{args.join(' ')}".strip
     options = {}
     outfile = nil
     do_overwrite = false
@@ -1651,10 +1643,10 @@ class Morpheus::Cli::ArchivesCommand
       #   outfile = File.join(outfile, archive_bucket['name'].to_s) + ".zip"
       # end
       outfile = File.expand_path(outfile)
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         outfile = File.join(outfile, archive_bucket['name'].to_s) + ".zip"
       end
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         print_red_alert "[local-file] is invalid. It is the name of an existing directory: #{outfile}"
         return 1
       end
@@ -1663,7 +1655,7 @@ class Morpheus::Cli::ArchivesCommand
         outfile << ".zip"
       end
       destination_dir = File.dirname(outfile)
-      if !Dir.exists?(destination_dir)
+      if !Dir.exist?(destination_dir)
         if do_mkdir
           print cyan,"Creating local directory #{destination_dir}",reset,"\n"
           FileUtils.mkdir_p(destination_dir)
@@ -1672,7 +1664,7 @@ class Morpheus::Cli::ArchivesCommand
           return 1
         end
       end
-      if File.exists?(outfile)
+      if File.exist?(outfile)
         if do_overwrite
           # uhh need to be careful wih the passed filepath here..
           # don't delete, just overwrite.
@@ -1686,7 +1678,7 @@ class Morpheus::Cli::ArchivesCommand
       end
       @archive_buckets_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @archive_buckets_interface.dry.download_bucket_zip_chunked(bucket_id, outfile), full_command_string
+        print_dry_run @archive_buckets_interface.dry.download_bucket_zip_chunked(bucket_id, outfile)
         return 1
       end
       if !options[:quiet]
@@ -1707,7 +1699,7 @@ class Morpheus::Cli::ArchivesCommand
           print red + "ERROR" + reset + " HTTP #{http_response.code}" + "\n"
         end
         # F it, just remove a bad result
-        if File.exists?(outfile) && File.file?(outfile)
+        if File.exist?(outfile) && File.file?(outfile)
           Morpheus::Logging::DarkPrinter.puts "Deleting bad file download: #{outfile}" if Morpheus::Logging.debug?
           File.delete(outfile)
         end

data/lib/morpheus/cli/commands/backup_settings_command.rb

@@ -66,7 +66,7 @@ class Morpheus::Cli::BackupSettingsCommand
         "Backup Retention Count" => lambda {|it| it['retentionCount'] }
       }
       print_description_list(description_cols, backup_settings)
-      print reset "\n"
+      print reset, "\n"
       return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)

data/lib/morpheus/cli/commands/blueprints_command.rb

@@ -260,7 +260,7 @@ class Morpheus::Cli::BlueprintsCommand
   end
 
   def update(args)
-    params, payload, options = {}, {}, {}
+    payload, options = {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[blueprint] [options]")
       build_option_type_options(opts, options, update_blueprint_option_types(false))
@@ -283,7 +283,6 @@ class Morpheus::Cli::BlueprintsCommand
       blueprint = find_blueprint_by_name_or_id(args[0])
       return 1 if blueprint.nil?
       payload = {}
-      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
       if options[:payload]
         payload = options[:payload]
         payload.deep_merge!(parse_passed_options(options))
@@ -341,7 +340,7 @@ class Morpheus::Cli::BlueprintsCommand
   end
 
   def update_permissions(args)
-    params, payload, options = {}, {}, {}
+    payload, options = {}, {}
     group_access_all = nil
     group_access_list = nil
     group_defaults_list = nil
@@ -453,7 +452,6 @@ class Morpheus::Cli::BlueprintsCommand
 
 
   def upload_image(args)
-    image_type_name = nil
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[blueprint] [file]")
@@ -889,7 +887,7 @@ class Morpheus::Cli::BlueprintsCommand
   end
 
   def remove_instance_config(args)
-    instance_index = nil
+    #instance_index = nil
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[blueprint] [tier] [instance] -g GROUP -c CLOUD")
@@ -1081,7 +1079,7 @@ class Morpheus::Cli::BlueprintsCommand
   end
 
   def remove_instance(args)
-    instance_index = nil
+    #instance_index = nil
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[blueprint] [tier] [instance]")
@@ -1402,7 +1400,6 @@ class Morpheus::Cli::BlueprintsCommand
         new_tier_name = v_prompt['name']
       end
       if new_tier_name && new_tier_name != tier_name
-        old_tier_name = tier_name
         if tiers[new_tier_name]
           print_red_alert "A tier named #{tier_name} already exists."
           return 1
@@ -1415,7 +1412,6 @@ class Morpheus::Cli::BlueprintsCommand
             v['linkedTiers'] = v['linkedTiers'].map {|it| it == tier_name ? new_tier_name : it }
           end
         end
-        # old_tier_name = tier_name
         tier_name = new_tier_name
       end
 
@@ -1577,15 +1573,9 @@ class Morpheus::Cli::BlueprintsCommand
       tiers = blueprint["config"]["tiers"]
 
       if !tiers || tiers.keys.size == 0
-        error_msg = "Blueprint #{blueprint['name']} has no tiers."
-        # print_red_alert "Blueprint #{blueprint['name']} has no tiers."
-        # raise_command_error "Blueprint #{blueprint['name']} has no tiers."
-        print_error Morpheus::Terminal.angry_prompt
-        puts_error  "Blueprint #{blueprint['name']} has no tiers."
-        return 1
+        raise_command_error "Blueprint #{blueprint['name']} has no tiers."
       end
 
-      connect_tiers = []
       tier1 = tiers[tier1_name]
       tier2 = tiers[tier2_name]
       # uhh support N args
@@ -1682,7 +1672,6 @@ class Morpheus::Cli::BlueprintsCommand
         return 1
       end
 
-      connect_tiers = []
       tier1 = tiers[tier1_name]
       tier2 = tiers[tier2_name]
       # uhh support N args
@@ -1859,7 +1848,7 @@ class Morpheus::Cli::BlueprintsCommand
         @available_blueprint_types = results['types'].collect {|it|
           {"name" => (it["name"] || it["code"]), "value" => (it["code"] || it["value"])}
         }
-      rescue RestClient::Exception => e
+      rescue RestClient::Exception
         # older version
         @available_blueprint_types = [{"name" => "Morpheus", "value" => "morpheus"}, {"name" => "Terraform", "value" => "terraform"}, {"name" => "CloudFormation", "value" => "cloudFormation"}, {"name" => "ARM template", "value" => "arm"}]
       end
@@ -1935,7 +1924,7 @@ class Morpheus::Cli::BlueprintsCommand
     table_color = opts[:color] || cyan
     rows = blueprints.collect do |blueprint|
       #instance_type_names = (blueprint['instanceTypes'] || []).collect {|it| it['name'] }.join(', ')
-      instance_type_names = []
+      #instance_type_names = []
       # if blueprint['config'] && blueprint['config']["tiers"]
       #   blueprint['config']["tiers"]
       # end
@@ -2086,7 +2075,7 @@ class Morpheus::Cli::BlueprintsCommand
           end
           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_name = tier_obj[0]
             tier_config = tier_obj[1]
             if tier_config && tier_config['instances']
               tier_config['instances'].each_with_index do |instance_config, instance_index|
@@ -2145,7 +2134,7 @@ class Morpheus::Cli::BlueprintsCommand
                 config_list.each do |config_obj| 
                   # puts "     = #{config_obj[:scope].inspect}"
                   config_scope = config_obj[:scope]
-                  scoped_instance_config = config_obj[:config]
+                  #scoped_instance_config = config_obj[:config]
                   config_description = ""
                   config_items = []
                   if config_scope[:environment]
@@ -2167,7 +2156,7 @@ class Morpheus::Cli::BlueprintsCommand
                 print white,"  Instance has no configs, use `blueprints add-instance-config \"#{blueprint['name']}\" \"#{tier_name}\" \"#{instance_name.to_s.empty? ? instance_type_code : instance_name}\"`",reset,"\n"
               end
             rescue => err
-              #puts_error "Failed to parse instance scoped instance configs for blueprint #{blueprint['id']} #{blueprint['name']} Exception: #{err.class} #{err.message}"
+              Morpheus::Logging::DarkPrinter.puts "Failed to parse instance config at index #{instance_index}. Exception: #{err.class} #{err.message}" if Morpheus::Logging.debug?
             end
             print "\n"
             #puts as_yaml(instance_config)

data/lib/morpheus/cli/commands/boot_scripts_command.rb

@@ -173,7 +173,7 @@ class Morpheus::Cli::BootScriptsCommand
       params = Morpheus::Cli::OptionTypes.prompt(my_options, options[:options], @api_client, options[:params])
       script_file = params.delete('file')
       if script_file
-        if !File.exists?(script_file)
+        if !File.exist?(script_file)
           print_red_alert "File not found: #{script_file}"
           return 1
         end
@@ -244,7 +244,7 @@ class Morpheus::Cli::BootScriptsCommand
       # params = Morpheus::Cli::OptionTypes.prompt(my_options, options[:options], @api_client, options[:params])
       script_file = params.delete('file')
       if script_file
-        if !File.exists?(script_file)
+        if !File.exist?(script_file)
           print_red_alert "File not found: #{script_file}"
           return 1
         end

data/lib/morpheus/cli/commands/cat_command.rb

@@ -25,7 +25,7 @@ class Morpheus::Cli::CatCommand
     arg_files = args
     arg_files.each do |arg_file|
       arg_file = File.expand_path(arg_file)
-      if !File.exists?(arg_file)
+      if !File.exist?(arg_file)
         print_error Morpheus::Terminal.angry_prompt
         puts_error  "#{command_name}:  file not found: '#{arg_file}'"
         #print_red_alert "morpheus cat: file not found: '#{arg_file}'"

data/lib/morpheus/cli/commands/catalog_item_types_command.rb

@@ -248,7 +248,7 @@ EOT
           logo_file = 'null' # clear it
         else
           filename = File.expand_path(filename)
-          if !File.exists?(filename)
+          if !File.exist?(filename)
             raise_command_error "File not found: #{filename}"
           end
           logo_file = File.new(filename, 'rb')
@@ -261,7 +261,7 @@ EOT
           dark_logo_file = 'null' # clear it
         else
           filename = File.expand_path(filename)
-          if !File.exists?(filename)
+          if !File.exist?(filename)
             raise_command_error "File not found: #{filename}"
           end
           dark_logo_file = File.new(filename, 'rb')
@@ -271,7 +271,7 @@ EOT
         options[:config_file] = val.to_s
         file_content = nil
         full_filename = File.expand_path(options[:config_file])
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_content = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -281,7 +281,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map
@@ -345,7 +345,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map
@@ -405,7 +405,7 @@ EOT
           logo_file = 'null' # clear it
         else
           filename = File.expand_path(filename)
-          if !File.exists?(filename)
+          if !File.exist?(filename)
             raise_command_error "File not found: #{filename}"
           end
           logo_file = File.new(filename, 'rb')
@@ -418,7 +418,7 @@ EOT
           dark_logo_file = 'null' # clear it
         else
           filename = File.expand_path(filename)
-          if !File.exists?(filename)
+          if !File.exist?(filename)
             raise_command_error "File not found: #{filename}"
           end
           dark_logo_file = File.new(filename, 'rb')
@@ -428,7 +428,7 @@ EOT
         options[:config_file] = val.to_s
         file_content = nil
         full_filename = File.expand_path(options[:config_file])
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_content = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -438,7 +438,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map
@@ -495,7 +495,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map
@@ -564,7 +564,7 @@ EOT
       logo_file = 'null' # clear it
     else
       filename = File.expand_path(filename)
-      if !File.exists?(filename)
+      if !File.exist?(filename)
         raise_command_error "File not found: #{filename}"
       end
       logo_file = File.new(filename, 'rb')
@@ -603,7 +603,7 @@ EOT
       dark_logo_file = 'null' # clear it
     else
       filename = File.expand_path(filename)
-      if !File.exists?(filename)
+      if !File.exist?(filename)
         raise_command_error "File not found: #{filename}"
       end
       dark_logo_file = File.new(filename, 'rb')
@@ -660,6 +660,8 @@ EOT
       "Labels" => lambda {|it| format_list(it['labels'], '', 3) },
       "Description" => 'description',
       "Type" => lambda {|it| format_catalog_type(it) },
+      "Visibility" => 'visibility',
+      "Layout Code" => 'layoutCode',
       "Blueprint" => lambda {|it| it['blueprint'] ? it['blueprint']['name'] : nil },
       "Workflow" => lambda {|it| it['workflow'] ? it['workflow']['name'] : nil },
       "Context" => lambda {|it| it['context'] },
@@ -679,6 +681,8 @@ EOT
       "Labels" => lambda {|it| format_list(it['labels']) },
       "Description" => 'description',
       "Type" => lambda {|it| format_catalog_type(it) },
+      "Visibility" => 'visibility',
+      "Layout Code" => 'layoutCode',
       "Blueprint" => lambda {|it| it['blueprint'] ? it['blueprint']['name'] : nil },
       "Workflow" => lambda {|it| it['workflow'] ? it['workflow']['name'] : nil },
       "Context" => lambda {|it| it['context'] },
@@ -725,7 +729,8 @@ EOT
       {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'defaultValue' => true, 'displayOrder' => 4},
       {'fieldName' => 'featured', 'fieldLabel' => 'Featured', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 5},
       {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'required' => true, 'displayOrder' => 6},
-      {'fieldName' => 'iconPath', 'fieldLabel' => 'Logo', 'type' => 'select', 'optionSource' => 'iconList', 'displayOrder' => 7},
+      {'fieldName' => 'layoutCode', 'fieldLabel' => 'Layout Code', 'type' => 'text', 'required' => false, 'displayOrder' => 7},
+      {'fieldName' => 'iconPath', 'fieldLabel' => 'Logo', 'type' => 'select', 'optionSource' => 'iconList', 'displayOrder' => 8},
       #{'fieldName' => 'optionTypes', 'fieldLabel' => 'Option Types', 'type' => 'text', 'description' => 'Option Types to include, comma separated list of names or IDs.', 'displayOrder' => 8},
       {'dependsOnCode' => 'catalogItemType.type:instance', 'fieldName' => 'config', 'fieldLabel' => 'Config', 'type' => 'code-editor', 'description' => 'JSON or YAML', 'required' => true, 'displayOrder' => 9},
       {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'blueprint', 'fieldLabel' => 'Blueprint', 'type' => 'select', 'optionSource' => 'blueprints', 'description' => 'Choose a blueprint to apply to the catalog item.', 'required' => true, 'noParams' => true, 'displayOrder' => 10},

data/lib/morpheus/cli/commands/clouds.rb

@@ -891,7 +891,7 @@ class Morpheus::Cli::Clouds
       build_option_type_options(opts, options, update_wiki_page_option_types)
       opts.on('--file FILE', "File containing the wiki content. This can be used instead of --content") do |filename|
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           params['content'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -987,7 +987,7 @@ EOT
         logo_file = 'null' # clear it
       else
         filename = File.expand_path(filename)
-        if !File.exists?(filename)
+        if !File.exist?(filename)
           print_red_alert "File not found: #{filename}"
           exit 1
         end
@@ -1037,7 +1037,7 @@ EOT
         dark_logo_file = 'null' # clear it
       else
         filename = File.expand_path(filename)
-        if !File.exists?(filename)
+        if !File.exist?(filename)
           print_red_alert "File not found: #{filename}"
           exit 1
         end