morpheus-cli 5.5.2.1 → 5.5.3

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')

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

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

@@ -23,6 +23,7 @@ class Morpheus::Cli::Clusters
   register_subcommands :update_permissions
   register_subcommands :api_config, :view_api_token, :view_kube_config
   register_subcommands :wiki, :update_wiki
+  register_subcommands :apply_template
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -42,6 +43,7 @@ class Morpheus::Cli::Clusters
     @user_groups_interface = @api_client.user_groups
     @accounts_interface = @api_client.accounts
     @logs_interface = @api_client.logs
+    @execution_request_interface = @api_client.execution_request
     #@active_security_group = ::Morpheus::Cli::SecurityGroups.load_security_group_file
   end
 
@@ -3242,7 +3244,7 @@ class Morpheus::Cli::Clusters
       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}"
@@ -3562,6 +3564,125 @@ class Morpheus::Cli::Clusters
     end
   end
 
+  def apply_template(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cluster] --specTemplate --serviceUrl")
+      opts.on("--specTemplate [TEXT]", String, "Name or ID of desired Spec Template to apply to cluster") do |val|
+        options[:specTemplate] = val.to_s
+      end
+      opts.on("--serviceUrl [TEXT]", String, "Url of template to apply to Cluster") do |val|
+        options[:serviceUrl] = val.to_s
+      end
+       opts.on("--specYaml [TEXT]", String, "Yaml to apply to Cluster") do |val|
+        options[:specYaml] = val.to_s
+      end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Apply a Template to a Cluster.\n" +
+                    "[cluster] is required. This is the name or id of an existing cluster."
+    end
+
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    begin
+      payload = nil
+      cluster = nil
+
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of --payload
+        if options[:options]
+          payload['cluster'] ||= {}
+          payload['cluster'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+        end
+
+        if !payload['cluster'].empty?
+          cluster = find_cluster_by_name_or_id(payload['cluster']['id'] || payload['cluster']['name'])
+        end
+      else
+        cluster = find_cluster_by_name_or_id(args[0])
+        cluster_payload = {}
+        cluster_payload['specTemplate'] = options[:specTemplate] if !options[:specTemplate].empty?
+        cluster_payload['serviceUrl'] = options[:serviceUrl] if !options[:serviceUrl].empty?
+        cluster_payload['specYaml'] = options[:specYaml] if !options[:specYaml].empty?
+        payload = cluster_payload
+      end
+
+      if !cluster
+        print_red_alert "No clusters available for update"
+        exit 1
+      end
+
+      if cluster_payload.empty?
+        type = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => "Type", 'selectOptions' => apply_temp_options, 'required' => true, 'description' => 'Choose type of template being used.'}])['type']
+        if type == 'specTemplate'
+          cluster_payload['specTemplate'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'specTemplate', 'type' => 'select', 'fieldLabel' => "Spec Template", 'selectOptions' => available_kube_templates, 'required' => true, 'description' => 'Choose a template.'}], options[:options])['specTemplate'] 
+        elsif type == 'yaml'
+          file_params = Morpheus::Cli::OptionTypes.file_content_prompt({'fieldName' => 'source', 'fieldLabel' => 'File Content', 'type' => 'file-content', 'required' => true}, {'source' => {'source' => 'local'}}, nil, {})
+          cluster_payload['specYaml'] = file_params['content']
+        else
+          cluster_payload['specUrl'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'specUrl', 'type' => 'text', 'fieldLabel' => 'Spec Url', 'required' => true, 'description' => 'Url of template.'}])['specUrl']
+        end
+      end
+
+      if options[:dry_run]
+        print_dry_run @clusters_interface.dry.apply_template(cluster['id'], cluster_payload)
+        return
+      end
+
+      json_response = @clusters_interface.apply_template(cluster['id'], cluster_payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      elsif json_response['msg'] != nil
+        print_red_alert "There was an error #{json_response['msg']}"
+      else
+        print_green_success 'Template applied to Cluster. Check Execution Request for results'
+        json_response = @execution_request_interface.get(json_response['executionId'], {})
+
+        if json_response['executionRequest'] && json_response['executionRequest']['errorMessage']
+          print_red_alert "There was an error: #{json_response['executionRequest']['errorMessage']}"
+          print_red_alert "execution request id: #{json_response['executionRequest']['uniqueId']}"
+        else
+          execution_request = json_response['executionRequest']
+          print_h1 "Execution Request Details"
+          print cyan
+          description_cols = {
+            #"ID" => lambda {|it| it['id'] },
+            "Unique ID" => lambda {|it| it['uniqueId'] },
+            "Server ID" => lambda {|it| it['serverId'] },
+            "Instance ID" => lambda {|it| it['instanceId'] },
+            "Container ID" => lambda {|it| it['containerId'] },
+            "Expires At" => lambda {|it| format_local_dt it['expiresAt'] },
+            "Exit Code" => lambda {|it| it['exitCode'] },
+            "Status" => lambda {|it| format_execution_request_status(it) },
+            #"Created By" => lambda {|it| it['createdById'] },
+            #"Subdomain" => lambda {|it| it['subdomain'] },
+          }
+          description_cols.delete("Server ID") if execution_request['serverId'].nil?
+          description_cols.delete("Instance ID") if execution_request['instanceId'].nil?
+          description_cols.delete("Container ID") if execution_request['containerId'].nil?
+          description_cols.delete("Exit Code") if execution_request['exitCode'].nil?
+          print_description_list(description_cols, execution_request)      
+
+          if execution_request['stdErr'].to_s.strip != '' && execution_request['stdErr'] != "stdin: is not a tty\n"
+            print_h2 "Error"
+            puts execution_request['stdErr'].to_s.strip
+          end
+          if execution_request['stdOut']
+            print_h2 "Output"
+            puts execution_request['stdOut'].to_s.strip
+          end
+          print reset, "\n"
+        end
+      end
+    end
+  end
+
   def history_event_details(args)
     options = {}
     process_event_id = nil
@@ -4057,7 +4178,7 @@ class Morpheus::Cli::Clusters
     end
     opts.on('--volumes-file FILE', String, "Volumes Config from a local JSON or YAML file") do |val|
       config_file = File.expand_path(val)
-      if !File.exists?(config_file) || !File.file?(config_file)
+      if !File.exist?(config_file) || !File.file?(config_file)
         print_red_alert "Specified volumes file not found: #{config_file}"
         exit 1
       end
@@ -4093,7 +4214,7 @@ class Morpheus::Cli::Clusters
     end
     opts.on('--network-interfaces-file FILE', String, "Network Interfaces Config from a local JSON or YAML file") do |val|
       config_file = File.expand_path(val)
-      if !File.exists?(config_file) || !File.file?(config_file)
+      if !File.exist?(config_file) || !File.file?(config_file)
         print_red_alert "Specified network interfaces file not found: #{config_file}"
         exit 1
       end
@@ -4235,4 +4356,34 @@ class Morpheus::Cli::Clusters
       it
     end
   end
+
+  def available_kube_templates
+    option_results = options_interface.options_for_source('availableKubeTemplates')
+    available_templates = option_results['data'].collect {|it|
+      {"id" => it["value"], "name" => it["name"], "value" => it["value"]}
+    }
+   
+    return available_templates
+  end
+
+  def apply_temp_options
+    [
+      {"id" => "specYaml", "name" => "YAML", "value" => "yaml"},
+      {"id" => 'specTemplate', "name" => "Spec Template", "value" => 'specTemplate'},
+      {"id" => 'url', "name" => 'Url of Template', "value" => 'url'}
+    ]
+  end
+
+  def format_execution_request_status(execution_request, return_color=cyan)
+    out = ""
+    status_str = execution_request['status']
+    if status_str == 'complete'
+      out << "#{green}#{status_str.upcase}#{return_color}"
+    elsif status_str == 'failed' || status_str == 'expired'
+      out << "#{red}#{status_str.upcase}#{return_color}"
+    else
+      out << "#{cyan}#{status_str.upcase}#{return_color}"
+    end
+    out
+  end
 end