From 9a37e1122aad16f2e68eda0a6e6510dd20e849a5 Mon Sep 17 00:00:00 2001 From: TamakiMaeda Date: Tue, 8 Dec 2020 17:29:04 +0900 Subject: [PATCH] ignore to set AWS_ACCESS_KEY_ID & AWS_SECRET_ACCESS_KEY --- lib/exception_notifier/sns_notifier.rb | 8 +++----- test/exception_notifier/sns_notifier_test.rb | 18 ------------------ 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/lib/exception_notifier/sns_notifier.rb b/lib/exception_notifier/sns_notifier.rb index 2da2f5b3..261a6dfb 100644 --- a/lib/exception_notifier/sns_notifier.rb +++ b/lib/exception_notifier/sns_notifier.rb @@ -5,14 +5,12 @@ class SnsNotifier < BaseNotifier def initialize(options) super + allowed_keys = %i[region access_key_id secret_access_key] + raise ArgumentError, "You must provide 'region' option" unless options[:region] - raise ArgumentError, "You must provide 'access_key_id' option" unless options[:access_key_id] - raise ArgumentError, "You must provide 'secret_access_key' option" unless options[:secret_access_key] @notifier = Aws::SNS::Client.new( - region: options[:region], - access_key_id: options[:access_key_id], - secret_access_key: options[:secret_access_key] + **options.select { |k, _| allowed_keys.include?(k) } ) @options = default_options.merge(options) end diff --git a/test/exception_notifier/sns_notifier_test.rb b/test/exception_notifier/sns_notifier_test.rb index cc7767f0..fc198a00 100644 --- a/test/exception_notifier/sns_notifier_test.rb +++ b/test/exception_notifier/sns_notifier_test.rb @@ -40,24 +40,6 @@ def setup assert_equal "You must provide 'region' option", error.message end - test 'should raise an exception on publish if access_key_id is not received' do - @options[:access_key_id] = nil - error = assert_raises ArgumentError do - ExceptionNotifier::SnsNotifier.new(@options) - end - - assert_equal "You must provide 'access_key_id' option", error.message - end - - test 'should raise an exception on publish if secret_access_key is not received' do - @options[:secret_access_key] = nil - error = assert_raises ArgumentError do - ExceptionNotifier::SnsNotifier.new(@options) - end - - assert_equal "You must provide 'secret_access_key' option", error.message - end - # call test 'should send a sns notification in background' do