morpheus-cli 4.1.8 → 4.1.9

data/lib/morpheus/cli/tasks.rb

@@ -7,15 +7,17 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::Tasks
   include Morpheus::Cli::CliCommand
 
-  register_subcommands :list, :get, :add, :update, :remove, :types => :task_types
+  register_subcommands :list, :get, :add, :update, :remove, :execute, :types => :task_types
   alias_subcommand :details, :get
   alias_subcommand :'task-types', :task_types
   set_default_subcommand :list
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @tasks_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).tasks
-    @task_sets_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).task_sets
+    @tasks_interface = @api_client.tasks
+    @task_sets_interface = @api_client.task_sets
+    @instances_interface = @api_client.instances
+    @servers_interface = @api_client.servers
   end
 
   def handle(args)
@@ -162,6 +164,9 @@ class Morpheus::Cli::Tasks
               format_boolean(it['retryable'])
             end
           },
+          "Allow Custom Config" => lambda {|it| format_boolean(it['allowCustomConfig']) },
+          "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+          "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
         }
         print_description_list(description_cols, task)
         
@@ -233,21 +238,22 @@ class Morpheus::Cli::Tasks
       @tasks_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @tasks_interface.dry.update(task['id'], payload)
-        return
+        return 0
       end
       response = @tasks_interface.update(task['id'], payload)
       if options[:json]
         print JSON.pretty_generate(json_response)
         if !response['success']
-          exit 1
+          return 1
         end
       else
         print_green_success "Task #{response['task']['name']} updated"
         get([task['id']])
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end
 
@@ -349,6 +355,9 @@ class Morpheus::Cli::Tasks
       opts.on('--retry-delay SECONDS', String, "Retry Delay Seconds" ) do |val|
         options[:options]['retryDelaySeconds'] = val.to_i
       end
+      opts.on('--allow-custom-config [on|off]', String, "Allow Custom Config") do |val|
+        options[:options]['allowCustomConfig'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       opts.on('--file FILE', "File containing the script. This can be used instead of --O taskOptions.script" ) do |filename|
         full_filename = File.expand_path(filename)
         if File.exists?(full_filename)
@@ -554,6 +563,13 @@ class Morpheus::Cli::Tasks
         end
 
 
+        # Allow Custom Config
+        if options[:options]['allowCustomConfig'] != nil
+          payload['task']['allowCustomConfig'] = options[:options]['allowCustomConfig']
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowCustomConfig', 'fieldLabel' => 'Allow Custom Config', 'type' => 'checkbox', 'defaultValue' => false}], options[:options], @api_client)
+          payload['task']['allowCustomConfig'] = ['true','on'].include?(v_prompt['allowCustomConfig'].to_s) unless v_prompt['allowCustomConfig'].nil?
+        end
        
 
       end
@@ -568,7 +584,7 @@ class Morpheus::Cli::Tasks
         print JSON.pretty_generate(json_response),"\n"
       elsif !options[:quiet]
         task = json_response['task']
-        print_green_success "Task #{task['name']} created successfully"
+        print_green_success "Task #{task['name']} created"
         get([task['id']])
       end
     rescue RestClient::Exception => e
@@ -617,8 +633,127 @@ class Morpheus::Cli::Tasks
     end
   end
 
+  def execute(args)
+    params = {}
+    options = {}
+    target_type = nil
+    instance_ids = []
+    instances = []
+    server_ids = []
+    servers = []
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[task] --instance [instance] [options]")
+      opts.on('--instance INSTANCE', String, "Instance name or id to execute the task on. This option can be passed more than once.") do |val|
+        target_type = 'instance'
+        instance_ids << val
+      end
+      opts.on('--instances [LIST]', Array, "Instances, comma separated list of instance names or IDs.") do |list|
+        target_type = 'instance'
+        instance_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
+      opts.on('--host HOST', String, "Host name or id to execute the task on. This option can be passed more than once.") do |val|
+        target_type = 'server'
+        server_ids << val
+      end
+      opts.on('--hosts [LIST]', Array, "Hosts, comma separated list of host names or IDs.") do |list|
+        target_type = 'server'
+        server_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
+      opts.on('--server HOST', String, "alias for --host") do |val|
+        target_type = 'server'
+        server_ids << val
+      end
+      opts.on('--servers [LIST]', Array, "alias for --hosts") do |list|
+        target_type = 'server'
+        server_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
+      opts.add_hidden_option('--server')
+      opts.add_hidden_option('--servers')
+      opts.on('--config [TEXT]', String, "Custom config") do |val|
+        params['customConfig'] = val.to_s
+      end
+      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    task_name = args[0]
+    connect(options)
+    begin
+      task = find_task_by_name_or_id(task_name)
+      return 1 if task.nil?
+
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'job' => passed_options})  unless passed_options.empty?
+      else
+        if instance_ids.size > 0 && server_ids.size > 0
+          raise_command_error "Pass --instance or --host, not both.\n#{optparse}"
+        elsif instance_ids.size > 0
+          instance_ids.each do |instance_id|
+            instance = find_instance_by_name_or_id(instance_id)
+            return 1 if instance.nil?
+            instances << instance
+          end
+          params['instances'] = instances.collect {|it| it['id'] }
+        elsif server_ids.size > 0
+          server_ids.each do |server_id|
+            server = find_server_by_name_or_id(server_id)
+            return 1 if server.nil?
+            servers << server
+          end
+          params['servers'] = servers.collect {|it| it['id'] }
+        else
+          raise_command_error "missing required option: --instance or --host\n#{optparse}"
+        end
+
+        # todo: prompt to task optionTypes for customOptions
+        if task['optionTypes']
+          
+        end
+
+        params['targetType'] = target_type
+
+        job_payload = {}
+        job_payload.deep_merge!(params)
+        job_payload.deep_merge!(passed_options) unless passed_options.empty?
+        payload = {'job' => job_payload}
+      end
+
+      @tasks_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @tasks_interface.dry.run(task['id'], payload)
+        return
+      end
+      response = @tasks_interface.run(task['id'], payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        if !response['success']
+          return 1
+        end
+      else
+        target_desc = ""
+        if instances.size() > 0
+          target_desc = (instances.size() == 1) ? "instance #{instances[0]['name']}" : "#{instances.size()} instances"
+        elsif servers.size() > 0
+          target_desc = (servers.size() == 1) ? "host #{servers[0]['name']}" : "#{servers.size()} hosts"
+        end
+        print_green_success "Executing task #{task['name']} on #{target_desc}"
+        # todo: load job/execution
+        # get([task['id']])
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
 
   private
+
   def find_task_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_task_by_id(val)
@@ -634,6 +769,7 @@ class Morpheus::Cli::Tasks
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
         print_red_alert "Task not found by id #{id}"
+        return nil
       else
         raise e
       end
@@ -690,7 +826,7 @@ class Morpheus::Cli::Tasks
       {"ID" => lambda {|it| it['id'] } },
       {"NAME" => lambda {|it| it['name'] } },
       {"TYPE" => lambda {|it| it['taskType']['name'] ? it['taskType']['name'] : it['type'] } },
-      # {"CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
+      {"CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
       # {"UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } },
     ]
     if opts[:include_fields]
@@ -699,4 +835,80 @@ class Morpheus::Cli::Tasks
     print as_pretty_table(tasks, columns, opts)
   end
 
+  def find_instance_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_instance_by_id(val)
+    else
+      return find_instance_by_name(val)
+    end
+  end
+
+  def find_instance_by_id(id)
+    begin
+      json_response = @instances_interface.get(id.to_i)
+      return json_response['instance']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Instance not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_instance_by_name(name)
+    instances = @instances_interface.list({name: name.to_s})['instances']
+    if instances.empty?
+      print_red_alert "Instance not found by name #{name}"
+      return nil
+    elsif instances.size > 1
+      print_red_alert "#{instances.size} instances found by name #{name}"
+      as_pretty_table(instances, [:id, :name], {color: red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return instances[0]
+    end
+  end
+
+  def find_server_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_server_by_id(val)
+    else
+      return find_server_by_name(val)
+    end
+  end
+
+  def find_server_by_id(id)
+    begin
+      json_response = @servers_interface.get(id.to_i)
+      return json_response['server']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Server not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_server_by_name(name)
+    servers = @servers_interface.list({name: name.to_s})['servers']
+    if servers.empty?
+      print_red_alert "Host not found by name #{name}"
+      return nil
+    elsif servers.size > 1
+      print_red_alert "#{servers.size} hosts found by name #{name}"
+      as_pretty_table(servers, [:id, :name], {color: red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return servers[0]
+    end
+  end
+
 end

data/lib/morpheus/cli/tenants_command.rb

@@ -188,12 +188,7 @@ class Morpheus::Cli::TenantsCommand
       account_keys = ['name', 'description', 'currency']
       account_payload = params.select {|k,v| account_keys.include?(k) }
       account_payload['currency'] = account_payload['currency'].to_s.empty? ? "USD" : account_payload['currency'].upcase
-      if !account_payload['instanceLimits']
-        account_payload['instanceLimits'] = {}
-        account_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-        account_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-        account_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
-      end
+      
       if params['role'].to_s != ''
         role = find_role_by_name(nil, params['role'])
         exit 1 if role.nil?
@@ -255,15 +250,10 @@ class Morpheus::Cli::TenantsCommand
       end
 
       #puts "parsed params is : #{params.inspect}"
-      #account_keys = ['name', 'description', 'currency', 'instanceLimits']
+      #account_keys = ['name', 'description', 'currency']
       account_payload = params
       account_payload['currency'] = account_payload['currency'].upcase unless account_payload['currency'].to_s.empty?
-      # if !account_payload['instanceLimits']
-      #   account_payload['instanceLimits'] = {}
-      #   account_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-      #   account_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-      #   account_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
-      # end
+      
       if params['role'].to_s != ''
         role = find_role_by_name(nil, params['role'])
         exit 1 if role.nil?
@@ -345,9 +335,6 @@ class Morpheus::Cli::TenantsCommand
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
       {'fieldName' => 'role', 'fieldLabel' => 'Base Role', 'type' => 'text', 'displayOrder' => 3},
       {'fieldName' => 'currency', 'fieldLabel' => 'Currency', 'type' => 'text', 'displayOrder' => 4}
-      # {'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 5},
-      # {'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 6},
-      # {'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 7},
     ]
   end
 

data/lib/morpheus/cli/users.rb

@@ -202,13 +202,6 @@ class Morpheus::Cli::Users
         }
         print_description_list(description_cols, user)
 
-        # print_h2 "User Instance Limits", options
-        # print cyan
-        # print_description_list({
-        #   "Max Storage"  => lambda {|it| (it && it['maxStorage'].to_i != 0) ? Filesize.from("#{it['maxStorage']} B").pretty : "no limit" },
-        #   "Max Memory"  => lambda {|it| (it && it['maxMemory'].to_i != 0) ? Filesize.from("#{it['maxMemory']} B").pretty : "no limit" },
-        #   "CPU Count"  => lambda {|it| (it && it['maxCpu'].to_i != 0) ? it['maxCpu'] : "no limit" }
-        # }, user['instanceLimits'])
 
         if options[:include_feature_access] && user_feature_permissions
           if user_feature_permissions
@@ -258,11 +251,7 @@ class Morpheus::Cli::Users
         prompt_option_types = add_user_option_types().reject {|it| 'role' == it['fieldName'] }
         v_prompt = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, options[:options], @api_client, options[:params])
         params.deep_merge!(v_prompt)
-        if params['instanceLimits']
-          params['instanceLimits']['maxStorage'] = params['instanceLimits']['maxStorage'].to_i if params['instanceLimits']['maxStorage'].to_s.strip != ''
-          params['instanceLimits']['maxMemory'] = params['instanceLimits']['maxMemory'].to_i if params['instanceLimits']['maxMemory'].to_s.strip != ''
-          params['instanceLimits']['maxCpu'] = params['instanceLimits']['maxCpu'].to_i if params['instanceLimits']['maxCpu'].to_s.strip != ''
-        end
+
         # prompt for roles
         selected_roles = []
         selected_roles += params.delete('role').split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if params['role']
@@ -359,13 +348,7 @@ class Morpheus::Cli::Users
           return 1
         end
 
-        #puts "parsed params is : #{params.inspect}"
-        if params['instanceLimits']
-          params['instanceLimits']['maxStorage'] = params['instanceLimits']['maxStorage'].to_i if params['instanceLimits']['maxStorage'].to_s.strip != ''
-          params['instanceLimits']['maxMemory'] = params['instanceLimits']['maxMemory'].to_i if params['instanceLimits']['maxMemory'].to_s.strip != ''
-          params['instanceLimits']['maxCpu'] = params['instanceLimits']['maxCpu'].to_i if params['instanceLimits']['maxCpu'].to_s.strip != ''
-        end
-
+        
         payload = {'user' => params}
       end
       @users_interface.setopts(options)
@@ -524,9 +507,6 @@ class Morpheus::Cli::Users
       {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => true, 'displayOrder' => 4},
       {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => true, 'displayOrder' => 6},
       {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'displayOrder' => 7},
-      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
-      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
-      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
       {'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'displayOrder' => 11, 'description' => "Role names (comma separated)"},
     ]
   end
@@ -539,9 +519,6 @@ class Morpheus::Cli::Users
       {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => false, 'displayOrder' => 4},
       {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => false, 'displayOrder' => 6},
       {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => false, 'displayOrder' => 7},
-      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
-      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
-      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
       {'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'displayOrder' => 11, 'description' => "Role names (comma separated)"},
     ]
   end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.1.8"
+    VERSION = "4.1.9"
   end
 end

data/lib/morpheus/cli/whitelabel_settings_command.rb

@@ -5,7 +5,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
  # include Morpheus::Cli::AccountsHelper
 
   set_command_name :'whitelabel-settings'
-  set_command_hidden
+
   register_subcommands :get, :update
   register_subcommands :update_images, :reset_image, :download_image, :view_image
   set_default_subcommand :get
@@ -154,58 +154,58 @@ class Morpheus::Cli::WhitelabelSettingsCommand
         params['resetFavicon'] = true
       end
       opts.on("--header-bg-color VALUE", String, "Header background color") do |val|
-        params['headerBgColor'] = val
+        params['headerBgColor'] = val == 'null' ? nil : val
       end
       opts.on("--header-fg-color VALUE", String, "Header foreground color") do |val|
-        params['headerFgColor'] = val
+        params['headerFgColor'] = val == 'null' ? nil : val
       end
       opts.on("--nav-bg-color VALUE", String, "Nav background color") do |val|
-        params['navBgColor'] = val
+        params['navBgColor'] = val == 'null' ? nil : val
       end
       opts.on("--nav-fg-color VALUE", String, "Nav foreground color") do |val|
-        params['navFgColor'] = val
+        params['navFgColor'] = val == 'null' ? nil : val
       end
       opts.on("--nav-hover-color VALUE", String, "Nav hover color") do |val|
-        params['navHoverColor'] = val
+        params['navHoverColor'] = val == 'null' ? nil : val
       end
       opts.on("--primary-button-bg-color VALUE", String, "Primary button background color") do |val|
-        params['primaryButtonBgColor'] = val
+        params['primaryButtonBgColor'] = val == 'null' ? nil : val
       end
       opts.on("--primary-button-fg-color VALUE", String, "Primary button foreground color") do |val|
-        params['primaryButtonFgColor'] = val
+        params['primaryButtonFgColor'] = val == 'null' ? nil : val
       end
       opts.on("--primary-button-hover-bg-color VALUE", String, "Primary button hover background color") do |val|
-        params['primaryButtonHoverBgColor'] = val
+        params['primaryButtonHoverBgColor'] = val == 'null' ? nil : val
       end
       opts.on("--primary-button-hover-fg-color VALUE", String, "Primary button hover foreground color") do |val|
-        params['primaryButtonHoverFgColor'] = val
+        params['primaryButtonHoverFgColor'] = val == 'null' ? nil : val
       end
       opts.on("--footer-bg-color VALUE", String, "Footer background color") do |val|
-        params['footerBgColor'] = val
+        params['footerBgColor'] = val == 'null' ? nil : val
       end
       opts.on("--footer-fg-color VALUE", String, "Footer foreground color") do |val|
-        params['footerFgColor'] = val
+        params['footerFgColor'] = val == 'null' ? nil : val
       end
       opts.on("--login-bg-color VALUE", String, "Login background color") do |val|
-        params['loginBgColor'] = val
+        params['loginBgColor'] = val == 'null' ? nil : val
       end
       opts.on("--copyright TEXT", String, "Copyright String") do |val|
-        params['copyrightString'] = val
+        params['copyrightString'] = val == 'null' ? nil : val
       end
       opts.on("--css TEXT", String, "Override CSS") do |val|
-        params['overrideCss'] = val
+        params['overrideCss'] = val == 'null' ? nil : val
       end
       opts.on("--css-file FILE", String, "Override CSS from local file") do |val|
         options[:overrideCssFile] = val
       end
       opts.on("--terms TEXT", String, "Terms of use content") do |val|
-        params['termsOfUse'] = val
+        params['termsOfUse'] = val == 'null' ? nil : val
       end
       opts.on("--terms-file FILE", String, "Terms of use content from local file") do |val|
         options[:termsOfUseFile] = val
       end
       opts.on("--privacy-policy TEXT", String, "Privacy policy content") do |val|
-        params['privacyPolicy'] = val
+        params['privacyPolicy'] = val == 'null' ? nil : val
       end
       opts.on("--privacy-policy-file FILE", String, "Privacy policy content from local file") do |val|
         options[:privacyPolicyFile] = val
@@ -215,7 +215,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
           support_menu_links = JSON.parse(val.to_s)
           params['supportMenuLinks'] = support_menu_links.kind_of?(Array) ? support_menu_links : [support_menu_links]
         rescue JSON::ParserError => e
-          print_red_alert "Unable to parse forwarding rules JSON"
+          print_red_alert "Unable to parse support menu links JSON"
           exit 1
         end
       end