morpheus-cli 3.6.37 → 3.6.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8d732152f78b906724b55cc2f47a8751ca7c86f70a2288bc850ac1b965cbe05
-  data.tar.gz: b2d42e6fda75482fd755139254850747619120be4c0a475eea96e8b51aae53c8
+  metadata.gz: d6d83bc4ead195eec6c07b13e808adadbb2252faecb60ea09ef380c351a29439
+  data.tar.gz: ac48e6230def4ee50088e8b5a9872619d806aff93efde92a0834a6613461d8b5
 SHA512:
-  metadata.gz: 29710258239eb15c7873fbfa1293921addd1e39c6c51c3607fc3a7c2d40e092921b62c04eec0084a86ddc69d7eabf510c1788b6b96bb5f49dbe8758914160d72
-  data.tar.gz: 52e5bd429e76ae800484b1e16d2442051c8b82dbf35acd2121f8ce3c33d7313566dac05c044151edc7f50fb2f1d0e51266a33897b53c921c1e5248cc43ae2097
+  metadata.gz: fdc430523df174d81db58e7cadffa72fda83dfe97dd941b637b20469663c1e85608d4f973bf5abedc079ce1a402593c2d730b33e49e31741a074ec5e485b438a
+  data.tar.gz: 2c623442ca4e4bfca590acec732930d9698127172c7a9d4507ae7dcf007381b0385d28588dc5f486acb530896fc324c6a2f0a5e9a9dd375890e5c279ad2810a2

data/lib/morpheus/cli/monitoring_apps_command.rb

@@ -158,10 +158,8 @@ class Morpheus::Cli::MonitoringAppsCommand
       open_incidents = json_response["openIncidents"]
       if open_incidents && !open_incidents.empty?
         print_h2 "Open Incidents"
-        # puts "\n(table coming soon...)\n"
-        puts JSON.pretty_generate(open_incidents)
-        # todo: move this to MonitoringHelper ?
-        # print_incidents_table(issues, options)
+        print_incidents_table(open_incidents)
+        # print_results_pagination(size: open_incidents.size, total: open_incidents.size)
       else
         print "\n", cyan
         puts "No open incidents for this monitoring app"

data/lib/morpheus/cli/monitoring_groups_command.rb

@@ -154,10 +154,8 @@ class Morpheus::Cli::MonitoringGroupsCommand
       open_incidents = json_response["openIncidents"]
       if open_incidents && !open_incidents.empty?
         print_h2 "Open Incidents"
-        # puts "\n(table coming soon...)\n"
-        puts JSON.pretty_generate(open_incidents)
-        # todo: move this to MonitoringHelper ?
-        # print_incidents_table(issues, options)
+        print_incidents_table(open_incidents)
+        # print_results_pagination(size: open_incidents.size, total: open_incidents.size)
       else
         print "\n", cyan
         puts "No open incidents for this check group"

data/lib/morpheus/cli/tasks.rb

@@ -130,6 +130,30 @@ class Morpheus::Cli::Tasks
           "Name" => 'name',
           "Code" => 'code',
           "Type" => lambda {|it| it['taskType']['name'] },
+          "Execute Target" => lambda {|it| 
+            if it['executeTarget'] == 'local'
+              git_info = []
+              if it['taskOptions']
+                if it['taskOptions']['localScriptGitId']
+                  git_info << "Git Repo: #{it['taskOptions']['localScriptGitId']}"
+                end
+                if it['taskOptions']['localScriptGitRef']
+                  git_info << "Git Ref: #{it['taskOptions']['localScriptGitRef']}"
+                end
+              end
+              "Local #{git_info.join(', ')}"
+            elsif it['executeTarget'] == 'remote'
+              remote_url = ""
+              if it['taskOptions']
+                remote_url = "#{it['taskOptions']['username']}@#{it['taskOptions']['host']}:#{it['taskOptions']['port']}"
+              end
+              "Remote #{remote_url}"
+            elsif it['executeTarget'] == 'resource'
+              "Resource"
+            else
+              it['executeTarget']
+            end
+          },
           "Result Type" => 'resultType',
           "Retryable" => lambda {|it| 
             if it['retryable']
@@ -137,7 +161,7 @@ class Morpheus::Cli::Tasks
             else
               format_boolean(it['retryable'])
             end
-            },
+          },
         }
         print_description_list(description_cols, task)
         
@@ -218,7 +242,7 @@ class Morpheus::Cli::Tasks
           exit 1
         end
       else
-        print "\n", cyan, "Task #{response['task']['name']} updated", reset, "\n\n"
+        print_green_success "Task #{response['task']['name']} updated"
         get([task['id']])
       end
     rescue RestClient::Exception => e
@@ -284,25 +308,50 @@ class Morpheus::Cli::Tasks
         task_code = val
       end
       opts.on('--result-type VALUE', String, "Result Type" ) do |val|
-        options[:options] ||= {}
         options[:options]['resultType'] = val
       end
+      opts.on('--result-type VALUE', String, "Result Type" ) do |val|
+        options[:options]['executeTarget'] = val
+      end
+      opts.on('--execute-target VALUE', String, "Execute Target" ) do |val|
+        options[:options]['executeTarget'] = val
+      end
+      opts.on('--target-host VALUE', String, "Target Host" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['host'] = val
+      end
+      opts.on('--target-port VALUE', String, "Target Port" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['port'] = val
+      end
+      opts.on('--target-username VALUE', String, "Target Username" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['username'] = val
+      end
+      opts.on('--target-password VALUE', String, "Target Password" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['password'] = val
+      end
+      opts.on('--git-repo VALUE', String, "Git Repo ID" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['localScriptGitId'] = val
+      end
+      opts.on('--git-ref VALUE', String, "Git Ref" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['localScriptGitRef'] = val
+      end
       opts.on('--retryable [on|off]', String, "Retryable" ) do |val|
-        options[:options] ||= {}
         options[:options]['retryable'] = val.to_s == 'on' || val.to_s == 'true' || val == '' || val.nil?
       end
       opts.on('--retry-count COUNT', String, "Retry Count" ) do |val|
-        options[:options] ||= {}
         options[:options]['retryCount'] = val.to_i
       end
       opts.on('--retry-delay SECONDS', String, "Retry Delay Seconds" ) do |val|
-        options[:options] ||= {}
         options[:options]['retryDelaySeconds'] = val.to_i
       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)
-          options[:options] ||= {}
           options[:options]['taskOptions'] ||= {}
           options[:options]['taskOptions']['script'] = File.read(full_filename)
           # params['script'] = File.read(full_filename)
@@ -312,7 +361,6 @@ class Morpheus::Cli::Tasks
         end
         # use the filename as the name by default.
         if !options[:options]['name']
-          options[:options] ||= {}
           options[:options]['name'] = File.basename(full_filename)
         end
       end
@@ -375,9 +423,9 @@ class Morpheus::Cli::Tasks
         task_types_dropdown = @all_task_types.collect {|it| {"name" => it["name"], "value" => it["code"]}}
         
         if task_type_name
-          #payload['task']['taskType'] = task_code
+          #payload['task']['taskType'] = task_type_name
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => task_types_dropdown}], options[:options], @api_client)
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => task_types_dropdown, 'required' => true}], options[:options], @api_client)
           task_type_name = v_prompt['type']
         end
 
@@ -391,8 +439,8 @@ class Morpheus::Cli::Tasks
 
 
         # Result Type
-        if task_code
-          payload['task']['resultType'] = task_code
+        if options[:options]['resultType']
+          payload['task']['resultType'] = options[:options]['resultType']
         else
           result_types_dropdown = [{"name" => "Value", "value" => "value"}, {"name" => "Exit Code", "value" => "exitCode"}, {"name" => "Key Value", "value" => "keyValue"}, {"name" => "JSON", "value" => "json"}]
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'resultType', 'fieldLabel' => 'Result Type', 'type' => 'select', 'selectOptions' => result_types_dropdown}], options[:options], @api_client)
@@ -413,6 +461,72 @@ class Morpheus::Cli::Tasks
         payload.deep_merge!({'task' => input_options})  unless input_options.empty?
         
 
+        # Target Options
+
+        if options[:options]['executeTarget'] != nil
+          payload['task']['executeTarget'] = options[:options]['executeTarget']
+        else
+          default_target = nil
+          execute_targets_dropdown = []
+          if task_type['allowExecuteLocal']
+            default_target = 'local'
+            execute_targets_dropdown << {"name" => "Local", "value" => "local"}
+          end
+          if task_type['allowExecuteRemote']
+            default_target = 'remote'
+            execute_targets_dropdown << {"name" => "Remote", "value" => "remote"}
+          end
+          if task_type['allowExecuteResource']
+            default_target = 'resource'
+            execute_targets_dropdown << {"name" => "Resource", "value" => "resource"}
+          end
+          if !execute_targets_dropdown.empty?
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'executeTarget', 'fieldLabel' => 'Execute Target', 'type' => 'select', 'selectOptions' => execute_targets_dropdown, 'defaultValue' => default_target, 'required' => true}], options[:options], @api_client)
+            payload['task']['executeTarget'] = v_prompt['executeTarget'].to_s unless v_prompt['executeTarget'].to_s.empty?
+          end
+        end
+
+        if payload['task']['executeTarget'] == 'local'
+          # Git Repo
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'localScriptGitId', 'fieldLabel' => 'Git Repo', 'type' => 'text', 'description' => 'Git Repo ID'}], options[:options], @api_client)
+          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['localScriptGitId'].to_s.empty?
+            payload['task']['taskOptions'] ||= {}
+            payload['task']['taskOptions']['localScriptGitId'] = v_prompt['taskOptions']['localScriptGitId']
+          end
+          # Git Ref
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'localScriptGitRef', 'fieldLabel' => 'Git Ref', 'type' => 'text', 'description' => 'Git Ref eg. master'}], options[:options], @api_client)
+          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['localScriptGitRef'].to_s.empty?
+            payload['task']['taskOptions'] ||= {}
+            payload['task']['taskOptions']['localScriptGitRef'] = v_prompt['taskOptions']['localScriptGitRef']
+          end
+
+        elsif payload['task']['executeTarget'] == 'remote'
+          # Host
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'host', 'fieldLabel' => 'IP Address', 'type' => 'text', 'description' => 'IP Address / Host for remote execution'}], options[:options], @api_client)
+          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['host'].to_s.empty?
+            payload['task']['taskOptions'] ||= {}
+            payload['task']['taskOptions']['host'] = v_prompt['taskOptions']['host']
+          end
+          # Port
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'port', 'fieldLabel' => 'Port', 'type' => 'text', 'description' => 'Port for remote execution', 'defaultValue' => '22'}], options[:options], @api_client)
+          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['port'].to_s.empty?
+            payload['task']['taskOptions'] ||= {}
+            payload['task']['taskOptions']['port'] = v_prompt['taskOptions']['port']
+          end
+          # Host
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => 'Username for remote execution'}], options[:options], @api_client)
+          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['username'].to_s.empty?
+            payload['task']['taskOptions'] ||= {}
+            payload['task']['taskOptions']['username'] = v_prompt['taskOptions']['username']
+          end
+          # Host
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => 'Password for remote execution'}], options[:options], @api_client)
+          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['password'].to_s.empty?
+            payload['task']['taskOptions'] ||= {}
+            payload['task']['taskOptions']['password'] = v_prompt['taskOptions']['password']
+          end
+        end
+
 
         # Retryable
         if options[:options]['retryable'] != nil
@@ -454,7 +568,7 @@ class Morpheus::Cli::Tasks
         print JSON.pretty_generate(json_response),"\n"
       elsif !options[:quiet]
         task = json_response['task']
-        print "\n", cyan, "Task #{task['name']} created successfully", reset, "\n\n"
+        print_green_success "Task #{task['name']} created successfully"
         get([task['id']])
       end
     rescue RestClient::Exception => e
@@ -495,7 +609,7 @@ class Morpheus::Cli::Tasks
       if options[:json]
         print JSON.pretty_generate(json_response),"\n"
       elsif !options[:quiet]
-        print "\n", cyan, "Task #{task['name']} removed", reset, "\n\n"
+        print_green_success "Task #{task['name']} removed"
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.37"
+    VERSION = "3.6.38"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -370,7 +370,16 @@ class Morpheus::Cli::VirtualImages
 
     if image_type_name
       image_type = virtual_image_type_for_name_or_code(image_type_name)
-      exit 1 if image_type.nil?
+      # fix issue with api returning imageType vmware instead of vmdk
+      if image_type.nil? && image_type_name == 'vmware'
+        image_type = virtual_image_type_for_name_or_code('vmdk')
+      elsif image_type.nil? && image_type_name == 'vmdk'
+        image_type = virtual_image_type_for_name_or_code('vmware')
+      end
+      if image_type.nil?
+        print_red_alert "Virtual Image Type not found by code '#{image_type_name}'"
+        return 1
+      end
       # options[:options] ||= {}
       # options[:options]['imageType'] ||= image_type['code']
     else
@@ -399,6 +408,10 @@ class Morpheus::Cli::VirtualImages
       if tenants_list
         virtual_image_payload['accounts'] = tenants_list
       end
+      # fix issue with api returning imageType vmware instead of vmdk
+      if virtual_image_payload && virtual_image_payload['imageType'] == 'vmware'
+        virtual_image_payload['imageType'] == 'vmdk'
+      end
       payload = {virtualImage: virtual_image_payload}
       @virtual_images_interface.setopts(options)
       if options[:dry_run]
@@ -652,7 +665,8 @@ class Morpheus::Cli::VirtualImages
     end
     return @available_virtual_image_types
   end
-    def virtual_image_type_for_name_or_code(name)
+  
+  def virtual_image_type_for_name_or_code(name)
     return get_available_virtual_image_types().find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.37
+  version: 3.6.38
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-13 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler