wavefront-sdk 6.0.0 → 8.0.0

data/spec/wavefront-sdk/core/api_caller_spec.rb

@@ -19,7 +19,7 @@ end
 
 # Test Wavefront API caller
 #
-class WavefrontApiCallerTest < MiniTest::Test
+class WavefrontApiCallerTest < Minitest::Test
   attr_reader :wf, :wf_noop, :uri_base, :headers
 
   def setup

data/spec/wavefront-sdk/core/api_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../../lib/wavefront-sdk/core/api'
 
 # Test SDK core API class
 #
-class WavefrontCoreApiTest < MiniTest::Test
+class WavefrontCoreApiTest < Minitest::Test
   attr_reader :wf
 
   def setup
@@ -22,7 +22,7 @@ class WavefrontCoreApiTest < MiniTest::Test
   end
 
   def test_hash_for_update
-    wf.instance_variable_set('@update_keys', %i[k1 k2])
+    wf.instance_variable_set(:@update_keys, %i[k1 k2])
     body = { k1: 'ov1',
              k2: 'ov2',
              k3: 'ov3',

data/spec/wavefront-sdk/core/logger_spec.rb

@@ -7,7 +7,7 @@ require_relative '../../../lib/wavefront-sdk/core/logger'
 
 # Test SDK logger class
 #
-class WavefrontLoggerTest < MiniTest::Test
+class WavefrontLoggerTest < Minitest::Test
   attr_reader :wfl
 
   def setup

data/spec/wavefront-sdk/core/response_spec.rb

@@ -20,7 +20,7 @@ ERR_RESP = { error: 'HTTP 415 Unsupported Media Type',
 # Unit tests for Response class. Also indirectly tests the Status
 # type.
 #
-class WavefrontResponseTest < MiniTest::Test
+class WavefrontResponseTest < Minitest::Test
   attr_reader :wfg, :wfb, :wfe
 
   def setup

data/spec/wavefront-sdk/credentials_spec.rb

@@ -5,12 +5,12 @@ require 'pathname'
 require_relative '../spec_helper'
 require_relative '../../lib/wavefront-sdk/credentials'
 
-CONF1 = RESOURCE_DIR + 'test.conf'
-CONF2 = RESOURCE_DIR + 'test2.conf'
+CONF1 = RESOURCE_DIR.join('test.conf')
+CONF2 = RESOURCE_DIR.join('test2.conf')
 
 # Test SDK base class end-to-end
 #
-class WavefrontCredentialsTest < MiniTest::Test
+class WavefrontCredentialsTest < Minitest::Test
   def test_initialize_1
     ENV.delete('WAVEFRONT_ENDPOINT')
     ENV.delete('WAVEFRONT_TOKEN')
@@ -60,15 +60,11 @@ end
 # Test individual methods. We must override the constructor to do
 # this.
 #
-# rubocop:disable Lint/MissingSuper
-class Giblets < Wavefront::Credentials
-  def initialize; end
-end
-# rubocop:enable Lint/MissingSuper
+class Giblets < Wavefront::Credentials; end
 
 # And here are the tests
 #
-class GibletsTest < MiniTest::Test
+class GibletsTest < Minitest::Test
   attr_reader :wf, :raw
 
   def setup
@@ -119,9 +115,9 @@ class GibletsTest < MiniTest::Test
 
   def test_populate
     wf.populate(raw)
-    config = wf.instance_variable_get('@config')
-    creds = wf.instance_variable_get('@creds')
-    proxy = wf.instance_variable_get('@proxy')
+    config = wf.instance_variable_get(:@config)
+    creds = wf.instance_variable_get(:@creds)
+    proxy = wf.instance_variable_get(:@proxy)
 
     assert_instance_of(Map, config)
     assert_equal('raw_proxy', config.proxy)
@@ -143,8 +139,8 @@ class GibletsTest < MiniTest::Test
     assert_equal(3, x.length)
     x.each { |p| assert_instance_of(Pathname, p) }
     assert_includes(x, Pathname.new('/etc/wavefront/credentials'))
-    assert_includes(x, Pathname.new(ENV['HOME']) + '.wavefront')
-    assert_includes(x, Pathname.new(ENV['HOME']) + '.wavefront.conf')
+    assert_includes(x, Pathname.new(Dir.home).join('.wavefront'))
+    assert_includes(x, Pathname.new(Dir.home).join('.wavefront.conf'))
   end
 
   def test_cred_files_opts
@@ -197,7 +193,7 @@ class GibletsTest < MiniTest::Test
     end
 
     assert_raises Wavefront::Exception::InvalidConfigFile do
-      wf.load_profile(RESOURCE_DIR + 'malformed.conf')
+      wf.load_profile(RESOURCE_DIR.join('malformed.conf'))
     end
   end
 end

data/spec/wavefront-sdk/distribution_spec.rb

@@ -7,7 +7,7 @@ require_relative '../../lib/wavefront-sdk/distribution'
 # Most of the distribution methods are inherited from the Write
 # class so they aren't tested again here.
 #
-class WavefrontDistributionTest < MiniTest::Test
+class WavefrontDistributionTest < Minitest::Test
   attr_reader :wf
 
   def setup

data/spec/wavefront-sdk/ingestionpolicy_spec.rb

@@ -11,6 +11,17 @@ class WavefrontIngestionPolicyTest < WavefrontTestBase
   include WavefrontTest::Describe
   include WavefrontTest::Update
   include WavefrontTest::Delete
+  include WavefrontTest::History
+
+  def test_revert
+    assert_posts("/api/v2/usage/ingestionpolicy/#{id}/revert/5", nil, :json) do
+      wf.revert(id, 5)
+    end
+
+    assert_raises(Wavefront::Exception::InvalidVersion) { wf.revert(id, 'v5') }
+
+    assert_invalid_id { wf.revert(invalid_id, 5) }
+  end
 
   private
 

data/spec/wavefront-sdk/integration_spec.rb

@@ -47,6 +47,10 @@ class WavefrontIntegrationTest < WavefrontTestBase
     assert_gets('/api/v2/integration/status') { wf.statuses }
   end
 
+  def test_manifests_min
+    assert_gets('/api/v2/integration/manifests/min') { wf.manifests_min }
+  end
+
   private
 
   def api_class

data/spec/wavefront-sdk/internals_spec.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'zlib'
+require_relative '../spec_helper'
+require_relative '../../lib/wavefront-sdk/internals'
+
+# Tests for internal methods
+#
+class TestInternals < Minitest::Test
+  attr_reader :t
+
+  def setup
+    @t = Wavefront::Internals.new
+  end
+
+  def test_sdk_files
+    result = t.sdk_files
+    assert_instance_of(Array, result)
+    assert(result.all?(&:file?))
+    assert(result.all? { |f| f.extname == '.rb' })
+  end
+
+  def test_supported_api_paths
+    result = t.supported_api_paths
+    assert_instance_of(Array, result)
+    assert paths_are_good(result)
+  end
+
+  def test_remote_api_paths
+    result = t.remote_api_paths(spec_resource)
+
+    assert paths_are_good(result)
+  end
+
+  def paths_are_good(result)
+    verbs = %w[GET PUT POST PATCH DELETE]
+
+    assert(result.all? do |verb, path|
+      verbs.include?(verb) && (path == '/report' ||
+                               path.match?(%r{^/api/(v2|spy)/}))
+    end)
+
+    assert_includes(result, ['GET', '/api/v2/usage/ingestionpolicy/{id}'])
+    assert_includes(result, ['POST', '/api/v2/dashboard/acl/add'])
+    assert_includes(result, ['PUT', '/api/v2/dashboard/{id}/tag/{tagValue}'])
+
+    assert_includes(result, ['POST', '/api/v2/search/derivedmetric'])
+    assert_includes(result, ['POST', '/api/v2/search/derivedmetric/deleted'])
+    # assert_includes(result,
+    #                 ['POST', '/api/v2/search/derivedmetric/deleted/facets'])
+    # assert_includes(result,
+    #                 ['POST', '/api/v2/search/derivedmetric/deleted/{facet}'])
+    assert_includes(result, ['POST', '/api/v2/search/derivedmetric/facets'])
+    assert_includes(result, ['POST', '/api/v2/search/derivedmetric/{facet}'])
+    assert_includes(result, ['POST', '/api/v2/search/event'])
+  end
+
+  def spec_resource
+    Zlib::GzipReader.new(File.open(RESOURCE_DIR.join('swagger.spec.gz'))).read
+  end
+end

data/spec/wavefront-sdk/metric_helper_spec.rb

@@ -13,7 +13,7 @@ WH_TAGS  = { t1: 'v1', t2: 'v2' }.freeze
 # Tests for the MetricHelper class.
 #
 # rubocop:disable Style/NumericLiterals
-class WavefrontMetricHelperTest < MiniTest::Test
+class WavefrontMetricHelperTest < Minitest::Test
   attr_reader :wf, :wfd
 
   def setup

data/spec/wavefront-sdk/metricspolicy_spec.rb

@@ -18,17 +18,17 @@ class WavefrontMetricsPolicyTest < WavefrontTestBase
   end
 
   def test_history
-    assert_gets('/api/v2/metricspolicy?offset=10&limit=100') do
+    assert_gets('/api/v2/metricspolicy/history?offset=10&limit=100') do
       wf.history(10)
     end
 
-    assert_gets('/api/v2/metricspolicy?offset=12&limit=34') do
+    assert_gets('/api/v2/metricspolicy/history?offset=12&limit=34') do
       wf.history(12, 34)
     end
   end
 
   def test_revert
-    assert_posts('/api/v2/metricspolicy/revert/5') do
+    assert_posts('/api/v2/metricspolicy/revert/5', nil, :json) do
       wf.revert(5)
     end
 

data/spec/wavefront-sdk/misc_spec.rb

@@ -6,13 +6,13 @@ require_relative '../../lib/wavefront-sdk/defs/version'
 
 # Tests for things that aren't in the SDK itself.
 #
-class WavefrontMiscTest < MiniTest::Test
+class WavefrontMiscTest < Minitest::Test
   # Check the latest version mentioned in the changelog is the version the SDK
   # defines itself as.
   #
   def test_version_vs_history
-    history_file = WF_SDK_LOCATION + 'HISTORY.md'
-    history_vers = IO.read(history_file).match(/^## (\d+\.\d+\.\d+) \(/)
+    history_file = WF_SDK_LOCATION.join('HISTORY.md')
+    history_vers = File.read(history_file).match(/^## (\d+\.\d+\.\d+) \(/)
     assert_equal(WF_SDK_VERSION, history_vers.captures.first)
   end
 end

data/spec/wavefront-sdk/monitoredapplication_spec.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../spec_helper'
+require_relative '../test_mixins/general'
+
+# Unit tests for Webhook class
+#
+class WavefrontWebhookTest < WavefrontTestBase
+  include WavefrontTest::Describe
+  include WavefrontTest::List
+  include WavefrontTest::Update
+
+  private
+
+  def api_class
+    'monitoredapplication'
+  end
+
+  def id
+    'beachshirts'
+  end
+
+  def invalid_id
+    '+-+-+-+'
+  end
+
+  def payload
+    {
+      application: 'beachshirts',
+      satisfiedLatencyMillis: 100_000,
+      hidden: 'false'
+    }
+  end
+end

data/spec/wavefront-sdk/paginator/base_spec.rb

@@ -18,7 +18,7 @@ end
 
 # Paginator tests
 #
-class WavefrontPaginatorBaseTest < MiniTest::Test
+class WavefrontPaginatorBaseTest < Minitest::Test
   attr_reader :wf, :apicaller, :conn
 
   def setup

data/spec/wavefront-sdk/paginator/post_spec.rb

@@ -19,7 +19,7 @@ end
 
 # Test POST pagination
 #
-class WavefrontPaginatorPostTest < MiniTest::Test
+class WavefrontPaginatorPostTest < Minitest::Test
   attr_reader :wf, :apicaller, :conn
 
   def setup

data/spec/wavefront-sdk/proxy_spec.rb

@@ -27,6 +27,20 @@ class WavefrontProxyTest < WavefrontTestBase
     end
   end
 
+  def test_config
+    assert_invalid_id { wf.config(invalid_id) }
+
+    assert_gets("/api/v2/proxy/#{id}/config") { wf.config(id) }
+  end
+
+  def test_preprocessor_rules
+    assert_invalid_id { wf.preprocessor_rules(invalid_id) }
+
+    assert_gets("/api/v2/proxy/#{id}/preprocessorRules") do
+      wf.preprocessor_rules(id)
+    end
+  end
+
   private
 
   def api_class

data/spec/wavefront-sdk/savedsearch_spec.rb

@@ -54,8 +54,8 @@ class WavefrontSavedSearchTest < WavefrontTestBase
 
   def payload
     { query: {
-      foo: '{"searchTerms":[{"type":"freetext","value":"foo"}]}'
-    },
+        foo: '{"searchTerms":[{"type":"freetext","value":"foo"}]}'
+      },
       entityType: 'DASHBOARD' }
   end
 end

data/spec/wavefront-sdk/spansamplingpolicy_spec.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../spec_helper'
+require_relative '../test_mixins/general'
+
+# Unit tests for SpanSamplingPolicy class
+#
+class WavefrontSpanSamplingPolicyTest < WavefrontTestBase
+  include WavefrontTest::Create
+  include WavefrontTest::DeleteUndelete
+  include WavefrontTest::Describe
+  include WavefrontTest::History
+  include WavefrontTest::List
+  include WavefrontTest::Update
+
+  def test_deleted
+    assert_gets('/api/v2/spansamplingpolicy/deleted') { wf.deleted }
+  end
+
+  private
+
+  # used by the things we #include
+  #
+  def api_class
+    'spansamplingpolicy'
+  end
+
+  def id
+    'test_policy'
+  end
+
+  def invalid_id
+    {}
+  end
+
+  def payload
+    {
+      name: 'Test',
+      id: 'test',
+      active: false,
+      expression: "{{sourceName}}='localhost'",
+      description: 'test description',
+      samplingPercent: 100
+    }
+  end
+end

data/spec/wavefront-sdk/spy_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../lib/wavefront-sdk/spy'
 
 # Unit tests for Spy class
 #
-class WavefrontSpyTest < MiniTest::Test
+class WavefrontSpyTest < Minitest::Test
   attr_reader :wf
 
   def setup

data/spec/wavefront-sdk/stdlib/array_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../../lib/wavefront-sdk/stdlib/array'
 
 # Test extensions to stdlib's Array class
 #
-class ArrayTest < MiniTest::Test
+class ArrayTest < Minitest::Test
   def test_uri_concat
     assert_equal('a/b', %w[a b].uri_concat)
     assert_equal('/a/b', ['', 'a', 'b'].uri_concat)

data/spec/wavefront-sdk/stdlib/hash_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../../lib/wavefront-sdk/stdlib/hash'
 
 # Test extensions to stdlib hash class
 #
-class HashTest < MiniTest::Test
+class HashTest < Minitest::Test
   def test_to_wf_tag
     assert_equal('', {}.to_wf_tag)
     assert_equal('gt1="gv1" gt2="gv2"',

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

@@ -6,7 +6,7 @@ require_relative '../../../lib/wavefront-sdk/stdlib/string'
 
 # Test extensions to stdlib's String class
 #
-class StringTest < MiniTest::Test
+class StringTest < Minitest::Test
   def test_tagescape
     assert_equal('value', 'value'.tagescape)
     assert_equal('two words', 'two words'.tagescape)

data/spec/wavefront-sdk/support/mixins_spec.rb

@@ -7,7 +7,7 @@ require 'spy/integration'
 
 # Test SDK mixins
 #
-class WavefrontMixinsTest < MiniTest::Test
+class WavefrontMixinsTest < Minitest::Test
   include Wavefront::Mixins
 
   def test_parse_time

data/spec/wavefront-sdk/support/parse_time_spec.rb

@@ -9,7 +9,7 @@ TSM = 1_517_151_869_523
 
 # Test parse_time class
 #
-class WavefrontParseTimeTest < MiniTest::Test
+class WavefrontParseTimeTest < Minitest::Test
   attr_reader :pts, :ptm
 
   def setup

data/spec/wavefront-sdk/unstable/chart_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../../lib/wavefront-sdk/unstable/chart'
 
 # Unit tests for Chart class
 #
-class WavefrontChartTest < MiniTest::Test
+class WavefrontChartTest < Minitest::Test
   attr_reader :wf
 
   def setup

data/spec/wavefront-sdk/usage_spec.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper'
-require_relative '../test_mixins/general'
 
 # Unit tests for Usage class
 #

data/spec/wavefront-sdk/user_spec.rb

@@ -127,10 +127,10 @@ class WavefrontUserTest < WavefrontTestBase
   end
 
   def test_response_shim
-    (RESOURCE_DIR + 'user_responses').each_child do |input|
+    RESOURCE_DIR.join('user_responses').each_child do |input|
       # Ugly hack for the 202 in the 'create' file
       status = input.basename.to_s == 'create.json' ? 202 : 200
-      shimmed = wf.response_shim(IO.read(input), status)
+      shimmed = wf.response_shim(File.read(input), status)
       assert_instance_of(String, shimmed)
 
       ret_obj = JSON.parse(shimmed, symbolize_names: true)

data/spec/wavefront-sdk/validators_spec.rb

@@ -8,7 +8,7 @@ require_relative '../../lib/wavefront-sdk/validators'
 
 # Validator tests, obviously. Happy now Rubocop?
 #
-class WavefrontValidatorsTest < MiniTest::Test
+class WavefrontValidatorsTest < Minitest::Test
   include Wavefront::Validators
 
   def good_and_bad(method, exception, good, bad)
@@ -396,6 +396,15 @@ class WavefrontValidatorsTest < MiniTest::Test
                  bad)
   end
 
+  def test_wf_managedapplication_id
+    good = %w[test-app other-app application]
+    bad = ['', [], {}, 'a' * 1000, '£"^WR"!']
+    good_and_bad('wf_monitoredapplication_id?',
+                 'InvalidMonitoredApplicationId',
+                 good,
+                 bad)
+  end
+
   def test_wf_sampling_value
     good = [0, 0.01, 0.003, 0.05]
     bad = ['a', 0.1, 0.99, 1, -1, 1.1]
@@ -427,4 +436,11 @@ class WavefrontValidatorsTest < MiniTest::Test
     bad = %w[fa312fb-5ff4-420d-862d-5d6d99ed6bcf thing 123]
     good_and_bad('wf_metricspolicy_id?', 'InvalidMetricsPolicyId', good, bad)
   end
+
+  def test_wf_spansamplingpolicy_id
+    good = ['My Policy', 'policy', 'etc_etc_etc']
+    bad = [Pathname.pwd, nil]
+    good_and_bad('wf_spansamplingpolicy_id?', 'InvalidSpanSamplingPolicyId',
+                 good, bad)
+  end
 end

data/spec/wavefront-sdk/write_spec.rb

@@ -11,7 +11,7 @@ require_relative 'resources/dummy_points'
 # This class is sufficiently different to the API calling classes
 # that it doesn't use spec helper or inherit anything.
 #
-class WavefrontWriteTest < MiniTest::Test
+class WavefrontWriteTest < Minitest::Test
   attr_reader :wf, :wf_noop, :wf_tags
 
   def setup

data/spec/wavefront-sdk/writers/api_spec.rb

@@ -10,7 +10,7 @@ HEADERS = POST_HEADERS.merge('Content-Type': 'application/octet-stream')
 # The report class test will test that an API call is made. Here all
 # that's left to test is the #validate_credentials method.
 #
-class WavefrontWriterApiTest < MiniTest::Test
+class WavefrontWriterApiTest < Minitest::Test
   attr_reader :wf
 
   def setup

data/spec/wavefront-sdk/writers/core_spec.rb

@@ -30,7 +30,7 @@ end
 
 # Test methods common to 'write' and 'report'
 #
-class WavefrontCoreWriteTest < MiniTest::Test
+class WavefrontCoreWriteTest < Minitest::Test
   attr_reader :wf, :wf_tags
 
   def setup

data/spec/wavefront-sdk/writers/http_spec.rb

@@ -10,7 +10,7 @@ WH_CREDS = { proxy: 'wavefront-proxy' }.freeze
 
 # Test HTTP transport
 #
-class WavefrontWriterSocketTest < MiniTest::Test
+class WavefrontWriterSocketTest < Minitest::Test
   attr_reader :wf
 
   def setup

data/spec/wavefront-sdk/writers/proxy_spec.rb

@@ -15,7 +15,7 @@ WS_CREDS = { proxy: 'wavefront-proxy' }.freeze
 
 # The Proxy class writes to a proxy TCP socket
 #
-class WavefrontWriterSocketTest < MiniTest::Test
+class WavefrontWriterSocketTest < Minitest::Test
   attr_reader :wf, :wf_noop
 
   def setup

data/spec/wavefront-sdk/writers/socket_spec.rb

@@ -17,7 +17,7 @@ WU_CREDS = { socket: UNIX_SOCK }.freeze
 
 # Test UNIX Datagram socket writing
 #
-class WavefrontWriterUnixTest < MiniTest::Test
+class WavefrontWriterUnixTest < Minitest::Test
   attr_reader :wf, :wf_noop
 
   def setup

data/spec/wavefront-sdk/writers/summary_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../spec_helper'
 
 # Tests for summarizer
 #
-class WavefronWriterSummaryTest < MiniTest::Test
+class WavefronWriterSummaryTest < Minitest::Test
   attr_reader :wf
 
   def setup

data/wavefront-sdk.gemspec

@@ -17,25 +17,14 @@ Gem::Specification.new do |gem|
   gem.license       = 'BSD-2-Clause'
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  gem.test_files    = gem.files.grep(/^spec/)
   gem.require_paths = %w[lib]
   gem.bindir        = 'bin'
 
-  gem.add_dependency 'addressable', '~> 2.7'
-  gem.add_dependency 'faraday', '~> 1.1'
+  gem.add_dependency 'addressable', '~> 2.8'
+  gem.add_dependency 'faraday', '~> 2.7'
   gem.add_dependency 'inifile', '~> 3.0'
   gem.add_dependency 'map', '~> 6.6'
 
-  gem.add_development_dependency 'minitest', '~> 5.14'
-  gem.add_development_dependency 'rake', '~> 13.0'
-  gem.add_development_dependency 'rubocop', '~> 1.17'
-  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 'simplecov', '~> 0.18'
-  gem.add_development_dependency 'spy', '1.0.0'
-  gem.add_development_dependency 'webmock', '~> 3.9'
-  gem.add_development_dependency 'yard', '~> 0.9'
-
-  gem.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  gem.required_ruby_version = Gem::Requirement.new('>= 3.0')
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end