wavefront-cli 8.5.1 → 9.0.0

data/spec/wavefront-cli/config_spec.rb

@@ -6,7 +6,7 @@ require 'minitest/autorun'
 require_relative '../constants'
 require_relative '../../lib/wavefront-cli/config'
 
-DEF_CF = Pathname.new(ENV['HOME']) + '.wavefront'
+DEF_CF = Pathname.new(Dir.home).join('.wavefront')
 CONF_TMP = Pathname.new('/tmp/outfile')
 
 # Test CLI configuration command
@@ -56,7 +56,7 @@ class WavefrontCliConfigTest < MiniTest::Test
     out, err = capture_io { assert_instance_of(IniFile, wf.base_config) }
     assert_empty(err)
 
-    if (Pathname.new(ENV['HOME']) + '.wavefront').exist?
+    if Pathname.new(Dir.home).join('.wavefront').exist?
       assert_empty(out)
     else
       assert_match(/Creating new configuration file at/, out)
@@ -196,7 +196,7 @@ class WavefrontCliConfigTest < MiniTest::Test
     assert_equal(
       "[other]\ntoken = abcdefab-0123-abcd-0123-abcdefabcdef\n" \
       "endpoint = other.wavefront.com\nproxy = otherwf.localnet\n\n",
-      IO.read(CONF_TMP)
+      File.read(CONF_TMP)
     )
 
     assert_raises(WavefrontCli::Exception::ProfileNotFound) do

data/spec/wavefront-cli/controller_spec.rb

@@ -94,9 +94,11 @@ end
 # tested above.
 #
 # rubocop:disable Lint/MissingSuper
+# rubocop:disable Style/RedundantInitialize
 class Giblets < WavefrontCliController
   def initialize; end
 end
+# rubocop:enable Style/RedundantInitialize
 # rubocop:enable Lint/MissingSuper
 
 # Here's the subclass

data/spec/wavefront-cli/dashboard_spec.rb

@@ -45,7 +45,7 @@ class DashboardEndToEndTest < EndToEndTest
     assert_repeated_output('No favourites.') do
       all_permutations do |perm|
         stub_request(:post, "https://#{perm[:endpoint]}/api/v2/search" \
-                     '/dashboard')
+                            '/dashboard')
           .with(body: { limit: 999,
                         offset: 0,
                         query: [{ key: 'favorite',

data/spec/wavefront-cli/derivedmetric_spec.rb

@@ -30,16 +30,18 @@ class DerivedMetricEndToEndTest < EndToEndTest
                        query: 'ts(series)')
     end
 
+    json_body = {
+      query: 'ts(series)',
+      name: 'mymetric',
+      minutes: 5,
+      includeObsoleteMetrics: false,
+      processRateMinutes: 1
+    }.to_json
+
     assert_noop('create mymetric ts(series)',
                 'uri: POST https://default.wavefront.com/api/v2/' \
                 'derivedmetric',
-                'body: ' + {
-                  query: 'ts(series)',
-                  name: 'mymetric',
-                  minutes: 5,
-                  includeObsoleteMetrics: false,
-                  processRateMinutes: 1
-                }.to_json)
+                "body: #{json_body}")
 
     assert_usage('create')
     assert_abort_on_missing_creds("create #{id} ts(series)")

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

@@ -78,6 +78,7 @@ class TestWavefrontDisplayPrinterLong < MiniTest::Test
     assert_equal(22, pr.longest_key_col(input))
   end
 
+  # rubocop:disable Layout/LineContinuationLeadingSpace
   def test_to_s
     assert_equal("today\n" \
                  "  weather   sunny\n" \
@@ -92,24 +93,25 @@ class TestWavefrontDisplayPrinterLong < MiniTest::Test
                    key1: 'val1', key2: 'val2'
                  ).to_s)
   end
+  # rubocop:enable Layout/LineContinuationLeadingSpace
 
   def test_end_to_end
     input, expected = OutputTester.new.in_and_out('user-input.json',
                                                   'user-human-long')
     output = WavefrontDisplayPrinter::Long.new(input).to_s
-    assert_equal(expected, output + "\n")
+    assert_equal(expected, "#{output}\n")
 
     input, expected = OutputTester.new.in_and_out('user-input.json',
                                                   'user-human-long-no_sep')
     output = WavefrontDisplayPrinter::Long.new(input, nil, nil,
                                                separator: false).to_s
-    assert_equal(expected, output + "\n")
+    assert_equal(expected, "#{output}\n")
   end
 
   def test_end_to_end_fold
     input, expected = OutputTester.new.in_and_out('alert-input.json',
                                                   'alert-human-long')
     output = WavefrontDisplayPrinter::Long.new(input).to_s
-    assert_equal(expected, output + "\n")
+    assert_equal(expected, "#{output}\n")
   end
 end

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

@@ -61,6 +61,6 @@ class WavefrontDisplayPrinterTerse < MiniTest::Test
     input, expected = OutputTester.new.in_and_out('alerts-input.json',
                                                   'alerts-human-terse')
     out = WavefrontDisplayPrinter::Terse.new(input, %i[id status name]).to_s
-    assert_equal(expected, out + "\n")
+    assert_equal(expected, "#{out}\n")
   end
 end

data/spec/wavefront-cli/event_spec.rb

@@ -16,11 +16,11 @@ class EventEndToEndTest < EndToEndTest
   attr_reader :test_state_dir
 
   include Wavefront::Mixins
-  # include WavefrontCliTest::Describe
-  # include WavefrontCliTest::Delete
-  # include WavefrontCliTest::Search
-  # #include WavefrontCliTest::Set
-  # include WavefrontCliTest::Tag
+  include WavefrontCliTest::Describe
+  include WavefrontCliTest::Delete
+  include WavefrontCliTest::Search
+  include WavefrontCliTest::Set
+  include WavefrontCliTest::Tag
 
   def before_setup
     @test_state_dir = Pathname.new(Dir.mktmpdir)
@@ -99,7 +99,7 @@ class EventEndToEndTest < EndToEndTest
     assert state_file.exist?
     assert_equal(
       "{\"hosts\":[],\"description\":null,\"severity\":null,\"tags\":[]}\n",
-      IO.read(state_file)
+      File.read(state_file)
     )
 
     assert_abort_on_missing_creds("create #{event_name}")
@@ -131,7 +131,7 @@ class EventEndToEndTest < EndToEndTest
     assert state_file.exist?
     assert_equal('{"hosts":["host1","host2"],"description":"reason",' \
                  "\"severity\":null,\"tags\":[\"mytag\"]}\n",
-                 IO.read(state_file))
+                 File.read(state_file))
   end
 
   def test_create_instantaneous_with_start_time
@@ -170,21 +170,24 @@ class EventEndToEndTest < EndToEndTest
   end
 
   def test_close_with_local_events_pop
+    @single_perm = true
+
     setup_test_state_dir
-    assert((state_dir + '1568133440530:ev3:0').exist?)
+    assert state_dir.join('1568133440530:ev3:0').exist?
 
     quietly do
       assert_cmd_posts('close', '/api/v2/event/1568133440530:ev3:0/close')
     end
 
-    refute((state_dir + '1568133440530:ev3:0').exist?)
-    assert((state_dir + '1568133440520:ev2:0').exist?)
+    refute state_dir.join('1568133440530:ev3:0').exist?
+    assert state_dir.join('1568133440520:ev2:0').exist?
 
     quietly do
       assert_cmd_posts('close', '/api/v2/event/1568133440520:ev2:0/close')
     end
 
-    refute((state_dir + '1568133440520:ev2:0').exist?)
+    refute state_dir.join('1568133440520:ev2:0').exist?
+    @single_perm = false
   end
 
   def test_wrap

data/spec/wavefront-cli/event_store_spec.rb

@@ -53,7 +53,7 @@ class Test < MiniTest::Test
   end
 
   def test_create_dir_ok
-    dir = TEST_EVENT_STORE_DIR + 'testdir'
+    dir = TEST_EVENT_STORE_DIR.join('testdir')
     refute dir.exist?
     wf.create_dir(dir)
     assert dir.exist?
@@ -64,13 +64,13 @@ class Test < MiniTest::Test
     setup_test_state_dir
 
     x = wf.list
-    assert(x.all? { |e| e.is_a?(Pathname) })
+    assert(x.all?(Pathname))
     assert_equal(4, x.size)
-
     empty_test_state_dir
   end
 
   def test_list_empty_stack
+    wf = WavefrontCli::EventStore.new({}, TEST_EVENT_STORE_DIR)
     out, err = capture_io { assert_raises(SystemExit) { wf.list } }
     assert_empty(out)
     assert_equal("No locally recorded events.\n", err)
@@ -79,9 +79,9 @@ class Test < MiniTest::Test
   def test_pop_event
     setup_test_state_dir
 
-    assert (wf.dir + '1568133440530:ev3:0').exist?
+    assert wf.dir.join('1568133440530:ev3:0').exist?
     assert_equal('1568133440530:ev3:0', wf.pop_event!)
-    refute (wf.dir + '1568133440530:ev3:0').exist?
+    refute wf.dir.join('1568133440530:ev3:0').exist?
 
     empty_test_state_dir
   end
@@ -89,9 +89,9 @@ class Test < MiniTest::Test
   def test_pop_event_named
     setup_test_state_dir
 
-    assert (wf.dir + '1568133440515:ev1:1').exist?
+    assert wf.dir.join('1568133440515:ev1:1').exist?
     assert_equal('1568133440515:ev1:1', wf.pop_event!('ev1'))
-    refute (wf.dir + '1568133440515:ev1:1').exist?
+    refute wf.dir.join('1568133440515:ev1:1').exist?
 
     empty_test_state_dir
   end
@@ -99,14 +99,15 @@ class Test < MiniTest::Test
   def test_event_specific
     setup_test_state_dir
 
-    assert (wf.dir + '1568133440515:ev1:1').exist?
+    assert wf.dir.join('1568133440515:ev1:1').exist?
     assert_equal('1568133440515:ev1:1', wf.event('1568133440515:ev1:1'))
-    assert (wf.dir + '1568133440515:ev1:1').exist?
+    assert wf.dir.join('1568133440515:ev1:1').exist?
 
     empty_test_state_dir
   end
 
   def test_pop_event_empty_stack
+    wf = WavefrontCli::EventStore.new({}, TEST_EVENT_STORE_DIR)
     out, err = capture_io { assert_raises(SystemExit) { wf.pop_event! } }
     assert_empty(out)
     assert_equal("No locally recorded events.\n", err)
@@ -148,9 +149,12 @@ class Test < MiniTest::Test
   def test_create
     refute (wf.dir + id).exist?
     out, err = capture_io { wf.create!(id) }
-    assert_match(/Event state recorded at .*1481553823153:testev:0./, out)
+    assert_match(/Event state recorded at .*#{id}./, out)
     assert_empty(err)
-    assert (wf.dir + id).exist?
+    event_file = wf.dir + id
+    assert event_file.exist?
+    event_file.unlink
+    refute event_file.exist?
   end
 
   def test_create_with_nostate
@@ -161,7 +165,7 @@ class Test < MiniTest::Test
   private
 
   def id
-    '1481553823153:testev:0'
+    '1481553823153:testevstore:0'
   end
 
   def dummy_event_files

data/spec/wavefront-cli/externallink_spec.rb

@@ -24,11 +24,13 @@ class ExternalLinkEndToEndTest < EndToEndTest
                        description: 'mydescription')
     end
 
+    json_body = { name: 'myname',
+                  template: 'mytemplate',
+                  description: 'mydescription' }.to_json
+
     assert_noop('create myname mydescription mytemplate',
                 'uri: POST https://default.wavefront.com/api/v2/extlink',
-                'body: ' + { name: 'myname',
-                             template: 'mytemplate',
-                             description: 'mydescription' }.to_json)
+                "body: #{json_body}")
 
     assert_abort_on_missing_creds('create myname mydescription mytemplate')
     assert_usage('create myname mydescription')

data/spec/wavefront-cli/maintenancewindow_spec.rb

@@ -42,15 +42,17 @@ class MaintenanceWindowEndToEndTest < EndToEndTest
                        title: 'test_window')
     end
 
+    json_body = { title: 'test_window',
+                  startTimeInSeconds: 1_566_776_337,
+                  endTimeInSeconds: 1_566_776_399,
+                  reason: 'testing',
+                  relevantHostNames: %w[shark box] }.to_json
+
     assert_noop(
       'create --desc testing -H shark -s 1566776337 -H box ' \
       '-e 1566776399 test_window',
       'uri: POST https://default.wavefront.com/api/v2/maintenancewindow',
-      'body: ' + { title: 'test_window',
-                   startTimeInSeconds: 1_566_776_337,
-                   endTimeInSeconds: 1_566_776_399,
-                   reason: 'testing',
-                   relevantHostNames: %w[shark box] }.to_json
+      "body: #{json_body}"
     )
   end
 
@@ -172,16 +174,18 @@ class MaintenanceWindowEndToEndTest < EndToEndTest
       end
     end
 
+    json_body = { limit: 999,
+                  offset: 0,
+                  query: [{ key: 'runningState',
+                            value: 'ongoing',
+                            matchingMethod: 'EXACT' }],
+                  sort: { field: 'runningState',
+                          ascending: true } }.to_json
+
     assert_noop(
       'ongoing',
       'uri: POST https://default.wavefront.com/api/v2/search/maintenancewindow',
-      'body: ' + { limit: 999,
-                   offset: 0,
-                   query: [{ key: 'runningState',
-                             value: 'ongoing',
-                             matchingMethod: 'EXACT' }],
-                   sort: { field: 'runningState',
-                           ascending: true } }.to_json
+      "body: #{json_body}"
     )
 
     assert_empty(err)
@@ -198,16 +202,18 @@ class MaintenanceWindowEndToEndTest < EndToEndTest
       end
     end
 
+    json_body = { limit: 999,
+                  offset: 0,
+                  query: [{ key: 'runningState',
+                            value: 'pending',
+                            matchingMethod: 'EXACT' }],
+                  sort: { field: 'runningState',
+                          ascending: true } }.to_json
+
     assert_noop(
       'pending',
       'uri: POST https://default.wavefront.com/api/v2/search/maintenancewindow',
-      'body: ' + { limit: 999,
-                   offset: 0,
-                   query: [{ key: 'runningState',
-                             value: 'pending',
-                             matchingMethod: 'EXACT' }],
-                   sort: { field: 'runningState',
-                           ascending: true } }.to_json
+      "body: #{json_body}"
     )
 
     assert_empty(err)

data/spec/wavefront-cli/message_spec.rb

@@ -15,11 +15,11 @@ class MessageEndToEndTest < EndToEndTest
                       '/api/v2/message?limit=100&offset=0&unreadOnly=true')
     end
 
+    params = { offset: 0, limit: 100, unreadOnly: true }
+
     assert_noop('list',
                 'uri: GET https://default.wavefront.com/api/v2/message',
-                'params: ' + {
-                  offset: 0, limit: 100, unreadOnly: true
-                }.to_s)
+                "params: #{params}")
 
     assert_abort_on_missing_creds('list')
   end

data/spec/wavefront-cli/metricspolicy_spec.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../support/command_base'
+require_relative '../../lib/wavefront-cli/metricspolicy'
+
+# Ensure 'metricspolicy' commands produce the correct API calls.
+#
+class MetricsPolicyEndToEndTest < EndToEndTest
+  def test_describe
+    quietly do
+      assert_cmd_gets('describe', '/api/v2/metricspolicy')
+      assert_cmd_gets('describe -v4', '/api/v2/metricspolicy/history/4')
+    end
+  end
+
+  def _test_revert
+    quietly do
+      assert_cmd_posts('revert 2', '/api/v2/metricspolicy/revert/2')
+    end
+  end
+
+  def cmd_word
+    'metricspolicy'
+  end
+
+  def sdk_class_name
+    'MetricsPolicy'
+  end
+end

data/spec/wavefront-cli/opt_handler_spec.rb

@@ -9,7 +9,7 @@ require_relative '../../lib/wavefront-cli/opt_handler'
 # Some of these tests will be skipped if you have a ~/.wavefront
 # config file. CI will never have that.
 #
-INTERFERING_FILE = Pathname.new(ENV['HOME']) + '.wavefront'
+INTERFERING_FILE = Pathname.new(Dir.home).join('.wavefront')
 
 # Test option handler class. End to end tests because the work is
 # always done in the constructor

data/spec/wavefront-cli/output/helpers.rb

@@ -14,5 +14,5 @@ def load_raw_query_response
 end
 
 def load_file(file)
-  JSON.parse(IO.read(RES_DIR + file), symbolize_names: true)
+  JSON.parse(File.read(RES_DIR.join(file)), symbolize_names: true)
 end

data/spec/wavefront-cli/proxy_spec.rb

@@ -37,7 +37,7 @@ class ProxyEndToEndTest < EndToEndTest
   end
 
   def test_shutdown
-    assert_output("Requested shutdown of proxy '#{id}'.\n") do
+    assert_repeated_output("Requested shutdown of proxy '#{id}'.") do
       assert_cmd_puts("shutdown #{id}", "/api/v2/proxy/#{id}",
                       { shutdown: true }.to_json)
     end

data/spec/wavefront-cli/query_spec.rb

@@ -183,7 +183,7 @@ class QueryEndToEndTest < EndToEndTest
   end
 
   def canned_response
-    IO.read(RES_DIR + 'responses' + 'query.json')
+    File.read(RES_DIR.join('responses', 'query.json'))
   end
 end
 

data/spec/wavefront-cli/role_spec.rb

@@ -94,7 +94,7 @@ class RoleEndToEndTest < EndToEndTest
                       { permissions: permissions }.to_json)
     end
 
-    assert_equal(permissions.join("\n"), out.strip)
+    assert_equal(permissions, out.split("\n").uniq)
     assert_empty err
 
     assert_abort_on_missing_creds("permissions #{id}")
@@ -120,8 +120,9 @@ class RoleEndToEndTest < EndToEndTest
                        accounts.to_json)
     end
 
-    assert_equal("Took '#{id}' from '#{accounts.first}', '#{accounts.last}'.",
-                 out.strip.tr("\n", ' '))
+    assert out.strip.tr("\n", ' ').start_with?(
+      "Took '#{id}' from '#{accounts.first}', '#{accounts.last}'."
+    )
 
     assert_empty err
 

data/spec/wavefront-cli/serviceaccount_spec.rb

@@ -105,14 +105,16 @@ class ServiceAccountEndToEndTest < EndToEndTest
                        userGroups: [])
     end
 
+    json_body = { identifier: id,
+                  active: true,
+                  tokens: [],
+                  roles: [],
+                  userGroups: [] }.to_json
+
     assert_noop(
       "create #{id}",
       'uri: POST https://default.wavefront.com/api/v2/account/serviceaccount',
-      'body: ' + { identifier: id,
-                   active: true,
-                   tokens: [],
-                   roles: [],
-                   userGroups: [] }.to_json
+      "body: #{json_body}"
     )
 
     assert_abort_on_missing_creds("create #{id}")

data/spec/wavefront-cli/stdlib/string_spec.rb

@@ -28,13 +28,14 @@ class StringTest < MiniTest::Test
 
     str = '-o, --option PARAMETER a rather pointless option with a ' \
           'needlessly wordy description string'
-    pad = "\n" + ' ' * 12
+    pad = "\n#{' ' * 12}"
     assert_equal("  -o, --option PARAMETER a#{pad}rather pointless" \
                  "#{pad}option with a#{pad}needlessly wordy#{pad}" \
                  "description#{pad}string",
                  str.opt_fold(30, 10))
   end
 
+  # rubocop:disable Layout/LineContinuationLeadingSpace
   def test_fold_options
     str = '-l, --longoption    a long option with a quite long ' \
           'description which needs folding'
@@ -48,6 +49,7 @@ class StringTest < MiniTest::Test
                  '      folding')
     assert_equal(str.opt_fold(100), "  #{str}")
   end
+  # rubocop:enable Layout/LineContinuationLeadingSpace
 
   def test_to_seconds
     assert_equal(14, '14s'.to_seconds)

data/spec/wavefront-cli/usage_spec.rb

@@ -49,7 +49,7 @@ class UsageEndToEndTest < EndToEndTest
   end
 
   def response
-    IO.read(RES_DIR + 'responses' + 'usage-export-csv.json')
+    File.read(RES_DIR.join('responses', 'usage-export-csv.json'))
   end
 end
 

data/spec/wavefront-cli/{write_spec.rb → write_class_spec.rb}

@@ -13,19 +13,6 @@ class WavefrontCliWriteTest < MiniTest::Test
     @wf = WavefrontCli::Write.new({})
   end
 
-  def test_validate_opts
-    assert WavefrontCli::Write.new(using: 'unix',
-                                   socket: '/tmp/sock').validate_opts
-    assert WavefrontCli::Write.new(proxy: 'wavefront').validate_opts
-    assert_raises 'WavefrontCli::Exception::CredentialError' do
-      WavefrontCli::Write.new.validate_opts
-    end
-
-    assert_raises 'WavefrontCli::Exception::CredentialError' do
-      WavefrontCli::Write.new(using: 'unix').validate_opts
-    end
-  end
-
   def test_validate_opts_file
     assert WavefrontCli::Write.new(
       proxy: 'wavefront', metric: 'metric.path'
@@ -172,7 +159,7 @@ class WavefrontCliWriteTest < MiniTest::Test
   def test_valid_timestamp?
     assert wf.valid_timestamp?(Time.now.to_i)
     refute wf.valid_timestamp?(Time.new(1999, 11, 30).to_i)
-    refute wf.valid_timestamp?(Time.now.to_i + 367 * 24 * 60 * 60)
+    refute wf.valid_timestamp?(Time.now.to_i + (367 * 24 * 60 * 60))
   end
 
   def test__sdk_class_and_default_port

data/wavefront-cli.gemspec

@@ -2,13 +2,11 @@
 
 require 'pathname'
 require 'date'
-
 require_relative 'lib/wavefront-cli/version'
 
 Gem::Specification.new do |gem|
   gem.name          = 'wavefront-cli'
   gem.version       = WF_CLI_VERSION
-  gem.date          = Date.today.to_s
 
   gem.summary       = 'CLI for Wavefront API v2'
   gem.description   = 'CLI for Wavefront (wavefront.com) API v2 '
@@ -21,22 +19,22 @@ Gem::Specification.new do |gem|
   gem.bindir        = 'bin'
   gem.files         = `git ls-files`.split("\n")
   gem.executables   = 'wf'
-  gem.test_files    = gem.files.grep(/^spec/)
   gem.require_paths = %w[lib]
 
-  gem.add_runtime_dependency 'docopt', '~> 0.6.0'
+  gem.add_runtime_dependency 'docopt', '~> 0.6'
   gem.add_runtime_dependency 'inifile', '~> 3.0'
-  gem.add_runtime_dependency 'wavefront-sdk', '~> 5.4', '>= 5.4.2'
+  gem.add_runtime_dependency 'wavefront-sdk', '~> 7.0'
 
-  gem.add_development_dependency 'minitest', '~> 5.14'
+  gem.add_development_dependency 'minitest', '~> 5.17'
   gem.add_development_dependency 'rake', '~> 13.0'
-  gem.add_development_dependency 'rubocop', '~> 1.9'
-  gem.add_development_dependency 'rubocop-minitest', '~> 0.10'
-  gem.add_development_dependency 'rubocop-performance', '~> 1.3'
-  gem.add_development_dependency 'rubocop-rake', '~> 0.5'
-  gem.add_development_dependency 'spy', '~> 1.0.0'
-  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')
+  gem.add_development_dependency 'rubocop', '~> 1.43'
+  gem.add_development_dependency 'rubocop-minitest', '~> 0.26'
+  gem.add_development_dependency 'rubocop-performance', '~> 1.15'
+  gem.add_development_dependency 'rubocop-rake', '~> 0.6'
+  gem.add_development_dependency 'spy', '~> 1.0'
+  gem.add_development_dependency 'webmock', '~> 3.18'
+  gem.add_development_dependency 'yard', '~> 0.9'
+
+  gem.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end