wavefront-sdk 3.7.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89654234db4200e7ec25767b81eeda772092642cb238d9cf908e38e851a8755
-  data.tar.gz: 4de9bfd19d39da4b6e2d6b529614cc1962d8c5915ba92c82bfed736737fc7d28
+  metadata.gz: 6fa47f9b8dc9c71f547e50131d53cfcdf5ae0142cd75f14558afd5303576a4cc
+  data.tar.gz: '08bea64a048f8e22e02c4b8b12fa6e413a9e26bbb1e5c55e26201ac873424812'
 SHA512:
-  metadata.gz: 34cf2716c935b469ec385e84445b8f2dec33e29679b6bd3cbe5bd11fff459301535c2acaf06fcfc682854df418577a810b20f4a579d1208fd63542af97ea2dee
-  data.tar.gz: 1d5c66c6b47015f66a07cc64acdef74e8e661fbdda138746028d3885023e36cafb895950ac6d633c27012f5a13c2380f8827072dca2a59afef8a583a2b3a1453
+  metadata.gz: ea55156acfeaadce57ff846aa723c936c77f061730ef7f1e91b2b2919c51dfa2cc1b0652d1485905772397da24452332e34b15ea4bae713dd4abc8aa83477dc7
+  data.tar.gz: 953bbc44ca84d32194a231d9037ce8e47917a1895c148e1e0661c7125f24c6bba53e29d9a625b8b6d2744669b49cab99837429c0f22129fad4e6697fafb17988

data/.rubocop.yml

@@ -1,7 +1,48 @@
 ---
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 
 Metrics/ClassLength:
-  Max: 124
+  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

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.8
   - 2.4.9
   - 2.5.7
   - 2.6.5

data/HISTORY.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 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.
+
+## 5.0.0 (2020-07-08)
+* Remove `Wavefront::UserGroup#grant` and `Wavefront::UserGroup#revoke` as [the
+ API paths they used have been
+ removed](https://docs.wavefront.com/2020.06.x_release_notes.html#obsolete-and-deprecated-apis).
+ (Breaking change.)
+* Remove `Wavefront::MonitoredCluster` class, as it has been removed from the
+  public API.
+* Deprecate `Wavefront::User` class, as [the user API is now
+  deprecated](https://docs.wavefront.com/2020.06.x_release_notes.html#obsolete-and-deprecated-apis)
+* Add `Wavefront::Role` class, for managing roles.
+* Promote `Wavefront::Spy` class from unstable. It is now an official API.
+
+## 4.0.0 (2020-02-17)
+* Drop support for Ruby 2.3. (Breaking change.)
+* Add `Wavefront::MonitoredCluster` class.
+* Add `Wavefront::Unstable::Spy` class to speak to (undocumented) spy
+  interface.
+* Add `Wavefront::Unstable::Chart` class to speak to (undocumented) chart
+  interface.
+
+## 3.7.1 (2020-02-09)
+* `Response` object returned by `Wavefront::Write#write` includes a valid HTTP
+  code, rather than `nil`.
+
 ## 3.7.0 (2020-01-23)
 * Add `Account`, `Usage` and `IngestionPolicy` classes.
 * Allow modification of `Wavefront::Response`'s `response` object.

data/README.md

@@ -24,7 +24,7 @@ or to build locally,
 $ gem build wavefront-sdk.gemspec
 ```
 
-`wavefront-sdk` requires Ruby >= 2.3. All its dependencies are pure
+`wavefront-sdk` requires Ruby >= 2.4. All its dependencies are pure
 Ruby, right the way down, so a compiler should never be required to
 install it.
 
@@ -100,10 +100,11 @@ when you ask for a list of objects.
 
 You can set an offset and a limit when you list, but setting the
 limit to the magic value `:all` will return all items, without you
-having to deal with pagination.
+having to deal with pagination. When you do that, `offset` is repurposed as
+the number of results fetched with each call to the API.
 
 Calling a method with the limit set to `:lazy` returns a lazy
-enumerable.
+enumerable. Again, `offset` is the chunk size.
 
 ```ruby
 wf = Wavefront::Alert.new(creds.all)

data/lib/wavefront-sdk/account.rb

@@ -44,6 +44,18 @@ module Wavefront
       api.get(id)
     end
 
+    # POST /api/v2/account/{id}/addRoles
+    # Add specific roles to the account (user or service account)
+    # @param id [String] ID of the account
+    # @param role_list [Array[String]] list of roles to add
+    # @return [Wavefront::Response]
+    #
+    def add_roles(id, role_list)
+      wf_account_id?(id)
+      validate_role_list(role_list)
+      api.post([id, 'addRoles'].uri_concat, role_list, 'application/json')
+    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
@@ -68,10 +80,22 @@ module Wavefront
       api.get([id, 'businessFunctions'].uri_concat)
     end
 
+    # POST /api/v2/account/{id}/removeRoles
+    # Removes specific roles from the account (user or service account)
+    # @param id [String] ID of the account
+    # @param role_list [Array[String]] list of roles to remove
+    # @return [Wavefront::Response]
+    #
+    def remove_roles(id, role_list)
+      wf_account_id?(id)
+      validate_role_list(role_list)
+      api.post([id, 'removeRoles'].uri_concat, role_list, 'application/json')
+    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
+    # @param group_list [Array[String]] list of groups to remove
     # @return [Wavefront::Response]
     #
     def remove_user_groups(id, group_list)
@@ -132,7 +156,8 @@ module Wavefront
     end
 
     # POST /api/v2/account/removeingestionpolicies
-    # Removes ingestion policies from multiple accounts
+    # Removes ingestion policies from multiple accounts. The API path says
+    # "policies" but I've made the method name "policy" for consistency.
     # @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]
@@ -140,7 +165,7 @@ module Wavefront
     def remove_ingestion_policy(policy_id, id_list)
       wf_ingestionpolicy_id?(policy_id)
       validate_account_list(id_list)
-      api.post('removeingestionpolicy',
+      api.post('removeingestionpolicies',
                { ingestionPolicyId: policy_id,
                  accounts: id_list },
                'application/json')
@@ -157,6 +182,78 @@ module Wavefront
       api.post('deleteAccounts', id_list, 'application/json')
     end
 
+    # GET /api/v2/account/user
+    # Get all user accounts
+    # @param offset [Int] user account at which the list begins
+    # @param limit [Int] the number of user accounts to return
+    # @return [Wavefront::Response]
+    #
+    def user_list(offset = 0, limit = 100)
+      api.get('user', offset: offset, limit: limit)
+    end
+
+    def user_create(body, send_email = false)
+      raise ArgumentError unless body.is_a?(Hash)
+
+      uri = send_email ? "?sendEmail=#{send_email}" : 'user'
+
+      api.post(uri, body, 'application/json')
+    end
+
+    # POST /api/v2/account/user
+    # Creates or updates a user account
+    # @param id [String] a Wavefront user 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 user_update(body, modify = true)
+      raise ArgumentError unless body.is_a?(Hash)
+
+      return api.post('user', body, 'application/json') unless modify
+
+      api.post('user',
+               hash_for_update(describe(id).response, body),
+               'application/json')
+    end
+
+    # GET /api/v2/account/user/{id}
+    # Retrieves a user by identifier (email address)
+    # @param id [String] ID of the proxy
+    # @return [Wavefront::Response]
+    #
+    def user_describe(id)
+      wf_user_id?(id)
+      api.get(['user', id].uri_concat)
+    end
+
+    # POST /api/v2/account/user/invite
+    # Invite user accounts with given user groups and permissions.
+    # @param body [Array[Hash]] array of hashes, each hash describing a user.
+    #   See API docs for more details. It is your responsibility to validate
+    #   the data which describes each user.
+    # @return [Wavefront::Response]
+    #
+    def user_invite(body)
+      raise ArgumentError unless body.is_a?(Array)
+      raise ArgumentError unless body.first.is_a?(Hash)
+
+      api.post('user/invite', body, 'application/json')
+    end
+
+    # POST /api/v2/account/validateAccounts
+    # Returns valid accounts (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_accounts(id_list)
+      raise ArgumentError unless id_list.is_a?(Array)
+
+      api.post('validateAccounts', id_list, 'application/json')
+    end
+
     private
 
     # @param id [String] ID of the user
@@ -198,5 +295,9 @@ module Wavefront
       wf_permission?(permission)
       api.post(['revoke', permission].uri_concat, id_list, 'application/json')
     end
+
+    def update_keys
+      %i[identifier groups userGroups roles ingestionPolicyId]
+    end
   end
 end

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

@@ -35,6 +35,16 @@ module Wavefront
 
         list.each { |id| wf_account_id?(id) }
       end
+
+      # Validate a list of roles
+      # @param list [Array[String]] list of role IDs
+      # @raise Wavefront::Exception::InvalidRole
+      #
+      def validate_role_list(list)
+        raise ArgumentError unless list.is_a?(Array)
+
+        list.each { |id| wf_role_id?(id) }
+      end
     end
   end
 end

data/lib/wavefront-sdk/cloudintegration.rb

@@ -101,5 +101,32 @@ 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
   end
 end

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

@@ -6,6 +6,7 @@ require 'addressable'
 require_relative 'response'
 require_relative '../defs/version'
 require_relative '../support/mixins'
+require_relative '../stdlib/time'
 
 module Wavefront
   #
@@ -78,14 +79,47 @@ module Wavefront
     # was cleaner to add this method. Parameters are same as #get.
     #
     def get_flat_params(path, query = {})
-      conn = mk_conn(path,
-                     {},
-                     request: {
-                       params_encoder: Faraday::FlatParamsEncoder
-                     },
-                     params: query)
+      make_call(flat_param_conn(path, query), :get)
+    end
+
+    # This is used by the Wavefront::Unstable::Spy methods to stream data.
+    # It prints to standard out.
+    # @param path [String] path to be appended to the net[:api_base] path.
+    # @param query [Hash] optional key-value pairs with will be made into a
+    #   query string
+    # @param opts [Hash] keys:
+    #   timestamp_chunks -- prints a timestamp before each chunk of streamed
+    #     data
+    #   timeout -- after approximately this many seconds, return. It will be
+    #     the first chunk *after* the given time
+    # @return
+    #
+    def get_stream(path, query = {}, opts = {})
+      conn = flat_param_conn(path, query)
+      verbosity(conn, :get, query)
+      stream_connection(conn, query, opts)
+    rescue Faraday::TimeoutError
+      raise Wavefront::Exception::NetworkTimeout
+    rescue StopIteration
+      nil
+    end
+
+    def stream_connection(conn, query, opts)
+      t_end = end_time(opts)
+
+      conn.get do |req|
+        req.params = query
+        req.options.on_data = proc do |chunk, _size|
+          raise StopIteration if t_end && Time.right_now >= t_end
 
-      make_call(conn, :get)
+          puts Time.now if opts[:timestamp_chunks]
+          puts chunk
+        end
+      end
+    end
+
+    def end_time(opts)
+      Time.right_now + opts[:timeout] if opts[:timeout]&.positive?
     end
 
     # Make a POST call to the Wavefront API and return the result as
@@ -240,5 +274,14 @@ module Wavefront
         end
       end
     end
+
+    def flat_param_conn(path, query)
+      mk_conn(path,
+              {},
+              request: {
+                params_encoder: Faraday::FlatParamsEncoder
+              },
+              params: query)
+    end
   end
 end

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
@@ -28,6 +29,7 @@ module Wavefront
     class InvalidIntegrationId < RuntimeError; end
     class InvalidLinkTemplate < RuntimeError; end
     class InvalidMaintenanceWindowId < RuntimeError; end
+    class InvalidMonitoredClusterId < RuntimeError; end
     class InvalidMessageId < RuntimeError; end
     class InvalidMetricName < RuntimeError; end
     class InvalidMetricValue < RuntimeError; end
@@ -37,7 +39,9 @@ module Wavefront
     class InvalidPoint < RuntimeError; end
     class InvalidPrefixLength < RuntimeError; end
     class InvalidProxyId < RuntimeError; end
+    class InvalidRoleId < RuntimeError; end
     class InvalidRelativeTime < RuntimeError; end
+    class InvalidSamplingValue < RuntimeError; end
     class InvalidSavedSearchEntity < RuntimeError; end
     class InvalidSavedSearchId < RuntimeError; end
     class InvalidServiceAccountId < RuntimeError; end
@@ -51,6 +55,7 @@ module Wavefront
     class InvalidUserGroupId < RuntimeError; end
     class InvalidVersion < RuntimeError; end
     class InvalidWebhookId < RuntimeError; end
+    class NetworkTimeout < RuntimeError; end
     class NotImplemented < RuntimeError; end
     class SocketError < RuntimeError; end
     class UnparseableResponse < RuntimeError; end

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

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