wavefront-cli 4.2.1 → 4.3.0

data/spec/wavefront-cli/apitoken_spec.rb

@@ -1,35 +1,64 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-word = 'apitoken'
+require_relative '../support/command_base'
+require_relative '../../lib/wavefront-cli/apitoken'
 
-require_relative '../spec_helper'
-require_relative "../../lib/wavefront-cli/#{word}"
+# Ensure 'apitoken' commands produce the correct API calls.
+#
+class ApiTokenEndToEndTest < EndToEndTest
+  include WavefrontCliTest::Delete
 
-id     = '17db4cc1-65f6-40a8-a1fa-6fcae460c4bd'
-bad_id = 'bad_id'
+  def test_list
+    quietly { assert_cmd_gets('list', '/api/v2/apitoken') }
+    assert_usage('list --offset 4')
+    assert_abort_on_missing_creds('list')
 
-k = WavefrontCli::ApiToken
+    assert_noop('list',
+                'uri: GET https://default.wavefront.com/api/v2/apitoken')
+  end
 
-describe "#{word} command" do
-  missing_creds(word, ['list',
-                       'create',
-                       "delete #{id}",
-                       "rename #{id} name"])
+  def test_create
+    quietly { assert_cmd_posts('create', '/api/v2/apitoken') }
+    assert_abort_on_missing_creds('create')
+    assert_noop('create',
+                'uri: POST https://default.wavefront.com/api/v2/apitoken',
+                'body: null')
+  end
 
-  invalid_ids(word, ["delete #{bad_id}", "rename #{bad_id} name"])
+  def _test_rename
+    assert_cmd_puts("rename #{id} newname", "/api/v2/apitoken/#{id}",
+                    tokenID: id, tokenName: 'newname')
+    assert_invalid_id("rename #{invalid_id} newname")
+    assert_abort_on_missing_creds("rename #{id} newname")
 
-  cmd_to_call(word, 'list', { path: "/api/v2/#{word}" }, k)
+    assert_noop(
+      "rename #{id} newname",
+      "uri: PUT https://default.wavefront.com/api/v2/apitoken/#{id}",
+      'body: {"tokenID":"17db4cc1-65f6-40a8-a1fa-6fcae460c4bd",' \
+      '"tokenName":"newname"}'
+    )
+  end
 
-  cmd_noop(word, 'list',
-           ["GET https://metrics.wavefront.com/api/v2/#{word}"], k)
-  cmd_noop(word, 'create',
-           ["POST https://metrics.wavefront.com/api/v2/#{word}"], k)
-  cmd_noop(word, "delete #{id}",
-           ["DELETE https://metrics.wavefront.com/api/v2/#{word}/#{id}"], k)
+  private
 
-  cmd_to_call(word, "rename #{id} newname",
-              { method: :put, path: "/api/v2/#{word}/#{id}",
-                body: { tokenID:   id,
-                        tokenName: 'newname' },
-                headers: JSON_POST_HEADERS }, k)
+  def id
+    '17db4cc1-65f6-40a8-a1fa-6fcae460c4bd'
+  end
+
+  def invalid_id
+    '__BAD__'
+  end
+
+  def cmd_word
+    'apitoken'
+  end
+
+  def sdk_class_name
+    'ApiToken'
+  end
+
+  def friendly_name
+    'api token'
+  end
 end

data/spec/wavefront-cli/base_spec.rb

@@ -1,30 +1,9 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require_relative '../spec_helper'
+require 'minitest/autorun'
 require_relative '../../lib/wavefront-cli/alert'
-require 'spy'
-require 'spy/integration'
-
-OPTS = {
-  endpoint: 'test.wavefront.com',
-  token:    '0123456789-ABCDEF',
-  debug:    false,
-  noop:     true
-}.freeze
-
-OPTS_CMD = {
-  endpoint: 'test.wavefront.com',
-  token:    '0123456789-ABCDEF',
-  debug:    false,
-  noop:     true,
-  test:     true,
-  cmd:      true
-}.freeze
-
-DISP_DATA = {
-  a: 'string',
-  b: %w[list_1 list_2]
-}.freeze
+require_relative '../../lib/wavefront-cli/version'
 
 # Since I tidied up the file layout in wavefront-sdk, there's no
 # longer a 1:1 mapping of CLI and SDK classes. wavefront-sdk/base is
@@ -37,13 +16,16 @@ class WavefrontCliBaseTest < MiniTest::Test
   attr_reader :wf, :wf_cmd
 
   def setup
-    @wf = WavefrontCli::Alert.new(OPTS)
+    @wf = WavefrontCli::Alert.new(endpoint: 'test.wavefront.com',
+                                  token: '0123456789-ABCDEF',
+                                  debug: false,
+                                  noop: true)
   end
 
   def test_mk_creds
     assert_equal({ endpoint: 'test.wavefront.com',
-                   token:    '0123456789-ABCDEF',
-                   agent:    "wavefront-cli-#{WF_CLI_VERSION}" },
+                   token: '0123456789-ABCDEF',
+                   agent: "wavefront-cli-#{WF_CLI_VERSION}" },
                  wf.mk_creds)
   end
 

data/spec/wavefront-cli/cloudintegration_spec.rb

@@ -1,34 +1,70 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require_relative '../spec_helper'
+require_relative '../support/command_base'
 require_relative '../../lib/wavefront-cli/cloudintegration'
 
-id = '3b56f61d-1a79-46f6-905c-d75a0f613d10'
-bad_id = '__BAD__'
-k = WavefrontCli::CloudIntegration
-word = 'cloudintegration'
-
-describe 'cloudintegration command' do
-  missing_creds(word, ['list', "describe #{id}", "delete #{id}",
-                       "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, "undelete #{id}",
-              { method: :post,
-                path:    "/api/v2/cloudintegration/#{id}/undelete" }, k)
-  cmd_to_call(word, "enable #{id}",
-              { method: :post,
-                path:    "/api/v2/cloudintegration/#{id}/enable" }, k)
-  cmd_to_call(word, "disable #{id}",
-              { method: :post,
-                path:    "/api/v2/cloudintegration/#{id}/disable" }, k)
-  invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}",
-                     "undelete #{bad_id}", "disable #{bad_id}",
-                     "enable #{bad_id}"])
-  test_list_output(word, k)
+# Ensure 'cloudintegration' commands produce the correct API calls.
+#
+class CloudIntegrationEndToEndTest < EndToEndTest
+  include WavefrontCliTest::DeleteUndelete
+  include WavefrontCliTest::Describe
+  include WavefrontCliTest::Dump
+  include WavefrontCliTest::List
+  # include WavefrontCliTest::Import
+  include WavefrontCliTest::Search
+
+  def test_enable
+    assert_repeated_output("Enabled '#{id}'.") do
+      assert_cmd_posts("enable #{id}",
+                       "/api/v2/cloudintegration/#{id}/enable")
+    end
+
+    assert_invalid_id("enable #{invalid_id}")
+    assert_usage('enable')
+    assert_abort_on_missing_creds("enable #{id}")
+
+    assert_noop("enable #{id}",
+                'uri: POST https://default.wavefront.com/api/v2/' \
+                "cloudintegration/#{id}/enable",
+                'body: null')
+  end
+
+  def test_disable
+    assert_repeated_output("Disabled '#{id}'.") do
+      assert_cmd_posts("disable #{id}",
+                       "/api/v2/cloudintegration/#{id}/disable")
+    end
+
+    assert_invalid_id("disable #{invalid_id}")
+    assert_usage('disable')
+    assert_abort_on_missing_creds("disable #{id}")
+
+    assert_noop("disable #{id}",
+                'uri: POST https://default.wavefront.com/api/v2/' \
+                "cloudintegration/#{id}/disable",
+                'body: null')
+  end
+
+  private
+
+  def id
+    '3b56f61d-1a79-46f6-905c-d75a0f613d10'
+  end
+
+  def invalid_id
+    '__BAD__'
+  end
+
+  def cmd_word
+    'cloudintegration'
+  end
+
+  def sdk_class_name
+    'CloudIntegration'
+  end
+
+  def friendly_name
+    'cloud integration'
+  end
 end

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',

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

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
-require_relative(File.join('../../../lib/wavefront-cli/commands',
-                           Pathname.new(__FILE__).basename
-                           .to_s.sub('_spec.rb', '')))
-require_relative 'spec_helper'
+require 'minitest/autorun'
+require_relative '../../constants'
+require_relative '../../../lib/wavefront-cli/commands/base'
 
-# Test base class for commands
+# Abstract class for testing commands
 #
 class WavefrontCommmandBaseTest < MiniTest::Test
   attr_reader :wf, :col_width, :skip_cmd
@@ -70,6 +70,7 @@ class WavefrontCommmandBaseTest < MiniTest::Test
 
     wf.commands(600).split("\n")[1..-1].each do |c|
       next if skip_cmd && c.match(skip_cmd)
+
       assert_match(/^  \w+/, c)
       assert_includes(c, CMN) unless c =~ /--help$/
     end
@@ -77,38 +78,39 @@ class WavefrontCommmandBaseTest < MiniTest::Test
 
   def test_options
     assert wf.options(600).start_with?("Global options:\n")
-    assert_match(/\nOptions:\n/, wf.options)
+    assert_match(/\nOptions:/, wf.options)
 
     wf.options(600).split("\n")[1..-1].each do |o|
       next if o == 'Global options:' || o == 'Options:' || o.empty?
+
       assert_instance_of(String, o)
       assert_match(/^  -\w, --\w+/, o)
       refute o.end_with?('.')
     end
 
-    assert_equal(wf.options.split("\n").select(&:empty?).size, 1)
+    assert_equal(1, wf.options.split("\n").select(&:empty?).size)
   end
 
   def test_opt_row
     assert_equal(wf.opt_row('-s, --short    short option', 10),
-                 "  -s, --short    short option\n")
+                 '  -s, --short    short option')
     assert_equal(wf.opt_row('-s, --short    short option', 8),
-                 "  -s, --short  short option\n")
+                 '  -s, --short  short option')
     assert_equal(wf.opt_row(
                    '-l, --longoption    a long option with a quite ' \
                    'long description which needs folding', 15
-    ),
+                 ),
                  '  -l, --longoption    a long option with a quite long ' \
-                 "description which\n                      needs folding\n")
+                 "description which\n                      needs folding")
     assert_equal(wf.opt_row(
                    '-h, --hugeoption    an option with a very long, far ' \
                    'too verbose description which is going need folding ' \
                    'more than one time, let me tell you', 12
-    ),
+                 ),
                  '  -h, --hugeoption an option with a very long, far too ' \
                  "verbose description\n                   which is going " \
                  'need folding more than one time, let me tell' \
-                 "\n                   you\n")
+                 "\n                   you")
   end
 
   def test_option_column_width

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative('../../../lib/wavefront-cli/commands/cloudintegration')
 require_relative 'base_spec'

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
@@ -21,6 +22,7 @@ class WavefrontCommmandConfigTest < WavefrontCommmandBaseTest
 
     wf.options(600).split("\n")[1..-1].each do |o|
       next if o == 'Global options:' || o == 'Options:' || o.empty?
+
       assert_instance_of(String, o)
       assert_match(/^  -\w, --\w+/, o)
       refute o.end_with?('.')
@@ -35,6 +37,7 @@ class WavefrontCommmandConfigTest < WavefrontCommmandBaseTest
 
     wf.commands(600).split("\n")[1..-1].each do |c|
       next if skip_cmd && c.match(skip_cmd)
+
       assert_match(/^  \w+/, c)
     end
   end

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative('../../../lib/wavefront-cli/commands/link')
 require_relative 'base_spec'

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative('../../../lib/wavefront-cli/commands/window')
 require_relative 'base_spec'

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',

data/spec/wavefront-cli/config_spec.rb

@@ -1,12 +1,15 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require_relative '../spec_helper'
+require 'pathname'
+require 'minitest/autorun'
+require_relative '../constants'
 require_relative '../../lib/wavefront-cli/config'
 
 DEF_CF = Pathname.new(ENV['HOME']) + '.wavefront'
 CONF_TMP = Pathname.new('/tmp/outfile')
 
-# Test base writer
+# Test CLI configuration command
 #
 class WavefrontCliConfigTest < MiniTest::Test
   attr_reader :wf, :wfo, :wfn
@@ -18,9 +21,9 @@ class WavefrontCliConfigTest < MiniTest::Test
   end
 
   def test_do_location
-    assert_output(format("%s\n", CF)) { wfo.do_location }
+    assert_output(format("%<file>s\n", file: CF)) { wfo.do_location }
     assert_output("/no/file\n") { wfn.do_location }
-    assert_output(format("%s\n", DEF_CF)) { wf.do_location }
+    assert_output(format("%<file>s\n", file: DEF_CF)) { wf.do_location }
   end
 
   def test_do_profiles
@@ -45,15 +48,23 @@ class WavefrontCliConfigTest < MiniTest::Test
 
   def test_read_input
     ["value  \n", " value\n", "    value  \t\n", "value\n"].each do |v|
-      STDIN.stub(:gets, v) do
-        assert_equal('value', wf.read_input)
-      end
+      STDIN.stub(:gets, v) { assert_equal('value', wf.read_input) }
     end
   end
 
   def test_base_config
-    assert_instance_of(IniFile, wfo.base_config)
-    assert_instance_of(IniFile, wf.base_config)
+    out, err = capture_io { assert_instance_of(IniFile, wf.base_config) }
+    assert_empty(err)
+
+    if (Pathname.new(ENV['HOME']) + '.wavefront').exist?
+      assert_empty(out)
+    else
+      assert_match(/Creating new configuration file at/, out)
+    end
+
+    out, err = capture_io { assert_instance_of(IniFile, wfo.base_config) }
+    assert_empty(err)
+    assert_empty(out)
 
     assert_output('') { wfo.base_config }
     assert_output("Creating new configuration file at /no/file.\n") do
@@ -98,12 +109,12 @@ class WavefrontCliConfigTest < MiniTest::Test
       assert_equal('json', x[:prof]['format'])
     end
 
+    assert_empty(err)
     assert_match(/Creating profile 'prof'./, out)
     assert_match(/Wavefront API token/, out)
     assert_match(/Wavefront API endpoint/, out)
     assert_match(/Wavefront proxy endpoint/, out)
     assert_match(/default output format/, out)
-    assert_empty(err)
   end
 
   def test_create_profile_2
@@ -122,12 +133,12 @@ class WavefrontCliConfigTest < MiniTest::Test
       assert_equal('human', x[:prof]['format'])
     end
 
+    assert_empty(err)
     assert_match(/Creating profile 'prof'./, out)
     assert_match(/Wavefront API token/, out)
     assert_match(/Wavefront API endpoint/, out)
     assert_match(/Wavefront proxy endpoint/, out)
     assert_match(/default output format/, out)
-    assert_empty(err)
   end
 
   def test_create_profile_3
@@ -141,9 +152,9 @@ class WavefrontCliConfigTest < MiniTest::Test
       end
     end
 
+    assert_empty(err)
     assert_match(/Creating profile 'prof'./, out)
     assert_match(/Wavefront API token/, out)
-    assert_empty(err)
   end
 
   def test_create_profile_4
@@ -157,9 +168,9 @@ class WavefrontCliConfigTest < MiniTest::Test
       end
     end
 
+    assert_empty(err)
     assert_match(/Creating profile 'prof'./, out)
     assert_match(/Wavefront API token/, out)
-    assert_empty(err)
   end
 
   def test_create_profile_5
@@ -173,9 +184,9 @@ class WavefrontCliConfigTest < MiniTest::Test
       end
     end
 
+    assert_empty(err)
     assert_match(/Creating profile 'prof'./, out)
     assert_match(/Wavefront API token/, out)
-    assert_empty(err)
   end
 
   def test_do_setup; end