wavefront-cli 6.0.0 → 8.0.1

data/lib/wavefront-cli/display/base.rb

@@ -112,7 +112,7 @@ module WavefrontDisplay
     # long listing objects. Subclasses may define their own.
     #
     def priority_keys
-      %i[id name]
+      %i[id name identifier]
     end
 
     def prioritize_keys(data, keys)

data/lib/wavefront-cli/display/cloudintegration.rb

@@ -8,11 +8,12 @@ module WavefrontDisplay
   #
   class CloudIntegration < Base
     def do_list_brief
-      multicolumn(:id, :service)
+      multicolumn(:id, :service, :name)
     end
 
     def do_describe
-      readable_time(:lastReceivedDataPointMs, :lastProcessingTimestamp)
+      readable_time(:lastReceivedDataPointMs, :lastProcessingTimestamp,
+                    :createdEpochMillis, :updatedEpochMillis)
       drop_fields(:forceSave, :inTrash, :deleted)
       long_output
     end
@@ -24,5 +25,17 @@ module WavefrontDisplay
     def do_disable
       puts "Disabled '#{options[:'<id>']}'."
     end
+
+    def do_awsid_generate
+      puts data
+    end
+
+    def do_awsid_delete
+      puts "Deleted external ID '#{options[:'<external_id>']}'."
+    end
+
+    def do_awsid_confirm
+      puts "'#{data}' is a registered external ID."
+    end
   end
 end

data/lib/wavefront-cli/display/printer/long.rb

@@ -8,6 +8,7 @@ module WavefrontDisplayPrinter
   #
   class Long
     attr_reader :opts, :list, :kw
+
     #
     # @param data [Hash] of data to display
     # @param fields [Array[Symbol]] requred fields
@@ -55,7 +56,7 @@ module WavefrontDisplayPrinter
     def preened_value(value)
       return value unless value.is_a?(String) && value =~ /<.*>/
 
-      value.gsub(%r{<\/?[^>]*>}, '').delete("\n")
+      value.gsub(%r{</?[^>]*>}, '').delete("\n")
     end
 
     # A recursive function which takes a structure, most likely a
@@ -74,6 +75,7 @@ module WavefrontDisplayPrinter
     #
     # Make an array of hashes: { key, value, depth }
     #
+    # rubocop:disable Style/CaseLikeIf
     def make_list(data, aggr = [], depth = 0, last_key = nil)
       if data.is_a?(Hash)
         append_hash(data, aggr, depth)
@@ -83,6 +85,7 @@ module WavefrontDisplayPrinter
         aggr.<< ['', preened_value(data), depth]
       end
     end
+    # rubocop:enable Style/CaseLikeIf
 
     def smart_value(val)
       val.to_s.empty? && opts[:none] ? '<none>' : preened_value(val)
@@ -149,6 +152,7 @@ module WavefrontDisplayPrinter
     # @param depth [Integer]
     # @return [Array[Array]]
     #
+    # rubocop:disable Style/CaseLikeIf
     def append_hash(data, aggr, depth)
       data.each_pair do |k, v|
         if v.is_a?(Hash)
@@ -162,6 +166,7 @@ module WavefrontDisplayPrinter
 
       aggr
     end
+    # rubocop:enable Style/CaseLikeIf
 
     # Part of the #make_list recursion. Deals with arrays.
     #

data/lib/wavefront-cli/display/proxy.rb

@@ -7,6 +7,16 @@ module WavefrontDisplay
   # Format human-readable output for proxies.
   #
   class Proxy < Base
+    def do_list
+      filter_inactive_proxies! if options[:active]
+      super
+    end
+
+    def do_list_brief
+      filter_inactive_proxies! if options[:active]
+      super
+    end
+
     def do_describe
       readable_time(:lastCheckInTime)
       long_output
@@ -15,5 +25,11 @@ module WavefrontDisplay
     def do_versions
       multicolumn(:id, :version, :name)
     end
+
+    private
+
+    def filter_inactive_proxies!
+      data.delete_if { |p| p[:status] != 'ACTIVE' }
+    end
   end
 end

data/lib/wavefront-cli/display/role.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module WavefrontDisplay
+  #
+  # Format human-readable output for role command
+  #
+  class Role < Base
+    def do_list_brief
+      data.map! do |d|
+        d.merge(acct_count: "#{d[:linkedAccountsCount]} accounts",
+                group_count: "#{d[:linkedGroupsCount]} groups")
+      end
+      multicolumn(:id, :name, :acct_count, :group_count)
+    end
+
+    def do_accounts
+      if data.empty?
+        puts "No accounts have role '#{options[:'<id>']}'."
+      else
+        multicolumn(:identifier)
+      end
+    end
+
+    def do_groups
+      if data.empty?
+        puts "No groups have role '#{options[:'<id>']}'."
+      else
+        multicolumn(:id, :name)
+      end
+    end
+
+    def do_permissions
+      if data[:permissions].empty?
+        puts "Role '#{options[:'<id>']}' has no permissions."
+      else
+        puts data[:permissions]
+      end
+    end
+
+    def do_grant
+      puts format("Granted '%<perm>s' permission to '%<id>s'.",
+                  perm: options[:'<permission>'],
+                  id: options[:'<id>'])
+    end
+
+    def do_revoke
+      puts format("Revoked '%<perm>s' permission from '%<id>s'.",
+                  perm: options[:'<permission>'],
+                  id: options[:'<id>'])
+    end
+
+    def do_give_to
+      puts format("Gave '%<role>s' to %<members>s.",
+                  members: quoted(options[:'<member>']),
+                  role: options[:'<id>']).fold(TW, 0)
+    end
+
+    def do_take_from
+      puts format("Took '%<role>s' from %<members>s.",
+                  members: quoted(options[:'<member>']),
+                  role: options[:'<id>']).fold(TW, 0)
+    end
+  end
+end

data/lib/wavefront-cli/display/settings.rb

@@ -8,6 +8,7 @@ module WavefrontDisplay
   #
   class Settings < Base
     def do_list_permissions
+      data.sort_by! { |p| p[:groupName] }
       options[:long] ? long_output : multicolumn(:groupName)
     end
 

data/lib/wavefront-cli/display/usergroup.rb

@@ -15,28 +15,28 @@ module WavefrontDisplay
       puts "Deleted user group '#{options[:'<id>']}'."
     end
 
-    def do_add_user
+    def do_add_to
       puts format("Added %<quoted_user>s to '%<group_id>s'.",
                   quoted_user: quoted(options[:'<user>']),
                   group_id: options[:'<id>']).fold(TW, 0)
     end
 
-    def do_remove_user
+    def do_remove_from
       puts format("Removed %<quoted_user>s from '%<group_id>s'.",
                   quoted_user: quoted(options[:'<user>']),
                   group_id: options[:'<id>']).fold(TW, 0)
     end
 
-    def do_grant
-      puts format("Granted '%<perm>s' permission to '%<group_id>s'.",
-                  perm: options[:'<permission>'],
-                  group_id: options[:'<id>'])
+    def do_add_role
+      puts format("Added %<quoted_role>s to '%<group_id>s'.",
+                  quoted_role: quoted(options[:'<role>']),
+                  group_id: options[:'<id>']).fold(TW, 0)
     end
 
-    def do_revoke
-      puts format("Revoked '%<perm>s' permission from '%<group_id>s'.",
-                  perm: options[:'<permission>'],
-                  group_id: options[:'<id>'])
+    def do_remove_role
+      puts format("Removed %<quoted_role>s from '%<group_id>s'.",
+                  quoted_role: quoted(options[:'<role>']),
+                  group_id: options[:'<id>']).fold(TW, 0)
     end
 
     def do_users
@@ -47,12 +47,16 @@ module WavefrontDisplay
            end)
     end
 
-    def do_permissions
-      puts(if !data.include?(:permissions) || data[:permissions].empty?
-             "Group '#{options[:'<id>']}' has no permissions."
+    def do_roles
+      puts(if !data.include?(:roles) || data[:roles].empty?
+             "Group '#{options[:'<id>']}' has no roles attached."
            else
-             data[:permissions]
+             data[:roles].map { |r| r[:id] }
            end)
     end
+
+    def do_permissions
+      puts data[:roles].map { |r| r[:permissions] }.flatten.sort.uniq
+    end
   end
 end

data/lib/wavefront-cli/event.rb

@@ -97,6 +97,7 @@ module WavefrontCli
     # return [Hash] body for #create() method
     #
     # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def create_body(opts, t_start)
       { name: opts[:'<event>'],
         startTime: t_start,
@@ -111,6 +112,7 @@ module WavefrontCli
           end
         end
     end
+    # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
 
     def annotations(opts)

data/lib/wavefront-cli/exception_handler.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module WavefrontCli
+  #
+  # Handle fatal errors.
+  #
+  module ExceptionMixins
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def exception_handler(exception)
+      case exception
+      when WavefrontCli::Exception::UnhandledCommand
+        abort 'Fatal error. Unsupported command. Please open a Github issue.'
+      when WavefrontCli::Exception::InvalidInput
+        abort "Invalid input. #{exception.message}"
+      when Interrupt
+        abort "\nOperation aborted at user request."
+      when WavefrontCli::Exception::ConfigFileNotFound
+        abort "Configuration file #{exception}' not found."
+      when WavefrontCli::Exception::CredentialError
+        handle_missing_credentials(exception)
+      when WavefrontCli::Exception::MandatoryValue
+        abort 'A value must be supplied.'
+      when Wavefront::Exception::NetworkTimeout
+        abort 'Connection timed out.'
+      when Wavefront::Exception::InvalidPermission
+        abort "'#{exception}' is not a valid Wavefront permission."
+      when Wavefront::Exception::InvalidUserGroupId
+        abort "'#{exception}' is not a valid user group ID."
+      when Wavefront::Exception::InvalidAccountId
+        abort "'#{exception}' is not a valid system or user account ID."
+      when Wavefront::Exception::InvalidAwsExternalId
+        abort "'#{exception}' is not a valid AWS external ID."
+      when Wavefront::Exception::InvalidRoleId
+        abort "'#{exception}' is not a valid role ID."
+      when Wavefront::Exception::InvalidApiTokenId
+        abort "'#{exception}' is not a valid API token ID."
+      when Wavefront::Exception::InvalidIngestionPolicyId
+        abort "'#{exception}' is not a valid ingestion policy ID."
+      when WavefrontCli::Exception::InvalidValue
+        abort "Invalid value for #{exception}."
+      when WavefrontCli::Exception::ProfileExists
+        abort "Profile '#{exception}' already exists."
+      when WavefrontCli::Exception::ProfileNotFound
+        abort "Profile '#{exception}' not found."
+      when WavefrontCli::Exception::FileNotFound
+        abort 'File not found.'
+      when WavefrontCli::Exception::InsufficientData
+        abort "Insufficient data. #{exception.message}"
+      when WavefrontCli::Exception::InvalidQuery
+        abort "Invalid query. API message: '#{exception.message}'."
+      when WavefrontCli::Exception::SystemError
+        abort "Host system error. #{exception.message}"
+      when WavefrontCli::Exception::UnparseableInput
+        abort "Cannot parse input. #{exception.message}"
+      when WavefrontCli::Exception::UnparseableSearchPattern
+        abort 'Searches require a key, a value, and a match operator.'
+      when WavefrontCli::Exception::UnsupportedFileFormat
+        abort 'Unsupported file format.'
+      when WavefrontCli::Exception::UnsupportedOperation
+        abort "Unsupported operation.\n#{exception.message}"
+      when WavefrontCli::Exception::UnsupportedOutput
+        abort exception.message
+      when WavefrontCli::Exception::UnsupportedNoop
+        abort 'Multiple API call operations cannot be performed as no-ops.'
+      when WavefrontCli::Exception::UserGroupNotFound
+        abort "Cannot find user group '#{exception.message}'."
+      when Wavefront::Exception::UnsupportedWriter
+        abort "Unsupported writer '#{exception.message}'."
+      when WavefrontCli::Exception::UserError
+        abort "User error: #{exception.message}."
+      when WavefrontCli::Exception::ImpossibleSearch
+        abort 'Search on non-existent key. Please use a top-level field.'
+      when Wavefront::Exception::InvalidSamplingValue
+        abort 'Sampling rates must be between 0 and 0.05.'
+      else
+        warn "general error: #{exception}"
+        backtrace_message(exception)
+        abort
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity
+  end
+end

data/lib/wavefront-cli/externallink.rb

@@ -38,12 +38,10 @@ module WavefrontCli
 
     def point_filter_regexes
       ret = options[:pointregex].each_with_object({}) do |r, a|
-        begin
-          k, v = r.split('=', 2)
-          a[k.to_sym] = v
-        rescue StandardError
-          puts "cannot parse point regex '#{r}'. Skipping."
-        end
+        k, v = r.split('=', 2)
+        a[k.to_sym] = v
+      rescue StandardError
+        puts "cannot parse point regex '#{r}'. Skipping."
       end
 
       ret.empty? ? nil : ret

data/lib/wavefront-cli/helpers/load_file.rb

@@ -57,7 +57,7 @@ module WavefrontCli
       #   does not parse
       #
       def load_from_stdin
-        raw = STDIN.read
+        raw = $stdin.read
 
         if raw.start_with?('---')
           read_yaml(raw)

data/lib/wavefront-cli/opt_handler.rb

@@ -2,7 +2,7 @@
 
 require 'pathname'
 require 'wavefront-sdk/credentials'
-require_relative 'constants.rb'
+require_relative 'constants'
 
 module WavefrontCli
   #
@@ -35,6 +35,8 @@ module WavefrontCli
       abort "Configuration file '#{e}' not found."
     rescue Wavefront::Exception::InvalidConfigFile => e
       abort "Could not load configuration file '#{e.message}'."
+    rescue Wavefront::Exception::MissingConfigProfile => e
+      abort "Cannot find profile '#{e}'."
     end
 
     # Create an options hash to pass to the Wavefront::Credentials
@@ -45,7 +47,7 @@ module WavefrontCli
     #   :profile
     #
     def setup_cred_opts(cli_opts)
-      cred_opts = {}
+      cred_opts = { raise_on_no_profile: true }
 
       if cli_opts[:config]
         cred_opts[:file] = Pathname.new(cli_opts[:config])
@@ -69,7 +71,7 @@ module WavefrontCli
     #
     def load_profile(cred_opts)
       creds = Wavefront::Credentials.new(cred_opts).config
-      Hash[creds.map { |k, v| [k.to_sym, v] }]
+      creds.transform_keys(&:to_sym)
     end
   end
 end

data/lib/wavefront-cli/output/hcl/base.rb

@@ -92,7 +92,7 @@ module WavefrontHclOutput
     def quote_value(val)
       case val.class.to_s.to_sym
       when :String
-        format('"%<value>s"', value: val.gsub(/\"/, '\"'))
+        format('"%<value>s"', value: val.gsub(/"/, '\"'))
       else
         val
       end

data/lib/wavefront-cli/proxy.rb

@@ -7,6 +7,11 @@ module WavefrontCli
   # CLI coverage for the v2 'proxy' API.
   #
   class Proxy < WavefrontCli::Base
+    def do_list
+      options[:all] = true if options[:active]
+      super
+    end
+
     def no_api_response
       %w[do_versions]
     end

data/lib/wavefront-cli/query.rb

@@ -51,20 +51,26 @@ module WavefrontCli
 
     # @return [Hash] options for the SDK query method
     #
-    # rubocop:disable Metrics/AbcSize
     def q_opts
+      basic_q_opts.tap do |o|
+        o[:n] = options[:name]
+        o[:p] = options[:points]
+        o[:view] = 'HISTOGRAM' if options[:histogramview]
+        o[:cached] = false if options[:nocache]
+      end.compact
+    end
+
+    # Every query gets these options. They're modified by q_opts
+    #
+    def basic_q_opts
       { autoEvents: options[:events],
         i: options[:inclusive],
         summarization: options[:summarize] || 'mean',
         listMode: true,
-        strict: true,
+        strict: !options[:nostrict],
         includeObsoleteMetrics: options[:obsolete],
-        sorted: true }.tap do |o|
-          o[:n] = options[:name] if options[:name]
-          o[:p] = options[:points] if options[:points]
-        end
+        sorted: true }
     end
-    # rubocop:enable Metrics/AbcSize
 
     # @return [Integer] start of query window. If one has been
     #   given, that; if not, ten minutes ago