morpheus-cli 3.6.15 → 3.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44cd5f86f718d01477f1d822a42fbf33374ad0339e080b57d589040bcad06dd5
-  data.tar.gz: 3b43a3da6bfa2b65e683a1696ec3d39ef4f17acde0d388dd9004ab1416ad9bb8
+  metadata.gz: 2965857867a8deda2e9e0c8e6033823838c48710cde42a3d6f27b0ee5287faa6
+  data.tar.gz: f16690f4f149d1f17814059ae6e385bc9fe550964044c9deecf54e352c7e333e
 SHA512:
-  metadata.gz: 12da78b947b3aec266e206833af10ec1a068efe9aab6e92d01b0d266ff36c06a37d371f5e16bb7d9d9c96cf43daa2b7ce8feed7989d4bc72b2bc065d2a73014c
-  data.tar.gz: a7e99aa6d071b30f64344505c2cce44204f1d11dc255e253c4c750798a7483074dee8162a206ec59bd04be94f9bbc4fc2e09f48b048754dedbccf49bd1896e93
+  metadata.gz: 580ca508572a8f69dc7d14626cf24df8fac27f148041272d01a71b943a256fe283ba880141685d243fb08bdb5b82a41f40bd80fd91d8d92227699901401552f2
+  data.tar.gz: 6852abdd9d76fa2f3a20e8e1b268eb3012c08906c02c5404a6fdc33378427036a2dbe66df5000bfa78339e8a10307d3020435cb17fbcc4dffd6171037cb2d53d

data/lib/morpheus/cli/monitoring_apps_command.rb

@@ -14,7 +14,8 @@ class Morpheus::Cli::MonitoringAppsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @monitoring_apps_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).monitoring.apps 
+    @monitoring_interface = @api_client.monitoring
+    @monitoring_apps_interface = @api_client.monitoring.apps
   end
 
   def handle(args)
@@ -29,14 +30,12 @@ class Morpheus::Cli::MonitoringAppsCommand
       opts.on('--status LIST', Array, "Filter by status. error,healthy,warning,muted") do |list|
         params['status'] = list
       end
-      build_common_options(opts, options, [:list, :last_updated, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :query, :last_updated, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
     begin
-      [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       @monitoring_apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @monitoring_apps_interface.dry.list(params)
@@ -57,15 +56,7 @@ class Morpheus::Cli::MonitoringAppsCommand
       monitor_apps = json_response['monitorApps']
       title = "Morpheus Monitoring Apps"
       subtitles = []
-      # if app
-      #   subtitles << "App: #{app['name']}".strip
-      # end
-      # if cloud
-      #   subtitles << "Cloud: #{cloud['name']}".strip
-      # end
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if monitor_apps.empty?
         print cyan,"No monitoring apps found.",reset,"\n"

data/lib/morpheus/cli/monitoring_checks_command.rb

@@ -14,7 +14,8 @@ class Morpheus::Cli::MonitoringChecksCommand
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @monitoring_checks_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).monitoring.checks
+    @monitoring_interface = @api_client.monitoring
+    @monitoring_checks_interface = @api_client.monitoring.checks
   end
 
   def handle(args)
@@ -33,14 +34,12 @@ class Morpheus::Cli::MonitoringChecksCommand
       opts.on('--status VALUE', Array, "Filter by status. error,healthy,warning,muted") do |val|
         params['status'] = val
       end
-      build_common_options(opts, options, [:list, :last_updated, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :query, :last_updated, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
     begin
-      [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       @monitoring_checks_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @monitoring_checks_interface.dry.list(params)
@@ -60,16 +59,8 @@ class Morpheus::Cli::MonitoringChecksCommand
       checks = json_response['checks']
       title = "Morpheus Monitoring Checks"
       subtitles = []
-      # if group
-      #   subtitles << "Group: #{group['name']}".strip
-      # end
-      # if cloud
-      #   subtitles << "Cloud: #{cloud['name']}".strip
-      # end
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
-      print_h1 title, subtitles
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles, options
       if checks.empty?
         print cyan,"No checks found.",reset,"\n"
       else

data/lib/morpheus/cli/monitoring_contacts_command.rb

@@ -21,7 +21,8 @@ class Morpheus::Cli::MonitoringContactsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @monitoring_contacts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).monitoring.contacts
+    @monitoring_interface = @api_client.monitoring
+    @monitoring_contacts_interface = @api_client.monitoring.contacts
   end
 
   def handle(args)
@@ -33,14 +34,12 @@ class Morpheus::Cli::MonitoringContactsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :csv, :yaml, :fields, :json, :dry_run])
+      build_common_options(opts, options, [:list, :query, :json, :csv, :yaml, :fields, :json, :dry_run])
     end
     optparse.parse!(args)
     connect(options)
     begin
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       # JD: lastUpdated 500ing, contacts don't have that property ? =o  Fix it!
       @monitoring_contacts_interface.setopts(options)
       if options[:dry_run]
@@ -62,10 +61,8 @@ class Morpheus::Cli::MonitoringContactsCommand
       contacts = json_response['contacts']
       title = "Morpheus Monitoring Contacts"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
-      print_h1 title, subtitles
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles, options
       if contacts.empty?
         print cyan,"No contacts found.",reset,"\n"
       else

data/lib/morpheus/cli/monitoring_groups_command.rb

@@ -13,7 +13,8 @@ class Morpheus::Cli::MonitoringGroupsCommand
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @monitoring_groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).monitoring.groups
+    @monitoring_interface = @api_client.monitoring
+    @monitoring_groups_interface = @api_client.monitoring.groups
   end
 
   def handle(args)
@@ -28,7 +29,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
       opts.on('--status VALUE', Array, "Filter by status. error,healthy,warning,muted") do |val|
         params['status'] = val
       end
-      build_common_options(opts, options, [:list, :last_updated, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :query, :last_updated, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)

data/lib/morpheus/cli/monitoring_incidents_command.rb

@@ -12,7 +12,8 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @monitoring_incidents_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).monitoring.incidents
+    @monitoring_interface = @api_client.monitoring
+    @monitoring_incidents_interface = @api_client.monitoring.incidents
   end
 
   def handle(args)
@@ -30,7 +31,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       opts.on('--severity LIST', Array, "Filter by severity. critical, warning, info") do |list|
         params['severity'] = list
       end
-      build_common_options(opts, options, [:list, :last_updated, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :query, :last_updated, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.15"
+    VERSION = "3.6.16"
   end
 end

data/lib/morpheus/rest_client.rb

@@ -1,4 +1,5 @@
 require 'rest-client'
+require 'uri'
 
 module Morpheus
   # A wrapper around rest_client so we can more easily deal with passing options (like turning on/off SSL verification)
@@ -31,8 +32,27 @@ module Morpheus
         opts[:headers] ||= {}
         opts[:headers][:user_agent] ||= self.user_agent
 
+        # serialize params oureselves, this way we get arrays without the [] suffix
+        params = nil
+        if opts[:params] && !opts[:params].empty?
+          params = opts.delete(:params)
+        elsif opts[:headers] && opts[:headers][:params]
+          # params inside headers for restclient reasons..
+          params = opts[:headers].delete(:params)
+        elsif opts[:query] && !opts[:query].empty?
+          params = opts.delete(:query)
+        end
+        query_string = params
+        if query_string.respond_to?(:map)
+          query_string = URI.encode_www_form(query_string)
+        end
+        if query_string && !query_string.empty?
+          opts[:url] = "#{opts[:url]}?#{query_string}"
+        end
+
         ::RestClient::Request.execute opts
       end
+
       def post(url, payload)
         execute url: url, payload: payload, method: :post
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.15
+  version: 3.6.16
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler