wavefront-sdk 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b39db1a4f6e5f1899b8ae8f5fef5c2d0364775de94860054101a352b71e6abf4
-  data.tar.gz: a28e17f8e36429c3a954de36baa05ede7ba6a2972d0d30dede00a490fb4a05af
+  metadata.gz: e89654234db4200e7ec25767b81eeda772092642cb238d9cf908e38e851a8755
+  data.tar.gz: 4de9bfd19d39da4b6e2d6b529614cc1962d8c5915ba92c82bfed736737fc7d28
 SHA512:
-  metadata.gz: b56fad2f699a16dff96774c857a04b4aad1ad559147bbd50d79b0316c24c0b217e2aa3fdbb5d17aced23b99b1498d820f889003f60cc5287c4389e2fd75d003b
-  data.tar.gz: 0b1bcbc888ebfe63fd96cbcd0c4d8569e22552ad416cdf4dc2bb216f76dc517300daf7954d345d24c253d57250ca5f8d9812545b2619f9199575f84a76b0525d
+  metadata.gz: 34cf2716c935b469ec385e84445b8f2dec33e29679b6bd3cbe5bd11fff459301535c2acaf06fcfc682854df418577a810b20f4a579d1208fd63542af97ea2dee
+  data.tar.gz: 1d5c66c6b47015f66a07cc64acdef74e8e661fbdda138746028d3885023e36cafb895950ac6d633c27012f5a13c2380f8827072dca2a59afef8a583a2b3a1453

data/HISTORY.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.7.0 (2020-01-23)
+* Add `Account`, `Usage` and `IngestionPolicy` classes.
+* Allow modification of `Wavefront::Response`'s `response` object.
+* Add `User#validate_users` method.
+
 ## 3.6.1 (2020-01-15)
 * Test build against, and fix warning messages on, Ruby 2.7.0
 

data/lib/wavefront-sdk/account.rb

@@ -0,0 +1,202 @@
+# frozen_string_literal: true
+
+require_relative 'core/api'
+require_relative 'api_mixins/user'
+
+module Wavefront
+  #
+  # Manage and query Wavefront accounts. '/account/serviceaccount' API paths
+  # are covered in the Wavefront::ServiceAccount class.
+  #
+  # Many of these methods are duplicated in the User class. This reflects the
+  # layout of the API.
+  #
+  class Account < CoreApi
+    include Wavefront::Mixin::User
+    #
+    # GET /api/v2/account
+    # Get all accounts (users and service accounts) of a customer
+    # @param offset [Int] account at which the list begins
+    # @param limit [Int] the number of accounts to return
+    # @return [Wavefront::Response]
+    #
+    def list(offset = 0, limit = 100)
+      api.get('', offset: offset, limit: limit)
+    end
+
+    # DELETE /api/v2/account/{id}
+    # Deletes an account (user or service account) identified by id
+    # @param id [String] ID of the account
+    # @return [Wavefront::Response]
+    #
+    def delete(id)
+      wf_account_id?(id)
+      api.delete(id)
+    end
+
+    # GET /api/v2/account/{id}
+    # Get a specific account (user or service account)
+    # @param id [String] ID of the proxy
+    # @return [Wavefront::Response]
+    #
+    def describe(id)
+      wf_account_id?(id)
+      api.get(id)
+    end
+
+    # POST /api/v2/account/{id}/addUserGroups
+    # Adds specific user groups to the account (user or service account)
+    # @param id [String] ID of the account
+    # @param group_list [Array[String]] list of groups to add
+    # @return [Wavefront::Response]
+    #
+    def add_user_groups(id, group_list)
+      wf_account_id?(id)
+      validate_usergroup_list(group_list)
+      api.post([id, 'addUserGroups'].uri_concat, group_list,
+               'application/json')
+    end
+
+    # GET /api/v2/account/{id}/businessFunctions
+    # Returns business functions of a specific account (user or service
+    # account).
+    # @param id [String] user ID
+    # @return [Wavefront::Response]
+    #
+    def business_functions(id)
+      wf_account_id?(id)
+      api.get([id, 'businessFunctions'].uri_concat)
+    end
+
+    # POST /api/v2/account/{id}/removeUserGroups
+    # Removes specific user groups from the account (user or service account)
+    # @param id [String] ID of the account
+    # @param group_list [Array[String]] list of groups to add
+    # @return [Wavefront::Response]
+    #
+    def remove_user_groups(id, group_list)
+      wf_account_id?(id)
+      validate_usergroup_list(group_list)
+      api.post([id, 'removeUserGroups'].uri_concat, group_list,
+               'application/json')
+    end
+
+    # POST /api/v2/account/{id}/grant/{permission}
+    # Grants a specific permission to account (user or service account)
+    # POST /api/v2/account/grant/{permission}
+    # Grants a specific permission to multiple accounts (users or service
+    # accounts)
+    # @param id_list [Array[String],String] single account ID or list of
+    #   account IDs
+    # @param permission [String] permission group to grant to user.
+    # @return [Wavefront::Response]
+    #
+    def grant(id, permission)
+      if id.is_a?(String)
+        grant_to_id(id, permission)
+      else
+        grant_to_multiple(id, permission)
+      end
+    end
+
+    # POST /api/v2/account/{id}/revoke/{permission}
+    # Revokes a specific permission from account (user or service account)
+    # POST /api/v2/account/revoke/{permission}
+    # Revokes a specific permission from multiple accounts (users or service
+    # accounts
+    # @param id [String,Array[String]] ID of the user, or list of user IDs
+    # @param permission [String] permission group to revoke from user.
+    # @return [Wavefront::Response]
+    #
+    def revoke(id, permission)
+      if id.is_a?(String)
+        revoke_from_id(id, permission)
+      else
+        revoke_from_multiple(id, permission)
+      end
+    end
+
+    # POST /api/v2/account/addingestionpolicy
+    # Add a specific ingestion policy to multiple accounts
+    # @param policy_id [String] ID of the ingestion policy
+    # @param id_list [Array[String]] list of accounts to be put in policy
+    # @return [Wavefront::Response]
+    #
+    def add_ingestion_policy(policy_id, id_list)
+      wf_ingestionpolicy_id?(policy_id)
+      validate_account_list(id_list)
+      api.post('addingestionpolicy',
+               { ingestionPolicyId: policy_id,
+                 accounts: id_list },
+               'application/json')
+    end
+
+    # POST /api/v2/account/removeingestionpolicies
+    # Removes ingestion policies from multiple accounts
+    # @param policy_id [String] ID of the ingestion policy
+    # @param id_list [Array[String]] list of accounts to be put in policy
+    # @return [Wavefront::Response]
+    #
+    def remove_ingestion_policy(policy_id, id_list)
+      wf_ingestionpolicy_id?(policy_id)
+      validate_account_list(id_list)
+      api.post('removeingestionpolicy',
+               { ingestionPolicyId: policy_id,
+                 accounts: id_list },
+               'application/json')
+    end
+
+    # POST /api/v2/account/deleteAccounts
+    # Deletes multiple accounts (users or service accounts)
+    # @param id [String] ID of the account
+    # @param group_list [Array[String]] list of accounts to delete
+    # @return [Wavefront::Response]
+    #
+    def delete_accounts(id_list)
+      validate_account_list(id_list)
+      api.post('deleteAccounts', id_list, 'application/json')
+    end
+
+    private
+
+    # @param id [String] ID of the user
+    # @param permission [String] permission group to grant to user.
+    # @return [Wavefront::Response]
+    #
+    def grant_to_id(id, permission)
+      wf_account_id?(id)
+      wf_permission?(permission)
+      api.post([id, 'grant', permission].uri_concat)
+    end
+
+    # @param id_list [Array[String]] list of account IDs
+    # @param permission [String] permission group to grant to user.
+    # @return [Wavefront::Response]
+    #
+    def grant_to_multiple(id_list, permission)
+      validate_account_list(id_list)
+      wf_permission?(permission)
+      api.post(['grant', permission].uri_concat, id_list, 'application/json')
+    end
+
+    # @param id [String] ID of the user
+    # @param permission [String] permission group to revoke from user.
+    # @return [Wavefront::Response]
+    #
+    def revoke_from_id(id, permission)
+      wf_account_id?(id)
+      wf_permission?(permission)
+      api.post([id, 'revoke', permission].uri_concat)
+    end
+
+    # @param id_list [Array[String]] list of account IDs
+    # @param permission [String] permission group to revoke from user.
+    # @return [Wavefront::Response]
+    #
+    def revoke_from_multiple(id_list, permission)
+      validate_account_list(id_list)
+      wf_permission?(permission)
+      api.post(['revoke', permission].uri_concat, id_list, 'application/json')
+    end
+  end
+end

data/lib/wavefront-sdk/api_mixins/user.rb

@@ -25,6 +25,16 @@ module Wavefront
 
         list.each { |id| wf_usergroup_id?(id) }
       end
+
+      # Validate a list of accounts.
+      # @param list [Array[String]] list of account IDs
+      # @raise Wavefront::Exception::InvalidAccount
+      #
+      def validate_account_list(list)
+        raise ArgumentError unless list.is_a?(Array)
+
+        list.each { |id| wf_account_id?(id) }
+      end
     end
   end
 end

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

@@ -8,6 +8,7 @@ module Wavefront
     class CredentialError < RuntimeError; end
     class EmptyMetricName < RuntimeError; end
     class EnumerableError < RuntimeError; end
+    class InvalidAccountId < RuntimeError; end
     class InvalidAlertId < RuntimeError; end
     class InvalidAlertSeverity < RuntimeError; end
     class InvalidApiTokenId < RuntimeError; end
@@ -23,6 +24,7 @@ module Wavefront
     class InvalidExternalLinkId < RuntimeError; end
     class InvalidGranularity < RuntimeError; end
     class InvalidHostname < RuntimeError; end
+    class InvalidIngestionPolicyId < RuntimeError; end
     class InvalidIntegrationId < RuntimeError; end
     class InvalidLinkTemplate < RuntimeError; end
     class InvalidMaintenanceWindowId < RuntimeError; end

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

@@ -25,7 +25,8 @@ module Wavefront
   #
   class Response
     include Wavefront::Mixins
-    attr_reader :status, :response, :opts, :logger
+    attr_reader :status, :opts, :logger
+    attr_accessor :response
 
     # Create and return a Wavefront::Response object
     # @param json [String] a raw response body from the Wavefront API

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

@@ -2,5 +2,5 @@
 
 require 'pathname'
 
-WF_SDK_VERSION = '3.6.1'
+WF_SDK_VERSION = '3.7.0'
 WF_SDK_LOCATION = Pathname.new(__dir__).parent.parent.parent

data/lib/wavefront-sdk/ingestionpolicy.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require_relative 'core/api'
+
+module Wavefront
+  #
+  # View and manage Wavefront ingestion policies.
+  #
+  # These use the Usage API path.
+  #
+  class IngestionPolicy < CoreApi
+    def api_base
+      '/usage/ingestionpolicy'
+    end
+
+    # GET /api/v2/usage/ingestionpolicy
+    # Get all ingestion policies for a customer
+    #
+    # @return [Wavefront::Response]
+    #
+    # @param offset [Int] ingestion policy at which the list begins
+    # @param limit [Int] the number of ingestion policies to return
+    # @return [Wavefront::Response]
+    #
+    def list(offset = 0, limit = 100)
+      api.get('', offset: offset, limit: limit)
+    end
+
+    # POST /api/v2/usage/ingestionpolicy
+    # Create a specific ingestion policy
+    #
+    # @param body [Hash] description of ingestion policy
+    # @return [Wavefront::Response]
+    #
+    def create(body)
+      raise ArgumentError unless body.is_a?(Hash)
+
+      api.post('', body, 'application/json')
+    end
+
+    # DELETE /api/v2/usage/ingestionpolicy/{id}
+    # Delete a specific ingestion policy
+    #
+    # @param id [String] ID of the alert
+    # @return [Wavefront::Response]
+    #
+    def delete(id)
+      wf_ingestionpolicy_id?(id)
+      api.delete(id)
+    end
+
+    # GET /api/v2/usage/ingestionpolicy/{id}
+    # Get a specific ingestion policy
+    #
+    # @return [Wavefront::Response]
+    # @param id [String] ID of the proxy
+    # @return [Wavefront::Response]
+    #
+    def describe(id)
+      wf_ingestionpolicy_id?(id)
+      api.get(id)
+    end
+
+    # PUT /api/v2/usage/ingestionpolicy/{id}
+    # Update a specific ingestion policy
+    #
+    # @param id [String] a Wavefront alert ID
+    # @param body [Hash] key-value hash of the parameters you wish
+    #   to change
+    # @param modify [true, false] if true, use {#describe()} to get
+    #   a hash describing the existing object, and modify that with
+    #   the new body. If false, pass the new body straight through.
+    # @return [Wavefront::Response]
+    #
+    def update(id, body, modify = true)
+      wf_ingestionpolicy_id?(id)
+      raise ArgumentError unless body.is_a?(Hash)
+
+      return api.put(id, body, 'application/json') unless modify
+
+      api.put(id, hash_for_update(describe(id).response, body),
+              'application/json')
+    end
+  end
+end

data/lib/wavefront-sdk/usage.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative 'core/api'
+
+module Wavefront
+  #
+  # View and manage Wavefront usage.
+  #
+  # Ingestion policy shares this API path, but has its own SDK class.
+  #
+  class Usage < CoreApi
+    # GET /api/v2/usage/exportcsv
+    # Export a CSV report
+    #
+    # @param t_start [Integer] start time in epoch seconds
+    # @param t_end [Integer] end time in epoch seconds, nil being "now".
+    # @return [Wavefront::Response]
+    #
+    def export_csv(t_start, t_end = nil)
+      wf_epoch?(t_start)
+      args = { startTime: t_start }
+
+      if t_end
+        wf_epoch?(t_end)
+        args[:endTime] = t_end
+      end
+
+      api.get('exportcsv', args)
+    end
+  end
+end

data/lib/wavefront-sdk/user.rb

@@ -212,6 +212,16 @@ module Wavefront
       api.get([id, 'businessFunctions'].uri_concat)
     end
 
+    # POST /api/v2/user/validateUsers
+    # Returns valid users and service accounts, also invalid identifiers from
+    # the given list
+    # @param id_list [Array[String]] list of user IDs
+    # @return [Wavefront::Response]
+    #
+    def validate_users(id_list)
+      api.post('validateUsers', id_list, 'application/json')
+    end
+
     # Fake a response which looks like we get from all the other
     # paths. I'm expecting the user response model to be made
     # consistent with others in the future.

data/lib/wavefront-sdk/validators.rb

@@ -568,6 +568,32 @@ module Wavefront
 
       raise Wavefront::Exception::InvalidPermission, id, id
     end
+
+    # Ensure the given argument is a valid ingestion policy ID
+    # @param id [String]
+    # @raise Wavefront::Exception::InvalidIngestionPolicyId if the
+    #   ID is not valid
+    #
+    def wf_ingestionpolicy_id?(id)
+      return true if id.is_a?(String) && id =~ /^[a-z0-9\-_]+-\d{13}$/
+
+      raise Wavefront::Exception::InvalidIngestionPolicyId, id
+    end
+
+    # Ensure the given argument is a valid User or SystemAccount ID.
+    # @param id [String]
+    # @raise Wavefront::Exception::InvalidAccountId if the
+    #   ID is not valid
+    #
+    def wf_account_id?(id)
+      return true if wf_user_id?(id)
+    rescue Wavefront::Exception::InvalidUserId
+      begin
+        return true if wf_serviceaccount_id?(id)
+      rescue Wavefront::Exception::InvalidServiceAccountId
+        raise Wavefront::Exception::InvalidAccountId, id
+      end
+    end
   end
   # rubocop:enable Metrics/ModuleLength
 end

data/spec/.rubocop.yml

@@ -5,7 +5,7 @@ Metrics/AbcSize:
 # Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 300
+  Max: 400
 
 # Offense count: 46
 # Configuration parameters: CountComments, ExcludedMethods.

data/spec/wavefront-sdk/account_spec.rb

@@ -0,0 +1,132 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../spec_helper'
+require_relative '../test_mixins/general'
+
+# Unit tests for Account class
+#
+class WavefrontAccountTest < WavefrontTestBase
+  include WavefrontTest::List
+  include WavefrontTest::Delete
+  include WavefrontTest::Describe
+
+  def test_add_user_groups
+    assert_posts("/api/v2/account/#{id}/addUserGroups", groups.to_json) do
+      wf.add_user_groups(id, groups)
+    end
+
+    assert_invalid_id { wf.add_user_groups(invalid_id, groups) }
+  end
+
+  def test_business_functions
+    assert_gets("/api/v2/account/#{id}/businessFunctions") do
+      wf.business_functions(id)
+    end
+
+    assert_raises(ArgumentError) { wf.business_functions }
+  end
+
+  def test_grant_to_single_user
+    assert_posts("/api/v2/account/#{id}/grant/#{permission}") do
+      wf.grant(id, permission)
+    end
+  end
+
+  def test_grant_to_multiple_users
+    assert_posts("/api/v2/account/grant/#{permission}", id_list.to_json) do
+      wf.grant(id_list, permission)
+    end
+  end
+
+  def test_remove_user_groups
+    assert_posts("/api/v2/account/#{id}/removeUserGroups", groups.to_json) do
+      wf.remove_user_groups(id, groups)
+    end
+
+    assert_invalid_id { wf.remove_user_groups(invalid_id, groups) }
+  end
+
+  def test_revoke_from_single_user
+    assert_posts("/api/v2/account/#{id}/revoke/#{permission}") do
+      wf.revoke(id, permission)
+    end
+  end
+
+  def test_revoke_from_multiple_users
+    assert_posts("/api/v2/account/revoke/#{permission}", id_list.to_json) do
+      wf.revoke(id_list, permission)
+    end
+  end
+
+  def test_delete_accounts
+    assert_posts('/api/v2/account/deleteAccounts', id_list.to_json) do
+      wf.delete_accounts(id_list)
+    end
+
+    assert_invalid_id { wf.delete_accounts([invalid_id]) }
+  end
+
+  def test_add_ingestion_policy
+    assert_posts('/api/v2/account/addingestionpolicy',
+                 { ingestionPolicyId: policy_id,
+                   accounts: id_list }.to_json) do
+      wf.add_ingestion_policy(policy_id, id_list)
+    end
+
+    assert_raises Wavefront::Exception::InvalidIngestionPolicyId do
+      wf.add_ingestion_policy(invalid_policy_id, id_list)
+    end
+
+    assert_invalid_id { wf.add_ingestion_policy(policy_id, [invalid_id]) }
+  end
+
+  def test_remove_ingestion_policy
+    assert_posts('/api/v2/account/removeingestionpolicy',
+                 { ingestionPolicyId: policy_id,
+                   accounts: id_list }.to_json) do
+      wf.remove_ingestion_policy(policy_id, id_list)
+    end
+
+    assert_raises Wavefront::Exception::InvalidIngestionPolicyId do
+      wf.add_ingestion_policy(invalid_policy_id, id_list)
+    end
+
+    assert_invalid_id { wf.add_ingestion_policy(policy_id, [invalid_id]) }
+  end
+
+  private
+
+  def api_class
+    'account'
+  end
+
+  def id
+    'sa::tester'
+  end
+
+  def invalid_id
+    'bad_id' * 1000
+  end
+
+  def groups
+    %w[f8dc0c14-91a0-4ca9-8a2a-7d47f4db4672
+       2659191e-aad4-4302-a94e-9667e1517127]
+  end
+
+  def id_list
+    %w[sa:test user@example.com]
+  end
+
+  def permission
+    'agent_management'
+  end
+
+  def policy_id
+    'testpolicy-1579537565010'
+  end
+
+  def invalid_policy_id
+    'badpolicy'
+  end
+end

data/spec/wavefront-sdk/ingestionpolicy_spec.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../spec_helper'
+require_relative '../test_mixins/general'
+
+# Unit tests for IngestionPolicy class
+#
+class WavefrontIngestionPolicyTest < WavefrontTestBase
+  include WavefrontTest::List
+  include WavefrontTest::Describe
+  include WavefrontTest::Update
+  include WavefrontTest::Delete
+
+  private
+
+  def payload
+    { sampledUserAccounts: ['string'],
+      userAccountCount: 0,
+      sampledServiceAccounts: [
+        'string'
+      ],
+      serviceAccountCount: 0,
+      name: 'string',
+      id: 'string',
+      description: 'string',
+      customer: 'string',
+      lastUpdatedMs: 0,
+      lastUpdatedAccountId: 'string' }
+  end
+
+  def api_class
+    'usage/ingestionpolicy'
+  end
+
+  def id
+    'test-ingestion-policy-1579538401492'
+  end
+
+  def invalid_id
+    'bad_id'
+  end
+end

data/spec/wavefront-sdk/usage_spec.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../spec_helper'
+require_relative '../test_mixins/general'
+
+# Unit tests for Usage class
+#
+class WavefrontUsageTest < WavefrontTestBase
+  def test_export_csv
+    assert_raises(ArgumentError) { wf.export_csv }
+
+    assert_gets("/api/v2/usage/exportcsv?startTime=#{t_start}") do
+      wf.export_csv(t_start)
+    end
+
+    assert_gets(
+      "/api/v2/usage/exportcsv?startTime=#{t_start}&endTime=#{t_end}"
+    ) do
+      wf.export_csv(t_start, t_end)
+    end
+  end
+
+  private
+
+  def t_start
+    1_577_890_000
+  end
+
+  def t_end
+    1_577_899_999
+  end
+end

data/spec/wavefront-sdk/user_spec.rb

@@ -110,6 +110,14 @@ class WavefrontUserTest < WavefrontTestBase
     assert_raises(ArgumentError) { wf.business_functions }
   end
 
+  def test_validate_users
+    assert_posts('/api/v2/user/validateUsers', id_list.to_json) do
+      wf.validate_users(id_list)
+    end
+
+    assert_raises(ArgumentError) { wf.validate_users }
+  end
+
   def test_response_shim
     (RESOURCE_DIR + 'user_responses').each_child do |input|
       # Ugly hack for the 202 in the 'create' file
@@ -156,4 +164,8 @@ class WavefrontUserTest < WavefrontTestBase
   def payload
     { emailAddress: id, groups: %w[browse] }
   end
+
+  def id_list
+    %w[id1 id2 id3]
+  end
 end

data/spec/wavefront-sdk/validators_spec.rb

@@ -323,19 +323,19 @@ class WavefrontValidatorsTest < MiniTest::Test
     end
   end
 
-  def test_notificant_id
+  def test_wf_notificant_id
     good = %w[CHTo47HvsPzSaGhh]
     bad = ['CTo47HvsPzSaGhh', [], {}, nil, 'bad id']
     good_and_bad('wf_notificant_id?', 'InvalidNotificantId', good, bad)
   end
 
-  def test_integration_id
+  def test_wf_integration_id
     good = %w[aws tutorial elasticsearch cassandra go]
     bad = ['CTo47HvsPzSaGhh', [], {}, nil, 'bad id']
     good_and_bad('wf_integration_id?', 'InvalidIntegrationId', good, bad)
   end
 
-  def test_apitoken_id
+  def test_wf_apitoken_id
     good = %w[2bfdcac7-1c9c-4c4b-9b56-c41c22c586dc
               17db4cc1-65f6-40a8-a1fa-6fcae460c4bd
               fca312fb-5ff4-420d-862d-5d6d99ed6bcf
@@ -345,24 +345,45 @@ class WavefrontValidatorsTest < MiniTest::Test
     good_and_bad('wf_apitoken_id?', 'InvalidApiTokenId', good, bad)
   end
 
-  def test_distribution_interval
+  def test_wf_distribution_interval
     good = %i[m h d]
     bad = ['m', [], {}, nil, 'bad id', :x, 'p']
     good_and_bad('wf_distribution_interval?',
                  'InvalidDistributionInterval', good, bad)
   end
 
-  def test_serviceaccount_id
+  def test_wf_serviceaccount_id
     good = %w[sa::my-id sa::ID]
     bad = %w[sc:id fca312fb-5ff4-420d-862d-5d6d99ed6bcf]
     good_and_bad('wf_serviceaccount_id?',
                  'InvalidServiceAccountId', good, bad)
   end
 
-  def test_permission
+  def test_wf_permission
     good = %w[events_management external_links_management]
     bad = ['events management', 'event_management', 'EVENT_MANAGEMENT']
     good_and_bad('wf_permission?',
                  'InvalidPermission', good, bad)
   end
+
+  def test_wf_ingestionpolicy_id
+    good = %w[another-ingestion-policy-1579538401492
+              testpolicy-1579537565010
+              213452-34-_-0-4-ingestion-policy-1579538556267
+              yet_another-ingestion-policy-1579538414190]
+
+    bad = %w[fa312fb-5ff4-420d-862d-5d6d99ed6bcf thing 123]
+    good_and_bad('wf_ingestionpolicy_id?',
+                 'InvalidIngestionPolicyId',
+                 good,
+                 bad)
+  end
+
+  def test_wf_account_id
+    good = %w[sa::my-id sa::ID Some.User@example.com
+              general99+specific@somewhere.net someone@somewhere.com a user
+              user-name]
+    bad = ['', [], {}, 'a' * 1000]
+    good_and_bad('wf_account_id?', 'InvalidAccountId', good, bad)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-sdk
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -179,6 +179,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/wavefront-sdk/account.rb
 - lib/wavefront-sdk/alert.rb
 - lib/wavefront-sdk/api_mixins/acl.rb
 - lib/wavefront-sdk/api_mixins/tag.rb
@@ -198,6 +199,7 @@ files:
 - lib/wavefront-sdk/distribution.rb
 - lib/wavefront-sdk/event.rb
 - lib/wavefront-sdk/externallink.rb
+- lib/wavefront-sdk/ingestionpolicy.rb
 - lib/wavefront-sdk/integration.rb
 - lib/wavefront-sdk/maintenancewindow.rb
 - lib/wavefront-sdk/message.rb
@@ -223,6 +225,7 @@ files:
 - lib/wavefront-sdk/support/mixins.rb
 - lib/wavefront-sdk/support/parse_time.rb
 - lib/wavefront-sdk/types/status.rb
+- lib/wavefront-sdk/usage.rb
 - lib/wavefront-sdk/user.rb
 - lib/wavefront-sdk/usergroup.rb
 - lib/wavefront-sdk/validators.rb
@@ -246,6 +249,7 @@ files:
 - 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
 - spec/wavefront-sdk/apitoken_spec.rb
@@ -260,6 +264,7 @@ files:
 - spec/wavefront-sdk/distribution_spec.rb
 - spec/wavefront-sdk/event_spec.rb
 - spec/wavefront-sdk/externallink_spec.rb
+- spec/wavefront-sdk/ingestionpolicy_spec.rb
 - spec/wavefront-sdk/integration_spec.rb
 - spec/wavefront-sdk/maintenancewindow_spec.rb
 - spec/wavefront-sdk/message_spec.rb
@@ -291,6 +296,7 @@ files:
 - spec/wavefront-sdk/stdlib/string_spec.rb
 - spec/wavefront-sdk/support/mixins_spec.rb
 - spec/wavefront-sdk/support/parse_time_spec.rb
+- spec/wavefront-sdk/usage_spec.rb
 - spec/wavefront-sdk/user_spec.rb
 - spec/wavefront-sdk/usergroup_spec.rb
 - spec/wavefront-sdk/validators_spec.rb
@@ -338,6 +344,7 @@ test_files:
 - 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
 - spec/wavefront-sdk/apitoken_spec.rb
@@ -352,6 +359,7 @@ test_files:
 - spec/wavefront-sdk/distribution_spec.rb
 - spec/wavefront-sdk/event_spec.rb
 - spec/wavefront-sdk/externallink_spec.rb
+- spec/wavefront-sdk/ingestionpolicy_spec.rb
 - spec/wavefront-sdk/integration_spec.rb
 - spec/wavefront-sdk/maintenancewindow_spec.rb
 - spec/wavefront-sdk/message_spec.rb
@@ -383,6 +391,7 @@ test_files:
 - spec/wavefront-sdk/stdlib/string_spec.rb
 - spec/wavefront-sdk/support/mixins_spec.rb
 - spec/wavefront-sdk/support/parse_time_spec.rb
+- spec/wavefront-sdk/usage_spec.rb
 - spec/wavefront-sdk/user_spec.rb
 - spec/wavefront-sdk/usergroup_spec.rb
 - spec/wavefront-sdk/validators_spec.rb