wavefront-cli 8.0.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4935d9901fe186c38fdbe357b4ee52d3b98d3bc6a214f4c3648d52229f760e92
-  data.tar.gz: acbf0f389bbfc37c2bc61ab1aa772afdbc92984d4d7592bf8f8f93ba606d78be
+  metadata.gz: a2ba5b0aba22a6accce6dd6a358475e3448ef622427f214988b5d4c429e8c9cd
+  data.tar.gz: 79d5f15ad335b51d5fee272e2d2fcc33fb39be82e137c1ca61aaa192a60e8dfa
 SHA512:
-  metadata.gz: 8efc8b7a1363bc0e0b0b3800ce70b0fb1b4cb8b8dd61a03fdd56be5376fe4abf178975414926dfff03ae742f66f7469f5810c29bd0fafcc070423fd34175c5e3
-  data.tar.gz: 725f41a25db164bf4c3f5835df9ff490bfe54e1f4b3cc2beb461d1000bd1ef212584f995501e8706aa876c989ec258176239996d50bb943c963395d7a5a1367d
+  metadata.gz: 196d004fce9ac78d43f18613d465f49055fb9203a24149e5c6a4a78e8c4b9c3af10be2b1aca51addc7c758a15f6475f2adf0aad510013a27cd59d9525972a295
+  data.tar.gz: 576541375e557c8787bf85a3ecd672291c2ec5c20e8be5ab3f5a3295a6be3bede4158ae0cb1698660d6f7dac58d03af4af911dd55e8e99ac8a6875a19b222693

data/HISTORY.md

@@ -1,7 +1,24 @@
 # Changelog
 
+## 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/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/opt_handler.rb

@@ -35,6 +35,8 @@ module WavefrontCli
       abort "Configuration file '#{e}' not found."
     rescue Wavefront::Exception::InvalidConfigFile => e
       abort "Could not load configuration file '#{e.message}'."
+    rescue Wavefront::Exception::MissingConfigProfile => e
+      abort "Cannot find profile '#{e}'."
     end
 
     # Create an options hash to pass to the Wavefront::Credentials
@@ -45,7 +47,7 @@ module WavefrontCli
     #   :profile
     #
     def setup_cred_opts(cli_opts)
-      cred_opts = {}
+      cred_opts = { raise_on_no_profile: true }
 
       if cli_opts[:config]
         cred_opts[:file] = Pathname.new(cli_opts[:config])

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.0'
+WF_CLI_VERSION = '8.3.1'

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,13 +26,13 @@ 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.1'
+  gem.add_runtime_dependency 'wavefront-sdk', '~> 5.3'
 
-  gem.add_development_dependency 'minitest', '~> 5.11', '>= 5.11.0'
+  gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'rubocop', '0.91.0'
   gem.add_development_dependency 'spy', '~> 1.0.0'
-  gem.add_development_dependency 'webmock', '~> 3.7'
+  gem.add_development_dependency 'webmock', '~> 3.8'
   gem.add_development_dependency 'yard', '~> 0.9.5'
 
   gem.required_ruby_version = Gem::Requirement.new('>= 2.5.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.3.1
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-20 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -44,34 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.11.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.11.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement