bin/check-ses-limit.rb in sensu-plugins-aws-2.0.1 vs bin/check-ses-limit.rb in sensu-plugins-aws-2.1.0

@@ -14,10 +14,11 @@
 #   Linux
 #
 # DEPENDENCIES:
 #   gem: aws-sdk
 #   gem: sensu-plugin
+#   gem: sensu-plugins-aws
 #
 # USAGE:
 #   #YELLOW
 #
 # NOTES:
@@ -27,24 +28,24 @@
 #   Released under the same terms as Sensu (the MIT license); see LICENSE
 #   for details.
 #
 
 require 'sensu-plugin/check/cli'
-require 'aws/ses'
+require 'sensu-plugins-aws'
+require 'aws-sdk'
 
 class CheckSESLimit < Sensu::Plugin::Check::CLI
+  include Common
   option :aws_access_key,
          short: '-a AWS_ACCESS_KEY',
          long: '--aws-access-key AWS_ACCESS_KEY',
-         description: "AWS Access Key. Either set ENV['AWS_ACCESS_KEY'] or provide it as an option",
-         default: ENV['AWS_ACCESS_KEY']
+         description: 'AWS Access Key ID.'
 
   option :aws_secret_access_key,
          short: '-k AWS_SECRET_KEY',
          long: '--aws-secret-access-key AWS_SECRET_KEY',
-         description: "AWS Secret Access Key. Either set ENV['AWS_SECRET_KEY'] or provide it as an option",
-         default: ENV['AWS_SECRET_KEY']
+         description: 'AWS Secret Access Key.'
 
   option :aws_region,
          short: '-r AWS_REGION',
          long: '--aws-region REGION',
          description: 'AWS Region (defaults to us-east-1).',
@@ -62,35 +63,27 @@
          long: '--crit_perc CRIT_PERCENT',
          description: 'Critical when the percentage of mail sent is at or above this number',
          default: 90,
          proc: proc(&:to_i)
 
-  def aws_config
-    { access_key_id: config[:aws_access_key],
-      secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
-  end
-
   def run
     begin
-      ses = AWS::SES::Base.new aws_config
-
-      response = ses.quota
-    rescue AWS::SES::ResponseError => e
-      critical "An issue occured while communicating with the AWS SES API: #{e.message}"
+      ses = Aws::SES::Client.new
+      response = ses.get_send_quota
+    rescue => e
+      unknown "An issue occured while communicating with the AWS SES API: #{e.message}"
     end
 
-    unless response.empty? # rubocop: disable Style/GuardClause
-      percent = (response.sent_last_24_hours.to_i / response.max_24_hour_send.to_i) * 100
-      message = "SES sending limit is at #{percent}%"
+    unknown 'Empty response from AWS SES API' if response.empty? # Can this happen?
 
-      if config[:crit_percent] > 0 && config[:crit_percent] <= percent
-        critical message
-      elsif config[:warn_percent] > 0 && config[:warn_percent] <= percent
-        warning message
-      else
-        ok message
-      end
+    percent = (response.sent_last_24_hours.to_i / response.max_24_hour_send.to_i) * 100
+    message = "SES sending limit is at #{percent}%"
+
+    if config[:crit_percent] > 0 && config[:crit_percent] <= percent
+      critical message
+    elsif config[:warn_percent] > 0 && config[:warn_percent] <= percent
+      warning message
+    else
+      ok message
     end
   end
 end