wavefront-cli 8.0.1 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d831cf75206998d12f64271f13ce2b98c5cdeef18470b7f8e366f38c46a186e7
-  data.tar.gz: 8a0e75fe5bd16d0893d52a863daf04ed599418d848ee024d0c4177cb3837e30c
+  metadata.gz: 699611ad61cde3c72f79d281cecd5c11fea37209852f2a14550331bf2b3e1cf8
+  data.tar.gz: c4567567ebf77209ff858d2b8ac57baa5d406735415e9bcf0ae24342ea3023e8
 SHA512:
-  metadata.gz: 10a9becb4fd55031ce4913718b9a6e65f5bc05b92ba961ee8474889733991a816e455deaed6dec4869b1058d2c8fee515c51e4f6bc4091ee3e1560f7de1bc8e1
-  data.tar.gz: ac4a999ea2d23fc62c04612fdccb51c0bf3f66cf2017ea2980e58f3d684d2e145f53ebae429461498b832521154f674687a6cb3eaef438fb466e050ea7388e70
+  metadata.gz: 00b64e995bfb20a3476c49794ca661ab9cbf5d216664c1fd94de3517017c94e76149aa2a3159129921edfa512ccdf2e9f413d7c214d39ff3d2e05108635636c5
+  data.tar.gz: 31a1dd4fd12927a39425516da9e25744c8092968a5b06188cb16b2221bae81fae1a1362d50f0d27908048b30e8cc02c8c3b64aac4b7ce0a6d828d38d127e0f73

data/HISTORY.md

@@ -1,12 +1,28 @@
 # Changelog
 
+## 8.4.0 (2020-12-16)
+* Add `-f raw` option to dump the raw API response.
+* Bugfix `set` subcommand, which was not reliable on certain object types.
+* Require >=5.4.1 of [the SDK](https://github.com/snltd/wavefront-sdk).
+
+## 8.3.1 (2020-11-17)
+* Catch ctrl-c properly.
+
+## 8.3.0 (2020-10-31)
+* Add `wf proxy shutdown` command.
+
+## 8.2.0 (2020-10-06)
+* Display spans in human-readable query output.
+
+## 8.1.0 (2020-10-04)
+* Display traces in human-readable query output.
+
 ## 8.0.1 (2020-09-28)
 * If the user specifies a config stanza and it is not found, exit with an
   error rather than silently falling back to env vars.
 
 ## 8.0.0 (2020-09-20
 * Drop Ruby 2.4.0 support. (Breaking change.)
->>>>>>> master
 
 ## 7.2.0 (2020-08-12)
 * Add `cloudintegration awsid generate` command.

data/lib/wavefront-cli/base.rb

@@ -147,6 +147,7 @@ module WavefrontCli
               noop: options[:noop] }
 
       ret[:verbose] = options[:noop] ? true : options[:verbose]
+      ret[:raw_response] = true if options[:format] == 'raw'
 
       ret.merge!(extra_options) if respond_to?(:extra_options)
       ret
@@ -228,6 +229,8 @@ module WavefrontCli
 
       exit if options[:noop]
 
+      ok_exit data if options[:format] == 'raw'
+
       check_response_blocks(data)
       warning_message(data.status)
       status_error_handler(data, method)

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

@@ -16,6 +16,7 @@ class WavefrontCommandProxy < WavefrontCommandBase
      "undelete #{CMN} <id>",
      "rename #{CMN} <id> <name>",
      "search #{CMN} [-al] [-o offset] [-L limit] [-O fields] <condition>...",
+     "shutdown #{CMN} <id>",
      "versions #{CMN}"]
   end
 

data/lib/wavefront-cli/controller.rb

@@ -39,6 +39,15 @@ class WavefrontCliController
     @opts = parse_opts(opts)
     cli_class_obj = cli_class(cmd, @opts)
     run_command(cli_class_obj)
+  rescue Interrupt
+    handle_interrupt!
+  end
+
+  def handle_interrupt!
+    raise if opts[:debug]
+
+    puts "\nCancelled at user's request."
+    exit 0
   end
 
   # What you see when you do 'wf --help'

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

@@ -33,6 +33,7 @@ module WavefrontDisplay
 
       @data = prioritize_keys(data, priority_keys)
       @options = options
+      @printer_opts = {}
     end
 
     # find the correct method to deal with the output of the user's
@@ -152,7 +153,8 @@ module WavefrontDisplay
         puts 'No data.'
       else
         require_relative 'printer/long'
-        puts WavefrontDisplayPrinter::Long.new(data, fields, modified_data)
+        puts WavefrontDisplayPrinter::Long.new(data, fields, modified_data,
+                                               @printer_opts)
         pagination_line
       end
     end

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

@@ -29,11 +29,13 @@ module WavefrontDisplayPrinter
 
     # Default options. Can all be overridden by passing them in the
     # initializer options hash.
+    # After sep_depth indentations we do not print separator lines
     #
     def default_opts
       { indent: 2,
         padding: 2,
         separator: true,
+        sep_depth: 3,
         none: true }
     end
 
@@ -179,7 +181,8 @@ module WavefrontDisplayPrinter
       data.each.with_index(1) do |element, i|
         aggr = make_list(element, aggr, depth, last_key)
 
-        if opts[:separator] && element.is_a?(Hash) && i < data.size
+        if opts[:separator] && element.is_a?(Hash) && i < data.size &&
+           depth < opts[:sep_depth]
           aggr.<< ['', :separator, depth]
         end
       end

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

@@ -26,6 +26,10 @@ module WavefrontDisplay
       multicolumn(:id, :version, :name)
     end
 
+    def do_shutdown
+      puts "Requested shutdown of proxy '#{options[:'<id>']}'."
+    end
+
     private
 
     def filter_inactive_proxies!

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

@@ -16,14 +16,18 @@ module WavefrontDisplay
             data[:errorMessage].split("\n").first)
     end
 
+    # rubocop:disable Metrics/AbcSize
     def default_data_object
       { name: data.name,
         query: data.query,
         timeseries: mk_timeseries(data),
+        traces: mk_traces(data),
+        spans: mk_spans(data),
         events: mk_events(data) }.tap do |d|
           d[:warnings] = data[:warnings] if show_warnings?
         end
     end
+    # rubocop:enable Metrics/AbcSize
 
     def show_warnings?
       data.key?(:warnings) && !options[:nowarn]
@@ -54,6 +58,18 @@ module WavefrontDisplay
       data[:events].map { |s| humanize_event(s) }
     end
 
+    def mk_traces(data)
+      return [] unless data.key?(:traces)
+
+      data[:traces].map { |t| humanize_trace(t) }
+    end
+
+    def mk_spans(data)
+      return [] unless data.key?(:spans)
+
+      data[:spans].map { |t| humanize_span(t) }
+    end
+
     def do_run
       do_default
     end
@@ -99,6 +115,30 @@ module WavefrontDisplay
       end
     end
 
+    def humanize_trace(data)
+      @printer_opts[:sep_depth] = 3
+
+      data.tap do |t|
+        t[:start] = human_time(t[:start_ms])
+        t[:end] = human_time(t[:end_ms])
+        t.delete(:start_ms)
+        t.delete(:end_ms)
+        t.delete(:startMs)
+        t.spans = t.spans.map { |s| humanize_trace_span(s) }
+      end
+    end
+
+    def humanize_span(data)
+      @printer_opts[:sep_depth] = 2
+      data
+    end
+
+    def humanize_trace_span(span)
+      span.tap do |s|
+        s[:startMs] = human_time(s[:startMs])
+      end
+    end
+
     def row_time_and_val(row)
       if row.is_a?(Hash)
         [human_time(row[:timestamp]), row[:value]]

data/lib/wavefront-cli/proxy.rb

@@ -32,6 +32,10 @@ module WavefrontCli
       version_info(raw).sort_by { |p| Gem::Version.new(p[:version]) }.reverse
     end
 
+    def do_shutdown
+      wf.shutdown(options[:'<id>'])
+    end
+
     def version_info(raw)
       raw.response.items.map do |i|
         { id: i.id, version: i.version, name: i.name }

data/lib/wavefront-cli/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WF_CLI_VERSION = '8.0.1'
+WF_CLI_VERSION = '8.4.0'

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

@@ -52,12 +52,14 @@ class TestWavefrontDisplayPrinterLong < MiniTest::Test
     assert_equal({ indent: 4,
                    padding: 3,
                    separator: true,
+                   sep_depth: 3,
                    none: true }, pr.opts)
 
     pr = WavefrontDisplayPrinter::Long.new({}, nil, nil, none: false)
     assert_equal({ indent: 2,
                    padding: 2,
                    separator: true,
+                   sep_depth: 3,
                    none: false }, pr.opts)
   end
 

data/spec/wavefront-cli/proxy_spec.rb

@@ -36,6 +36,19 @@ class ProxyEndToEndTest < EndToEndTest
     assert_abort_on_missing_creds("rename #{id} newname")
   end
 
+  def test_shutdown
+    assert_output("Requested shutdown of proxy '#{id}'.\n") do
+      assert_cmd_puts("shutdown #{id}", "/api/v2/proxy/#{id}",
+                      { shutdown: true }.to_json)
+    end
+
+    assert_noop("shutdown #{id}",
+                "uri: PUT https://default.wavefront.com/api/v2/proxy/#{id}",
+                'body: {"shutdown":true}')
+    assert_invalid_id("shutdown #{invalid_id}")
+    assert_abort_on_missing_creds("shutdown #{id}")
+  end
+
   private
 
   def id

data/wavefront-cli.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'docopt', '~> 0.6.0'
   gem.add_runtime_dependency 'inifile', '~> 3.0'
-  gem.add_runtime_dependency 'wavefront-sdk', '~> 5.2'
+  gem.add_runtime_dependency 'wavefront-sdk', '~> 5.4', '>= 5.4.1'
 
   gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.4.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.4.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement