wavefront-sdk 5.0.1 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4f8e6e99d7124c4a1654be470312d6749c475d0cfbc23b33c72962d13fe0e1e
-  data.tar.gz: d2f43cb3bf00ddacce6cd24e92578d9876cfcbfa6b05cbdf6db68a5fbba732d9
+  metadata.gz: 0fc4311b2322403ef715d9a62c5f84712accb5ed1ee9e5350e0bbcb6237fe631
+  data.tar.gz: f2fb99d1f35d601a619f0e7135f8b22ea0b22d0697752af5a265132d867216bb
 SHA512:
-  metadata.gz: b01743fb3be2eaa72ff58f857eac4f640354ec6264436e764b0f5852b987a54f16d5fde57235b29b3c7ed5623ebca1894d467da1624f56fb8a185c5becded20c
-  data.tar.gz: 81953b85f6638f802619f8481f70a0e98129f26139ed06d70c28ce100b266dfd13fa1279112698e13a7ecf74364d781608ad3e20feb9c4451ef21070e511516a
+  metadata.gz: a2e79e3ce013f9fcdc3e28d7e111c586746e65ae341b0187b44b3908d29d81ae9aa8f0723d8eeea239c27f9976b232aa2acf2ecda92b797b0c45f25dc9e9c612
+  data.tar.gz: 20f3124667013b4f1212df12c6e04c235e7dfda24e3f0ac9a87ba4c4a4884d96d11f1a855d460f8026d65d8a35754d7a2f5d0bf705f13456dea066d0faee7822

data/.github/workflows/ruby.yml

@@ -0,0 +1,32 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [2.4.10, 2.5.8, 2.6.6, 2.7.2]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with: 
+        ruby-version: ${{ matrix.ruby-version }}     
+        bundler-cache: true
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/.rubocop.yml

@@ -2,47 +2,17 @@
 
 AllCops:
   TargetRubyVersion: 2.4
+  NewCops: enable
 
 Metrics/ClassLength:
   Max: 150
 
-# New cops
-#
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-Style/HashEachMethods:
-  Enabled: true
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  Enabled: true
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-Style/SlicingWithRange:
-  Enabled: true
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-Style/RedundantRegexpEscape:
-  Enabled: true
-Style/AccessorGrouping:
-  Enabled: true
-Style/BisectedAttrAccessor:
-  Enabled: true
-Style/RedundantAssignment:
-  Enabled: true
-Style/RedundantFetchBlock:
-  Enabled: true
-
 # Is nothing sacred?
 Layout/LineLength:
   Max: 80
+
+Style/StringConcatenation:
+  Enabled: false
+
+Style/OptionalBooleanParameter:
+  Enabled: false

data/.travis.yml

@@ -2,9 +2,9 @@ language: ruby
 cache: bundler
 rvm:
   - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
 before_install: gem install bundler --no-document
 deploy:
   provider: rubygems
@@ -14,7 +14,7 @@ deploy:
   on:
     tags: true
     repo: snltd/wavefront-sdk
-    ruby: 2.6.5
+    ruby: 2.6.6
 notifications:
   email: false
   slack:

data/HISTORY.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 5.3.1 (2020-12-11)
+* Fix error when renaming ingestion policies, and improve testing which should
+  have caught the problem in the first place.
+
+## 5.3.0 (2020-10-10)
+* Add `Wavefront::Proxy#shutdown` which can shut down a proxy via the API.
+
+## 5.2.1 (2020-09-18)
+* Remove necessity for user to `require 'pathname'`
+
+## 5.2.0 (2020-09-03)
+* Add `:raise_on_no_profile` option to `Wavefront::Credentials` constructor
+  options. If this is true and a specific config stanza is requested but not
+  found, `Wavefront::Exception::MissingConfigProfile` is thrown.
+
+## 5.1.0 (2020-08-15)
+* Add `create_aws_external_id`, `delete_aws_external_id`, and
+  `confirm_aws_external_id` methods to `Wavefront::CloudIntegration`.
+
 ## 5.0.1 (2020-07-08)
 * Reinstate `Wavefront::Role#grant` and `Wavefront::Role#revoke`, which were
   accidentally removed prior to release of 5.0.0.

data/lib/wavefront-sdk/cloudintegration.rb

@@ -101,5 +101,36 @@ module Wavefront
       wf_cloudintegration_id?(id)
       api.post([id, 'undelete'].uri_concat)
     end
+
+    # POST /api/v2/cloudintegration/awsExternalIdCreate an external id
+    # @return [Wavefront::Response]
+    #
+    def create_aws_external_id
+      api.post('awsExternalId', nil, 'application/json')
+    end
+
+    # DELETE /api/v2/cloudintegration/awsExternalId/{id}DELETEs an external id
+    # that was created by Wavefront
+    # @param id [String] AWS external ID
+    # @return [Wavefront::Response]
+    #
+    def delete_aws_external_id(external_id)
+      wf_aws_external_id?(external_id)
+      api.delete(['awsExternalId', external_id].uri_concat)
+    end
+
+    # GET /api/v2/cloudintegration/awsExternalId/{id}GETs (confirms) a valid
+    # external id that was created by Wavefront
+    # @param id [String] AWS external ID
+    # @return [Wavefront::Response]
+    #
+    def confirm_aws_external_id(external_id)
+      wf_aws_external_id?(external_id)
+      api.get(['awsExternalId', external_id].uri_concat)
+    end
+
+    def update_keys
+      %i[name]
+    end
   end
 end

data/lib/wavefront-sdk/core/api.rb

@@ -81,9 +81,9 @@ module Wavefront
       (time.to_f * 1000).round
     end
 
-    # doing a PUT to update an object requires only a certain subset of
+    # Doing a PUT to update an object requires only a certain subset of
     # the keys returned by #describe(). This method takes the
-    # existing description of an object and turns it into a new has
+    # existing description of an object and turns it into a new hash
     # which can be PUT.
     #
     # @param old [Hash] a hash of the existing object

data/lib/wavefront-sdk/core/exception.rb

@@ -12,6 +12,7 @@ module Wavefront
     class InvalidAlertId < RuntimeError; end
     class InvalidAlertSeverity < RuntimeError; end
     class InvalidApiTokenId < RuntimeError; end
+    class InvalidAwsExternalId < RuntimeError; end
     class InvalidConfigFile < RuntimeError; end
     class InvalidCloudIntegrationId < RuntimeError; end
     class InvalidDashboardId < RuntimeError; end
@@ -54,6 +55,7 @@ module Wavefront
     class InvalidUserGroupId < RuntimeError; end
     class InvalidVersion < RuntimeError; end
     class InvalidWebhookId < RuntimeError; end
+    class MissingConfigProfile < RuntimeError; end
     class NetworkTimeout < RuntimeError; end
     class NotImplemented < RuntimeError; end
     class SocketError < RuntimeError; end

data/lib/wavefront-sdk/credentials.rb

@@ -31,11 +31,16 @@ module Wavefront
     # @param options [Hash] keys may be 'file', which
     #   specifies a config file which will be loaded and parsed. If
     #   no file is supplied, those listed above will be used.;
-    #   and/or 'profile' which select a profile section from 'file'
+    #   and/or 'profile' which select a profile section from 'file'.
+    #   Specify the key :raise_noprofile to have an exception thrown
+    #   if a given profile cannot be found. Otherwise that is ignored and
+    #   options are built from other sources.
     #
     def initialize(options = {})
-      raw = load_from_file(cred_files(options), options[:profile] ||
-                           'default')
+      @raise_noprofile = options[:raise_on_no_profile] || false
+      raw = load_from_file(real_files(cred_files(options)),
+                           options[:profile] || 'default')
+
       populate(env_override(raw))
     end
 
@@ -80,31 +85,45 @@ module Wavefront
       end
     end
 
+    def real_files(files)
+      files.select { |f| f.exist? && f.file? }
+    end
+
     # @param files [Array][Pathname] a list of ini-style config files
     # @param profile [String] a profile name
+    # @param disallow_missing [Bool] whether or not to raise an exception if
+    #   we are given a profile but can't find it.
     # @return [Hash] the given profile from the given list of files.
     #   If multiple files match, the last one will be used
     #
     def load_from_file(files, profile = 'default')
       ret = {}
+      profiles_found = conf_files_found = 0
 
       files.each do |f|
-        next unless f.exist? && f.file?
-
         ret = load_profile(f, profile)
+        conf_files_found += 1
+        profiles_found += 1 unless ret.empty?
         ret[:file] = f
       end
 
+      raise_on_missing_profile(profile, profiles_found, conf_files_found)
       ret
     end
 
-    # Load in an (optionally) given section of an ini-style
-    # configuration file not there, we don't consider that an error.
+    def raise_on_missing_profile(profile, profiles_found, conf_files_found)
+      return true unless @raise_noprofile
+      return true unless profiles_found.zero? && conf_files_found.positive?
+
+      raise Wavefront::Exception::MissingConfigProfile, profile
+    end
+
+    # Load in an (optionally) given section of an ini-style configuration
+    # file. If the section is not there, we don't consider that an error.
     #
     # @param file [Pathname] the file to read
     # @param profile [String] the section in the config to read
-    # @return [Hash] options loaded from file. Each key becomes a
-    #   symbol
+    # @return [Hash] options loaded from file. Each key becomes a symbol
     #
     def load_profile(file, profile = 'default')
       IniFile.load(file)[profile].each_with_object({}) do |(k, v), memo|

data/lib/wavefront-sdk/defs/version.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
 
-WF_SDK_VERSION = '5.0.1'
+require 'pathname'
+
+WF_SDK_VERSION = '5.3.1'
 WF_SDK_LOCATION = Pathname.new(__dir__).parent.parent.parent

data/lib/wavefront-sdk/derivedmetric.rb

@@ -112,11 +112,9 @@ module Wavefront
       wf_derivedmetric_id?(id)
     end
 
-    private
-
     def update_keys
-      %i[id name query tags additionalInformation
-         includeObsoleteMetrics processRateMinutes minutes]
+      %i[name query tags additionalInformation includeObsoleteMetrics
+         processRateMinutes minutes]
     end
   end
 end

data/lib/wavefront-sdk/distribution.rb

@@ -65,6 +65,7 @@ module Wavefront
       raise Wavefront::Exception::InvalidDistribution
     end
 
+    # rubocop:disable Metrics/AbcSize
     def dist_hash(dist)
       dist.dup.tap do |d|
         d[:interval] = distribution_interval(dist)
@@ -75,6 +76,7 @@ module Wavefront
         d[:opttags] = tags_or_nothing(opts[:tags])
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     def distribution_timestamp(dist)
       parse_time(dist.fetch(:ts, Time.now))

data/lib/wavefront-sdk/ingestionpolicy.rb

@@ -81,5 +81,9 @@ module Wavefront
       api.put(id, hash_for_update(describe(id).response, body),
               'application/json')
     end
+
+    def update_keys
+      %i[name]
+    end
   end
 end

data/lib/wavefront-sdk/notificant.rb

@@ -83,8 +83,6 @@ module Wavefront
       api.post(['test', id].uri_concat, nil)
     end
 
-    private
-
     def update_keys
       %i[id contentType method description title template triggers
          recipient customHttpHeaders emailSubject isHtmlContent]

data/lib/wavefront-sdk/paginator/post.rb

@@ -50,7 +50,7 @@ module Wavefront
       def body_as(desired, args, index = 1)
         body = args[index]
 
-        return args if body.class == desired
+        return args if body.instance_of?(desired)
 
         args[index] = body_as_json(body)
         args

data/lib/wavefront-sdk/proxy.rb

@@ -86,5 +86,15 @@ module Wavefront
       wf_proxy_id?(id)
       api.put(id, payload)
     end
+
+    # Shutdown a proxy. Requires proxy >=5.x. Might not be effective if you
+    # have something like systemd or SMF restarting a failed proxy.
+    # @param id [String] ID of the proxy
+    # @return [Wavefront::Response]
+    #
+    def shutdown(id)
+      wf_proxy_id?(id)
+      api.put(id, { shutdown: true }, 'application/json')
+    end
   end
 end

data/lib/wavefront-sdk/savedsearch.rb

@@ -80,5 +80,9 @@ module Wavefront
       api.get(['type', entitytype].uri_concat, offset: offset,
                                                limit: limit)
     end
+
+    def update_keys
+      %i[query entityType]
+    end
   end
 end

data/lib/wavefront-sdk/support/mixins.rb

@@ -23,7 +23,7 @@ module Wavefront
     # @raise Wavefront::InvalidTimestamp
     #
     def parse_time(time, in_ms = false)
-      return relative_time(time, in_ms) if time.to_s =~ /^[\-+]/
+      return relative_time(time, in_ms) if time.to_s.match?(/^[\-+]/)
 
       ParseTime.new(time, in_ms).parse!
     end

data/lib/wavefront-sdk/support/parse_time.rb

@@ -34,7 +34,7 @@ module Wavefront
     # @return [Fixnum] timestamp
     #
     def parse_time_string
-      return t.to_i if t =~ /^\d+$/
+      return t.to_i if t.match?(/^\d+$/)
 
       @t = Time.parse("#{t} #{Time.now.getlocal.zone}")
       parse_time_time

data/lib/wavefront-sdk/user.rb

@@ -297,6 +297,10 @@ module Wavefront
       raise NoMethodError
     end
 
+    def update_keys
+      %i[identifier groups userGroups]
+    end
+
     private
 
     def response_looks_right?(body_obj)
@@ -311,9 +315,5 @@ module Wavefront
 
       items.fetch(:message, 'no message from API')
     end
-
-    def update_keys
-      %i[identifier groups userGroups]
-    end
   end
 end

data/lib/wavefront-sdk/validators.rb

@@ -626,6 +626,19 @@ module Wavefront
 
       raise Wavefront::Exception::InvalidRoleId, id
     end
+
+    # Ensure the given argument is a valid AWS external ID, used in the AWS
+    # cloud integration.
+    # @param id [String] the external ID to validate
+    # @return true if the external ID is valid
+    # @raise Wavefront::Exception::InvalidAwsExternalId if the external ID is
+    # not valid
+    #
+    def wf_aws_external_id?(id)
+      return true if id.is_a?(String) && id =~ /^[a-z0-9A-Z]{16}$/
+
+      raise Wavefront::Exception::InvalidAwsExternalId, id
+    end
   end
   # rubocop:enable Metrics/ModuleLength
 end

data/lib/wavefront-sdk/writers/core.rb

@@ -138,8 +138,8 @@ module Wavefront
       end
 
       def log_invalid_point(rawpoint, exception)
-        logger.log('Invalid point, skipping.', :info)
-        logger.log(exception.class, :info)
+        logger.log('Invalid point, skipping.', :warn)
+        logger.log(exception.class, :warn)
         logger.log(format('Invalid point: %<rawpoint>s (%<message>s)',
                           rawpoint: rawpoint,
                           message: exception.to_s), :debug)

data/spec/.rubocop.yml

@@ -1,54 +1,23 @@
-# Offense count: 64
+AllCops:
+  NewCops: enable
+
 Metrics/AbcSize:
   Max: 64
 
-# Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 400
 
-# Offense count: 46
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 39
 
-# New cops
-#
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-Style/HashEachMethods:
-  Enabled: true
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  Enabled: true
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-Style/SlicingWithRange:
-  Enabled: true
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-Style/RedundantRegexpEscape:
-  Enabled: true
-Style/AccessorGrouping:
-  Enabled: true
-Style/BisectedAttrAccessor:
-  Enabled: true
-Style/RedundantAssignment:
-  Enabled: true
-Style/RedundantFetchBlock:
-  Enabled: true
-
 # Is nothing sacred?
 Layout/LineLength:
   Max: 80
+
+Style/StringConcatenation:
+  Enabled: false
+
+Style/OptionalBooleanParameter:
+  Enabled: false

data/spec/support/minitest_assertions.rb

@@ -95,18 +95,12 @@ module Minitest
     end
 
     def header_lookup(type)
-      ctype = case type
-              when :plain
-                'text/plain'
-              when :json
-                'application/json'
-              when :octet
-                'application/octet-stream'
-              when :form
-                'application/x-www-form-urlencoded'
-              end
+      ctypes = { plain: 'text/plain',
+                 json: 'application/json',
+                 octet: 'application/octet-stream',
+                 form: 'application/x-www-form-urlencoded' }
 
-      { 'Content-Type': ctype, Accept: 'application/json' }
+      { 'Content-Type': ctypes[type], Accept: 'application/json' }
     end
   end
 end

data/spec/test_mixins/general.rb

@@ -65,6 +65,7 @@ module WavefrontTest
   module Update
     def test_update
       [payload].flatten.each do |p|
+        # passes payload through as-is
         assert_puts("/api/v2/#{api_class}/#{id}", p) do
           wf.update(id, p, false)
         end
@@ -73,6 +74,11 @@ module WavefrontTest
         assert_raises(ArgumentError) { wf.update }
       end
     end
+
+    def test_update_keys
+      assert_instance_of Array, wf.update_keys
+      assert(wf.update_keys.all? { |k| k.is_a?(Symbol) })
+    end
   end
 
   module Clone

data/spec/wavefront-sdk/alert_spec.rb

@@ -4,7 +4,6 @@
 require_relative '../spec_helper'
 require_relative '../test_mixins/acl'
 require_relative '../test_mixins/tag'
-require_relative '../test_mixins/update_keys'
 require_relative '../test_mixins/general'
 
 # Unit tests for Alert class
@@ -20,7 +19,6 @@ class WavefrontAlertTest < WavefrontTestBase
   include WavefrontTest::List
   include WavefrontTest::Tag
   include WavefrontTest::Update
-  include WavefrontTest::UpdateKeys
 
   def test_snooze
     assert_posts("/api/v2/alert/#{id}/snooze") { wf.snooze(id) }

data/spec/wavefront-sdk/cloudintegration_spec.rb

@@ -37,6 +37,36 @@ class WavefrontCloudIntegrationTest < WavefrontTestBase
     assert_raises(ArgumentError) { wf.disable }
   end
 
+  def test_create_aws_external_id
+    assert_posts('/api/v2/cloudintegration/awsExternalId', nil, :json) do
+      wf.create_aws_external_id
+    end
+  end
+
+  def test_delete_aws_external_id
+    assert_deletes("/api/v2/cloudintegration/awsExternalId/#{external_id}") do
+      wf.delete_aws_external_id(external_id)
+    end
+
+    assert_raises(Wavefront::Exception::InvalidAwsExternalId) do
+      wf.delete_aws_external_id(invalid_external_id)
+    end
+
+    assert_raises(ArgumentError) { wf.delete_aws_external_id }
+  end
+
+  def test_confirm_aws_external_id
+    assert_gets("/api/v2/cloudintegration/awsExternalId/#{external_id}") do
+      wf.confirm_aws_external_id(external_id)
+    end
+
+    assert_raises(Wavefront::Exception::InvalidAwsExternalId) do
+      wf.confirm_aws_external_id(invalid_external_id)
+    end
+
+    assert_raises(ArgumentError) { wf.confirm_aws_external_id }
+  end
+
   private
 
   def id
@@ -62,4 +92,12 @@ class WavefrontCloudIntegrationTest < WavefrontTestBase
   def api_class
     'cloudintegration'
   end
+
+  def external_id
+    'HqOM4mru5svd3uFp'
+  end
+
+  def invalid_external_id
+    '__nonsense__'
+  end
 end

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

@@ -23,7 +23,15 @@ class WavefrontCoreApiTest < MiniTest::Test
 
   def test_hash_for_update
     wf.instance_variable_set('@update_keys', %i[k1 k2])
-    body = { k1: 'ov1', k2: 'ov2', k3: 'ov3' }
+    body = { k1: 'ov1',
+             k2: 'ov2',
+             k3: 'ov3',
+             customerId: 'test',
+             creatorId: 'someone@example.com',
+             createUserId: 'someone@example.com',
+             updateUserId: 'someone@example.com',
+             createdEpochMillis: 1_607_691_387_023,
+             updatedEpochMillis: 1_607_691_387_023 }
     upd = { k2: 'nv1' }
     assert_equal({ k1: 'ov1', k2: 'nv1' }, wf.hash_for_update(body, upd))
   end

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

@@ -41,21 +41,21 @@ class WavefrontLoggerTest < MiniTest::Test
   end
 
   def test_log_logger_debug
-    l = Wavefront::Logger.new(logger: Logger.new(STDOUT))
+    l = Wavefront::Logger.new(logger: Logger.new($stdout))
     out, err = capture_subprocess_io { l.log('my message', :debug) }
     assert_match(/DEBUG -- : my message$/, out)
     assert_empty(err)
   end
 
   def test_log_logger_info
-    l = Wavefront::Logger.new(logger: Logger.new(STDOUT))
+    l = Wavefront::Logger.new(logger: Logger.new($stdout))
     out, err = capture_subprocess_io { l.log('my message', :info) }
     assert_match(/INFO -- : my message$/, out)
     assert_empty(err)
   end
 
   def test_log_logger_error
-    l = Wavefront::Logger.new(logger: Logger.new(STDOUT))
+    l = Wavefront::Logger.new(logger: Logger.new($stdout))
     out, err = capture_subprocess_io { l.log('my message', :error) }
     assert_match(/ERROR -- : my message$/, out)
     assert_empty(err)

data/spec/wavefront-sdk/credentials_spec.rb

@@ -60,9 +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
 
 # And here are the tests
 #
@@ -153,10 +155,9 @@ class GibletsTest < MiniTest::Test
   end
 
   def test_load_from_file
-    assert_equal({},
-                 wf.load_from_file(
-                   [Pathname.new('/no/file/1'), Pathname.new('/no/file/2')]
-                 ))
+    assert_raises(Wavefront::Exception::InvalidConfigFile) do
+      wf.load_from_file([Pathname.new('/nofile/1'), Pathname.new('/nofile/2')])
+    end
 
     assert_equal({ file: CONF1 }, wf.load_from_file([CONF1], 'noprofile'))
 

data/spec/wavefront-sdk/dashboard_spec.rb

@@ -4,7 +4,6 @@
 require_relative '../spec_helper'
 require_relative '../test_mixins/acl'
 require_relative '../test_mixins/tag'
-require_relative '../test_mixins/update_keys'
 require_relative '../test_mixins/general'
 
 # Unit tests for dashboard class
@@ -18,7 +17,6 @@ class WavefrontDashboardTest < WavefrontTestBase
   include WavefrontTest::List
   include WavefrontTest::Tag
   include WavefrontTest::Update
-  include WavefrontTest::UpdateKeys
 
   def test_favorite
     assert_posts("/api/v2/dashboard/#{id}/favorite") { wf.favorite(id) }

data/spec/wavefront-sdk/misc_spec.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../spec_helper'
+require_relative '../../lib/wavefront-sdk/defs/version'
+
+# Tests for things that aren't in the SDK itself.
+#
+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+) \(/)
+    assert_equal(WF_SDK_VERSION, history_vers.captures.first)
+  end
+end

data/spec/wavefront-sdk/notificant_spec.rb

@@ -10,6 +10,7 @@ class WavefrontNotificantTest < WavefrontTestBase
   include WavefrontTest::List
   include WavefrontTest::Delete
   include WavefrontTest::Describe
+  include WavefrontTest::Update
 
   def test_test
     assert_posts("/api/v2/notificant/test/#{id}") { wf.test(id) }
@@ -29,4 +30,30 @@ class WavefrontNotificantTest < WavefrontTestBase
   def invalid_id
     '---rubbish---'
   end
+
+  def payload
+    JSON.parse(%(
+{
+  "method": "PAGERDUTY",
+  "id": "PE0BEkf4r123yooO",
+  "contentType": "",
+  "description": "Test target",
+  "customerId": "sysdef",
+  "title": "Terraform Test Target",
+  "recipient": "12345678910111213141516171819202",
+  "creatorId": "someone@example.com",
+  "updaterId": "someone@example.com",
+  "createdEpochMillis": 1604513812010,
+  "updatedEpochMillis": 1604513812010,
+  "template": "{}",
+  "triggers": [
+    "ALERT_OPENED",
+    "ALERT_RESOLVED"
+  ],
+  "customHttpHeaders": {},
+  "emailSubject": "",
+  "isHtmlContent": false
+}
+    ), symbolize_names: true)
+  end
 end

data/spec/wavefront-sdk/proxy_spec.rb

@@ -21,6 +21,12 @@ class WavefrontProxyTest < WavefrontTestBase
     assert_raises(ArgumentError) { wf.rename }
   end
 
+  def test_shutdown
+    assert_puts("/api/v2/proxy/#{id}", { shutdown: true }.to_json, :json) do
+      wf.shutdown(id)
+    end
+  end
+
   private
 
   def api_class

data/spec/wavefront-sdk/validators_spec.rb

@@ -411,4 +411,10 @@ class WavefrontValidatorsTest < MiniTest::Test
     bad = %w[fa312fb-5ff4-420d-862d-5d6d99ed6bcf thing 123]
     good_and_bad('wf_role_id?', 'InvalidRoleId', good, bad)
   end
+
+  def test_wf_aws_external_id
+    good = %w[ah5Z9dkr46jbvLtJ HqOM4mru5svd3uFp c1lBxILCBNxLKdx9]
+    bad = %w[h5Z9dkr46jbvLtJ HqOM4mru5svd3uFp3 c!lBx!LC*NxLKdx*]
+    good_and_bad('wf_aws_external_id?', 'InvalidAwsExternalId', good, bad)
+  end
 end

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

@@ -22,7 +22,7 @@ class TestClassNoTags
   end
 
   def logger
-    Logger.new(STDOUT)
+    Logger.new($stdout)
   end
 
   def manage_conn

data/wavefront-sdk.gemspec

@@ -23,16 +23,16 @@ Gem::Specification.new do |gem|
   gem.bindir        = 'bin'
 
   gem.add_dependency 'addressable', '~> 2.7'
-  gem.add_dependency 'faraday', '~> 1.0'
+  gem.add_dependency 'faraday', '~> 1.1'
   gem.add_dependency 'inifile', '~> 3.0'
   gem.add_dependency 'map', '~> 6.6'
 
-  gem.add_development_dependency 'minitest', '~> 5.11'
+  gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_development_dependency 'rake', '~> 13.0'
-  gem.add_development_dependency 'rubocop', '~> 0.87'
-  gem.add_development_dependency 'simplecov', '~> 0.16'
-  gem.add_development_dependency 'spy', '~> 1.0.0'
-  gem.add_development_dependency 'webmock', '~> 3.7'
+  gem.add_development_dependency 'rubocop', '1.0'
+  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.4.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-sdk
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.3.1
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !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'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,42 +98,42 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.87'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.87'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: spy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -254,7 +255,6 @@ files:
 - spec/test_mixins/acl.rb
 - spec/test_mixins/general.rb
 - spec/test_mixins/tag.rb
-- spec/test_mixins/update_keys.rb
 - spec/wavefront-sdk/account_spec.rb
 - spec/wavefront-sdk/alert_spec.rb
 - spec/wavefront-sdk/api_mixins/user_mixins_spec.rb
@@ -276,6 +276,7 @@ files:
 - spec/wavefront-sdk/message_spec.rb
 - spec/wavefront-sdk/metric_helper_spec.rb
 - spec/wavefront-sdk/metric_spec.rb
+- spec/wavefront-sdk/misc_spec.rb
 - spec/wavefront-sdk/notificant_spec.rb
 - spec/wavefront-sdk/paginator/base_spec.rb
 - spec/wavefront-sdk/paginator/post_spec.rb
@@ -336,8 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: SDK for Wavefront API v2
@@ -352,7 +352,6 @@ test_files:
 - spec/test_mixins/acl.rb
 - spec/test_mixins/general.rb
 - spec/test_mixins/tag.rb
-- spec/test_mixins/update_keys.rb
 - spec/wavefront-sdk/account_spec.rb
 - spec/wavefront-sdk/alert_spec.rb
 - spec/wavefront-sdk/api_mixins/user_mixins_spec.rb
@@ -374,6 +373,7 @@ test_files:
 - spec/wavefront-sdk/message_spec.rb
 - spec/wavefront-sdk/metric_helper_spec.rb
 - spec/wavefront-sdk/metric_spec.rb
+- spec/wavefront-sdk/misc_spec.rb
 - spec/wavefront-sdk/notificant_spec.rb
 - spec/wavefront-sdk/paginator/base_spec.rb
 - spec/wavefront-sdk/paginator/post_spec.rb

data/spec/test_mixins/update_keys.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module WavefrontTest
-  #
-  # include this into any class which has update keys
-  #
-  module UpdateKeys
-    def test_update_keys
-      assert_instance_of Array, wf.update_keys
-      assert(wf.update_keys.all? { |k| k.is_a?(Symbol) })
-    end
-  end
-end