wavefront-cli 3.2.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f911d94d044ca125cbb4ff8fe02762dae660039e58e4dbf549791537742f865
-  data.tar.gz: abc9a5afadb0fea2c526ccf3a2a652a747ee2663dc31685b1d7bc16cfbf1ff96
+  metadata.gz: 6ce4081f6a736ace3019e5c4fc3cadcc91d04e028ea4f04a034250ccef7afc14
+  data.tar.gz: 3c00162398ae62804cde46e1cfc7e058d953f22566cd72d63df799e78f0cbf69
 SHA512:
-  metadata.gz: c18837c8d87d93c82a7ffdb11b86e2500152930a29ac9c2a284599b9228acfe366a40116e2ad1d1eda869609c8f83c687380a0f0e9f6c501e7eda98c5b6412fb
-  data.tar.gz: 22db9e18f0f1652564457243fca44869f6675d592e3689a24b88d2d0d0c42891a328190569a9eac98dea39718d97408f8e15f6aef5f659db1abec1eae2005c80
+  metadata.gz: fc66b3ce0e7f6942516c79bbed8f93f97d57e4adc3b84f40770bf49a00d26f943e94007307edb5eb71542aaec023374acab623d0fbd712bcc5ed22cb7cf69501
+  data.tar.gz: c5263da338dc6472e6beb7d9c221fa30036e8fcbc825ec7d39b4f1688fb75f65a3dd6b68f022c82885a4f906727cd5cd06e4ca90516830218958669cae73b512

data/HISTORY.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 3.3.0 (10/06/2019)
+* Support negation searches. Search for alerts with targets *not* containing
+  `str` with `wf alert search target!~str`.
+* Add `tag pathsearch` command. Searches for tags whose hierarchical names
+  begin with the given element(s).
+* Better printing of structured search results. For example `wf alert search
+  tags=X`.
+* Support freetext searches. Use `wf <object> search freetext=string` and you
+  will be given a list of the objects which match the search along with the
+  matching keys. (Not values!) Adding `-l` presents all matching objects in
+  full.
+
 ## 3.2.3 (24/05/2019)
 * Don't print erroneous pagination message when using `list --all`.
 * Require 3.3.2 of [the SDK](https://github.com/snltd/wavefront-sdk).

data/lib/wavefront-cli/base.rb

@@ -456,15 +456,41 @@ module WavefrontCli
 
     # Turn a list of search conditions into an API query
     #
+    # @param conds [Array]
+    # @return [Array[Hash]]
+    #
     def conds_to_query(conds)
-      conds.each_with_object([]) do |cond, aggr|
-        key, value = cond.split(/\W/, 2)
-        q = { key: key, value: value }
-        q[:matchingMethod] = 'EXACT' if cond.start_with?("#{key}=")
-        q[:matchingMethod] = 'STARTSWITH' if cond.start_with?("#{key}^")
-        aggr.<< q
+      conds.map do |cond|
+        key, value = cond.split(SEARCH_SPLIT, 2)
+        { key: key, value: value }.merge(matching_method(cond))
+      end
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/MethodLength
+    # @param cond [String] a search condition, like "key=value"
+    # @return [Hash] of matchingMethod and negated
+    #
+    def matching_method(cond)
+      case cond
+      when /^\w+~/
+        { matchingMethod: 'CONTAINS', negated: false }
+      when /^\w+!~/
+        { matchingMethod: 'CONTAINS', negated: true }
+      when /^\w+=/
+        { matchingMethod: 'EXACT', negated: false }
+      when /^\w+!=/
+        { matchingMethod: 'EXACT', negated: true }
+      when /^\w+\^/
+        { matchingMethod: 'STARTSWITH', negated: false }
+      when /^\w+!\^/
+        { matchingMethod: 'STARTSWITH', negated: true }
+      else
+        raise(WavefrontCli::Exception::UnparseableSearchPattern, cond)
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength
 
     # Most things will re-import with the POST method if you remove
     # the ID.

data/lib/wavefront-cli/command_mixins/tag.rb

@@ -23,6 +23,18 @@ module WavefrontCli
       def do_tag_clear
         wf.tag_set(options[:'<id>'], [])
       end
+
+      def do_tag_pathsearch
+        require 'wavefront-sdk/search'
+        wfs = Wavefront::Search.new(mk_creds, mk_opts)
+
+        query = { key: 'tags',
+                  value: options[:'<word>'],
+                  matchingMethod: 'TAGPATH',
+                  negated: false }
+
+        wfs.search(search_key, query, range_hash)
+      end
     end
   end
 end

data/lib/wavefront-cli/commands/alert.rb

@@ -23,11 +23,7 @@ class WavefrontCommandAlert < WavefrontCommandBase
      "update #{CMN} <key=value> <id>",
      "unsnooze #{CMN} <id>",
      "search #{CMN} [-al] [-o offset] [-L limit] <condition>...",
-     "tags #{CMN} <id>",
-     "tag set #{CMN} <id> <tag>...",
-     "tag clear #{CMN} <id>",
-     "tag add #{CMN} <id> <tag>",
-     "tag delete #{CMN} <id> <tag>",
+     tag_commands,
      "currently #{CMN} <state>",
      "queries #{CMN} [-b] [<id>]",
      "install #{CMN} <id>",

data/lib/wavefront-cli/commands/base.rb

@@ -41,7 +41,8 @@ class WavefrontCommandBase
      "tag set #{CMN} <id> <tag>...",
      "tag clear #{CMN} <id>",
      "tag add #{CMN} <id> <tag>",
-     "tag delete #{CMN} <id> <tag>"]
+     "tag delete #{CMN} <id> <tag>",
+     "tag pathsearch #{CMN} [-al] [-o offset] [-L limit] <word>"]
   end
 
   # Anything which takes ACLs provides the same interface

data/lib/wavefront-cli/constants.rb

@@ -23,5 +23,9 @@ module WavefrontCli
     # Default configuration file
     #
     DEFAULT_CONFIG = (Pathname.new(ENV['HOME']) + '.wavefront').freeze
+
+    # Split regex for searches
+    #
+    SEARCH_SPLIT = /\^|!\^|=|!=|~|!~/
   end
 end

data/lib/wavefront-cli/controller.rb

@@ -140,6 +140,8 @@ class WavefrontCliController
     abort "Cannot find user group '#{e.message}'."
   rescue Wavefront::Exception::UnsupportedWriter => e
     abort "Unsupported writer '#{e.message}'."
+  rescue WavefrontCli::Exception::ImpossibleSearch
+    abort 'Search on non-existent key. Please use a top-level field.'
   rescue StandardError => e
     warn "general error: #{e}"
     warn "Backtrace:\n\t#{e.backtrace.join("\n\t")}"

data/lib/wavefront-cli/display/base.rb

@@ -219,15 +219,44 @@ module WavefrontDisplay
     end
 
     def do_search_brief
-      display_keys = ([:id] + options[:'<condition>'].map do |c|
-        c.split(/\W/, 2).first.to_sym
-      end).uniq
+      search_keys = search_display_keys
 
       if data.empty?
         puts 'No matches.'
+      elsif search_keys.include?(:freetext)
+        display_brief_freetext_results
       else
-        multicolumn(*display_keys)
+        multicolumn(*search_keys)
       end
+    rescue KeyError
+      raise WavefrontCli::Exception::ImpossibleSearch
+    end
+
+    # For freetext searches, we just display the matching fields in "brief"
+    # mode.
+    #
+    def display_brief_freetext_results
+      search_keys = freetext_keys
+
+      data.map! do |d|
+        mf = d.select do |_k, v|
+          search_keys.any? { |s| v.to_s.include?(s) }
+        end
+
+        { id: d[:id], matching_fields: mf.to_h.keys }
+      end
+
+      multicolumn(:id, :matching_fields)
+    end
+
+    def freetext_keys
+      options[:'<condition>'].map { |c| c.split(SEARCH_SPLIT, 2).last }
+    end
+
+    def search_display_keys
+      ([:id] + options[:'<condition>'].map do |c|
+        c.split(SEARCH_SPLIT, 2).first.to_sym
+      end).uniq
     end
 
     def do_search
@@ -262,6 +291,16 @@ module WavefrontDisplay
       end
     end
 
+    def do_tag_pathsearch
+      if data.empty?
+        puts 'No matches.'
+      elsif options[:long]
+        long_output
+      else
+        multicolumn(:id, :name)
+      end
+    end
+
     def do_queries
       if options[:brief]
         multicolumn(:condition)

data/lib/wavefront-cli/display/printer/terse.rb

@@ -2,7 +2,7 @@ require_relative '../../stdlib/array'
 
 module WavefrontDisplayPrinter
   #
-  # Print things which are per-row. The terse listings, primarily
+  # Print values which are per-row. The terse listings, primarily
   #
   class Terse
     attr_reader :data, :fmt
@@ -20,11 +20,21 @@ module WavefrontDisplayPrinter
     end
 
     def stringify(data, keys)
-      data.map { |e| e.tap { keys.each { |k| e[k] = to_list(e[k]) } } }
+      data.map { |e| e.tap { keys.each { |k| e[k] = to_string(e[k]) } } }
     end
 
-    def to_list(thing)
-      thing.is_a?(Array) ? thing.join(', ') : thing
+    def to_string(value)
+      if value.is_a?(Array)
+        value.join(', ')
+      elsif value.is_a?(Map)
+        map_to_string(value)
+      else
+        value
+      end
+    end
+
+    def map_to_string(value)
+      format('%s=%s', value.keys[0], value.values.join(','))
     end
 
     def to_s

data/lib/wavefront-cli/exception.rb

@@ -8,6 +8,7 @@ module WavefrontCli
     class MandatoryValue < RuntimeError; end
     class ConfigFileNotFound < IOError; end
     class FileNotFound < IOError; end
+    class ImpossibleSearch < RuntimeError; end
     class InsufficientData < RuntimeError; end
     class InvalidInput < RuntimeError; end
     class InvalidValue < RuntimeError; end
@@ -17,6 +18,7 @@ module WavefrontCli
     class UnhandledCommand < RuntimeError; end
     class UnparseableInput < RuntimeError; end
     class UnparseableResponse < RuntimeError; end
+    class UnparseableSearchPattern < RuntimeError; end
     class UnsupportedFileFormat < RuntimeError; end
     class UnsupportedNoop < RuntimeError; end
     class UnsupportedOperation < RuntimeError; end

data/lib/wavefront-cli/version.rb

@@ -1 +1 @@
-WF_CLI_VERSION = '3.2.3'.freeze
+WF_CLI_VERSION = '3.3.0'.freeze

data/spec/spec_helper.rb

@@ -75,7 +75,6 @@ CANNED_RESPONSE = DummyResponse.new
 # requisite display methods are called.
 #
 # @param cmd [String] command line args to supply to the Wavefront
-#  command
 # @param call [Hash]
 # @param spies [Array[Hash]] array of spies to set up, for stubbing
 #   methods in any class. Hash has keys :class, :method, :return.
@@ -265,6 +264,52 @@ def missing_creds(cmd, subcmds)
   end
 end
 
+def search_tests(word, id, klass = nil, pth = nil)
+  pth ||= word
+  cmd_to_call(word,
+              "search id=#{id}",
+              { method: :post, path: "/api/v2/search/#{pth}",
+                body: { limit: 10,
+                        offset: 0,
+                        query: [{ key: 'id',
+                                  value: id,
+                                  matchingMethod: 'EXACT',
+                                  negated: false }],
+                        sort: { field: 'id', ascending: true } },
+                headers: JSON_POST_HEADERS },
+              klass)
+
+  cmd_to_call(word,
+              "search id=#{id} thing!^word",
+              { method: :post, path: "/api/v2/search/#{pth}",
+                body: { limit: 10,
+                        offset: 0,
+                        query: [{ key: 'id',
+                                  value: id,
+                                  matchingMethod: 'EXACT',
+                                  negated: false },
+                                { key: 'thing',
+                                  value: 'word',
+                                  matchingMethod: 'STARTSWITH',
+                                  negated: true }],
+                        sort: { field: 'id', ascending: true } },
+                headers: JSON_POST_HEADERS },
+              klass)
+
+  cmd_to_call(word,
+              'search id!~avoid',
+              { method: :post, path: "/api/v2/search/#{pth}",
+                body: { limit: 10,
+                        offset: 0,
+                        query: [{ key: 'id',
+                                  value: 'avoid',
+                                  matchingMethod: 'CONTAINS',
+                                  negated: true }],
+                        sort: { field: 'id', ascending: true } },
+                headers: JSON_POST_HEADERS },
+              klass)
+end
+
 # Generic list tests, needed by most commands
 #
 def list_tests(cmd, pth = nil, klass = nil)

data/spec/wavefront-cli/alert_spec.rb

@@ -10,7 +10,8 @@ def search_body(val)
     query: [
       { key: 'status',
         value: val,
-        matchingMethod: 'EXACT' }
+        matchingMethod: 'EXACT',
+        negated: false }
     ],
     sort: { field: 'status', ascending: true } }
 end
@@ -66,15 +67,6 @@ describe "#{word} command" do
               method: :post, path: "/api/v2/#{word}/#{id}/undelete")
   cmd_to_call(word, "snooze #{id}",
               method: :post, path: "/api/v2/#{word}/#{id}/snooze")
-  cmd_to_call(word, "search id=#{id}",
-              method: :post, path: "/api/v2/search/#{word}",
-              body: { limit: 10,
-                      offset: 0,
-                      query: [{ key: 'id',
-                                value: id,
-                                matchingMethod: 'EXACT' }],
-                      sort: { field: 'id', ascending: true } },
-              headers: JSON_POST_HEADERS)
   cmd_to_call(word, "snooze -T 800 #{id}",
               method: :post,
               path: "/api/v2/#{word}/#{id}/snooze?seconds=800")
@@ -106,6 +98,7 @@ describe "#{word} command" do
               path: "/api/v2/search/#{word}",
               body: search_body('in_maintenance'))
   cmd_to_call(word, 'queries', path: "/api/v2/#{word}?limit=999&offset=0")
+  search_tests(word, id)
   tag_tests(word, id, bad_id)
   noop_tests(word, id, true)
   test_list_output(word)

data/spec/wavefront-cli/base_spec.rb

@@ -49,6 +49,59 @@ class WavefrontCliBaseTest < MiniTest::Test
 
   def test_dispatch
     assert_raises(WavefrontCli::Exception::UnhandledCommand) { wf.dispatch }
-    # assert_equal(wf_cmd.dispatch, nil)
+  end
+
+  def test_conds_to_query
+    assert_equal([{ key: 'mykey',
+                    value: 'myvalue',
+                    matchingMethod: 'EXACT',
+                    negated: false }],
+                 wf.conds_to_query(%w[mykey=myvalue]))
+
+    assert_equal([{ key: 'mykey',
+                    value: 'myvalue',
+                    matchingMethod: 'EXACT',
+                    negated: true }],
+                 wf.conds_to_query(%w[mykey!=myvalue]))
+
+    assert_equal([{ key: 'mykey',
+                    value: 'myvalue',
+                    matchingMethod: 'CONTAINS',
+                    negated: true }],
+                 wf.conds_to_query(%w[mykey!~myvalue]))
+
+    assert_equal([{ key: 'mykey',
+                    value: 'myvalue',
+                    matchingMethod: 'STARTSWITH',
+                    negated: false }],
+                 wf.conds_to_query(%w[mykey^myvalue]))
+
+    assert_equal([{ key: 'mykey',
+                    value: 'myvalue',
+                    matchingMethod: 'EXACT',
+                    negated: true }],
+                 wf.conds_to_query(%w[mykey!=myvalue]))
+
+    assert_raises(WavefrontCli::Exception::UnparseableSearchPattern) do
+      wf.conds_to_query(%w[what!nonsense])
+    end
+  end
+
+  def test_matching_method
+    assert_equal({ matchingMethod: 'EXACT', negated: true },
+                 wf.matching_method('key!=val'))
+    assert_equal({ matchingMethod: 'EXACT', negated: false },
+                 wf.matching_method('key=val'))
+    assert_equal({ matchingMethod: 'STARTSWITH', negated: false },
+                 wf.matching_method('key^val'))
+    assert_equal({ matchingMethod: 'STARTSWITH', negated: true },
+                 wf.matching_method('key!^val'))
+    assert_equal({ matchingMethod: 'CONTAINS', negated: false },
+                 wf.matching_method('key~val'))
+    assert_equal({ matchingMethod: 'CONTAINS', negated: true },
+                 wf.matching_method('key!~val'))
+    assert_raises(WavefrontCli::Exception::UnparseableSearchPattern) do
+      wf.matching_method('what nonsense')
+    end
   end
 end

data/spec/wavefront-cli/cloudintegration_spec.rb

@@ -13,19 +13,11 @@ describe 'cloudintegration command' do
                        "undelete #{id}"])
   list_tests(word, 'cloudintegration', k)
   noop_tests(word, id, false, 'cloudintegration', k)
+  search_tests(word, id, k)
   cmd_to_call(word, "describe #{id}",
               { path: "/api/v2/cloudintegration/#{id}" }, k)
   cmd_to_call(word, "delete #{id}",
               { method: :delete, path: "/api/v2/cloudintegration/#{id}" }, k)
-  cmd_to_call(word, "search -L 100 id~#{id}",
-              { method: :post, path: '/api/v2/search/cloudintegration',
-                body:   { limit: '100',
-                          offset: 0,
-                          query: [{ key: 'id',
-                                    value: id,
-                                    matchingMethod: 'CONTAINS' }],
-                          sort: { field: 'id', ascending: true } },
-                headers: JSON_POST_HEADERS }, WavefrontCli::CloudIntegration)
   cmd_to_call(word, "undelete #{id}",
               { method: :post,
                 path:    "/api/v2/cloudintegration/#{id}/undelete" }, k)

data/spec/wavefront-cli/commands/base_spec.rb

@@ -48,7 +48,7 @@ class WavefrontCommmandBaseTest < MiniTest::Test
 
     cmds.each do |o|
       assert_instance_of(String, o)
-      assert_match(/^tags* .* <id>/, o)
+      assert_match(/^tags* /, o)
     end
   end
 

data/spec/wavefront-cli/dashboard_spec.rb

@@ -30,15 +30,6 @@ describe "#{word} command" do
                 method: :delete, path: "/api/v2/#{word}/#{id}")
   end
 
-  cmd_to_call(word, "search id=#{id}",
-              method: :post, path: "/api/v2/search/#{word}",
-              body:   { limit: 10,
-                        offset: 0,
-                        query: [{ key: 'id',
-                                  value: id,
-                                  matchingMethod: 'EXACT' }],
-                        sort: { field: 'id', ascending: true } },
-              headers: JSON_POST_HEADERS)
   cmd_to_call(word,
               'favs',
               method: :post,
@@ -47,7 +38,8 @@ describe "#{word} command" do
                         offset: 0,
                         query:  [{ key:             'favorite',
                                    value:           'true',
-                                   matchingMethod: 'EXACT' }],
+                                   matchingMethod: 'EXACT',
+                                   negated:         false }],
                         sort:   { field:     'id',
                                   ascending: true } }.to_json)
 
@@ -74,6 +66,7 @@ describe "#{word} command" do
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}",
                      "undelete #{bad_id}"])
   tag_tests(word, id, bad_id)
+  search_tests(word, id)
   test_list_output(word)
   acl_tests(word, id, bad_id)
 end

data/spec/wavefront-cli/derivedmetric_spec.rb

@@ -15,6 +15,7 @@ describe "#{word} command" do
                        "undelete #{id}", "history #{id}"])
   list_tests(word, nil, k)
   noop_tests(word, id, true, word, k)
+  search_tests(word, id, k)
   cmd_to_call(word, "describe #{id}", { path: "/api/v2/#{word}/#{id}" }, k)
   cmd_to_call(word, "describe -v 7 #{id}",
               { path: "/api/v2/#{word}/#{id}/history/7" }, k)
@@ -34,16 +35,6 @@ describe "#{word} command" do
                 { method: :delete, path: "/api/v2/#{word}/#{id}" }, k)
   end
 
-  cmd_to_call(word, "search id=#{id}",
-              { method: :post, path: "/api/v2/search/#{word}",
-                body:   { limit: 10,
-                          offset: 0,
-                          query: [{ key: 'id',
-                                    value: id,
-                                    matchingMethod: 'EXACT' }],
-                          sort: { field: 'id', ascending: true } },
-                headers: JSON_POST_HEADERS }, k)
-
   cmd_to_call(word, "undelete #{id}",
               { method: :post, path: "/api/v2/#{word}/#{id}/undelete" }, k)
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}",

data/spec/wavefront-cli/display/printer/terse_spec.rb

@@ -44,9 +44,9 @@ class WavefrontDisplayPrinterTerse < MiniTest::Test
                               [:things]))
   end
 
-  def test_to_list
-    assert_equal('a, b, c', wf.to_list(%w[a b c]))
-    assert_equal('abc', wf.to_list('abc'))
+  def test_to_string
+    assert_equal('a, b, c', wf.to_string(%w[a b c]))
+    assert_equal('abc', wf.to_string('abc'))
   end
 
   def test_end_to_end

data/spec/wavefront-cli/event_spec.rb

@@ -16,14 +16,6 @@ describe "#{word} command" do
   cmd_to_call(word, "close #{id}",
               method: :post, path: "/api/v2/#{word}/#{id}/close")
   tag_tests(word, id, bad_id)
-  cmd_to_call(word, "search -o 11 id=#{id}",
-              method: :post, path: "/api/v2/search/#{word}",
-              body:   { limit: 10,
-                        offset: '11',
-                        query: [{ key: 'id',
-                                  value: id,
-                                  matchingMethod: 'EXACT' }],
-                        sort: { field: 'id', ascending: true } },
-              headers: JSON_POST_HEADERS)
+  search_tests(word, id)
   test_list_output(word)
 end

data/spec/wavefront-cli/externallink_spec.rb

@@ -12,20 +12,11 @@ describe "#{word} command" do
   missing_creds(word, ['list', "describe #{id}", "delete #{id}"])
   list_tests(word, 'extlink', k)
   noop_tests(word, id, false, 'extlink', k)
+  search_tests(word, id, k, 'extlink')
   cmd_to_call(word, "describe #{id}", { path: "/api/v2/extlink/#{id}" }, k)
   cmd_to_call(word, "delete #{id}",
               { method: :delete, path: "/api/v2/extlink/#{id}" }, k)
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}"])
-  cmd_to_call(word, "search -L 100 id~#{id}",
-              { method: :post,
-                path:   '/api/v2/search/extlink',
-                body:   { limit: '100',
-                          offset: 0,
-                          query: [{ key: 'id',
-                                    value: id,
-                                    matchingMethod: 'CONTAINS' }],
-                          sort: { field: 'id', ascending: true } },
-                headers: JSON_POST_HEADERS }, WavefrontCli::ExternalLink)
 
   cmd_to_call(word, 'create name description template',
               { method: :post,

data/spec/wavefront-cli/maintenancewindow_spec.rb

@@ -12,22 +12,12 @@ describe "#{word} command" do
   missing_creds(word, ['list', "describe #{id}", "delete #{id}"])
   list_tests(word, 'maintenancewindow', k)
   noop_tests(word, id, false, 'maintenancewindow', k)
+  search_tests(word, id, k, 'maintenancewindow')
   cmd_to_call(word, "describe #{id}",
               { path: "/api/v2/maintenancewindow/#{id}" }, k)
   cmd_to_call(word, "delete #{id}",
               { method: :delete, path: "/api/v2/maintenancewindow/#{id}" }, k)
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}"])
-  cmd_to_call(word, "search -o 100 id=#{id}",
-              { method: :post, path: '/api/v2/search/maintenancewindow',
-                body:   { limit: 10,
-                          offset: '100',
-                          query: [{ key: 'id',
-                                    value: id,
-                                    matchingMethod: 'EXACT' }],
-                          sort: { field: 'id', ascending: true } },
-                headers: JSON_POST_HEADERS },
-              WavefrontCli::MaintenanceWindow)
-
   cmd_to_call(word, 'create -d testing -H shark tester',
               { method: :post, path: '/api/v2/maintenancewindow',
                 body: {

data/spec/wavefront-cli/notificant_spec.rb

@@ -18,18 +18,9 @@ describe "#{word} command" do
                      "delete #{bad_id}",
                      "test #{bad_id}",
                      "update #{bad_id} key=value"])
-  list_tests(word)
   cmd_to_call(word, "describe #{id}", path: "/api/v2/#{word}/#{id}")
-
-  cmd_to_call(word, "search id=#{id}",
-              method: :post, path: "/api/v2/search/#{word}",
-              body: { limit: 10,
-                      offset: 0,
-                      query: [{ key: 'id',
-                                value: id,
-                                matchingMethod: 'EXACT' }],
-                      sort: { field: 'id', ascending: true } },
-              headers: JSON_POST_HEADERS)
+  list_tests(word)
+  search_tests(word, id)
   noop_tests(word, id)
   test_list_output(word)
 end

data/spec/wavefront-cli/proxy_spec.rb

@@ -25,15 +25,6 @@ describe "#{word} command" do
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}",
                      "undelete #{bad_id}", "rename #{bad_id} newname"])
   invalid_something(word, ["rename #{id} '(>_<)'"], 'proxy name')
-  cmd_to_call(word, "search -o 10 id=#{id}",
-              method: :post, path: "/api/v2/search/#{word}",
-              body:   { limit: 10,
-                        offset: '10',
-                        query: [{ key: 'id',
-                                  value: id,
-                                  matchingMethod: 'EXACT' }],
-                        sort: { field: 'id', ascending: true } },
-              headers: JSON_POST_HEADERS)
-
+  search_tests(word, id)
   test_list_output(word)
 end

data/spec/wavefront-cli/savedsearch_spec.rb

@@ -12,18 +12,10 @@ describe "#{word} command" do
   missing_creds(word, ['list', "describe #{id}", "delete #{id}"])
   list_tests(word, 'savedsearch', k)
   noop_tests(word, id, false, 'savedsearch', k)
+  search_tests(word, id, k, 'savedsearch')
   cmd_to_call(word, "describe #{id}", { path: "/api/v2/#{word}/#{id}" }, k)
   cmd_to_call(word, "delete #{id}",
               { method: :delete, path: "/api/v2/#{word}/#{id}" }, k)
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}"])
-  cmd_to_call(word, "search -L 100 id~#{id}",
-              { method: :post, path: '/api/v2/search/savedsearch',
-                body:   { limit: '100',
-                          offset: 0,
-                          query: [{ key: 'id',
-                                    value: id,
-                                    matchingMethod: 'CONTAINS' }],
-                          sort: { field: 'id', ascending: true } },
-                headers: JSON_POST_HEADERS }, WavefrontCli::SavedSearch)
   test_list_output(word, k)
 end

data/spec/wavefront-cli/source_spec.rb

@@ -18,17 +18,9 @@ describe "#{word} command" do
               method: :delete, path: "/api/v2/#{word}/#{id}")
   invalid_ids(word, ["describe #{bad_id}", "clear #{bad_id}"])
   tag_tests(word, id, bad_id)
-  cmd_to_call(word, "search -f json id^#{id}",
-              method: :post, path: "/api/v2/search/#{word}",
-              body:   { limit: 10,
-                        offset: 0,
-                        query: [{ key: 'id',
-                                  value: id,
-                                  matchingMethod: 'STARTSWITH' }],
-                        sort: { field: 'id', ascending: true } },
-              headers: JSON_POST_HEADERS)
   cmd_noop(word, 'list',
            ['GET https://metrics.wavefront.com/api/v2/source'])
   cmd_noop(word, 'describe src',
            ['GET https://metrics.wavefront.com/api/v2/source/src'])
+  search_tests(word, id)
 end

data/spec/wavefront-cli/user_spec.rb

@@ -89,15 +89,7 @@ describe "#{word} command" do
               body:   'group=agent_management',
               headers: hdrs)
 
-  cmd_to_call(word, "search -L 40 id=#{id}",
-              { method: :post, path: "/api/v2/search/#{word}",
-                body:   { limit:  '40',
-                          offset: 0,
-                          query: [{ key: 'id',
-                                    value: id,
-                                    matchingMethod: 'EXACT' }],
-                          sort: { field: 'id', ascending: true } },
-                headers: JSON_POST_HEADERS }, WavefrontCli::User)
+  search_tests(word, id)
 
   invalid_ids(word, ["describe #{bad_id}",
                      "delete #{bad_id}",

data/spec/wavefront-cli/usergroup_spec.rb

@@ -84,14 +84,7 @@ describe "#{word} command" do
                 path: "/api/v2/#{word}/revoke/#{priv1}",
                 body:   [gid1].to_json }, k)
 
-  cmd_to_call(word, 'search -L 40 id=string',
-              { method: :post, path: "/api/v2/search/#{word}",
-                body:   { limit:  '40',
-                          offset: 0,
-                          query: [{ key: 'id',
-                                    value: 'string',
-                                    matchingMethod: 'EXACT' }],
-                          sort: { field: 'id', ascending: true } } }, k)
+  search_tests(word, gid1, k)
 
   invalid_ids(word, ["describe #{bad_id}",
                      "delete #{bad_id}",

data/spec/wavefront-cli/webhook_spec.rb

@@ -15,14 +15,6 @@ describe "#{word} command" do
   cmd_to_call(word, "delete #{id}", method: :delete,
                                     path:   "/api/v2/#{word}/#{id}")
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}"])
-  cmd_to_call(word, "search -o 100 -L 100 id~#{id}",
-              method: :post, path: "/api/v2/search/#{word}",
-              body:   { limit: '100',
-                        offset: '100',
-                        query: [{ key: 'id',
-                                  value: id,
-                                  matchingMethod: 'CONTAINS' }],
-                        sort: { field: 'id', ascending: true } },
-              headers: JSON_POST_HEADERS)
+  search_tests(word, id)
   test_list_output(word)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.3.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt