babysitter 0.0.11 → 0.0.12

data/README.md

@@ -34,12 +34,17 @@ Babysitter can also make use of Amazons Simple Notification Service to provide n
 
     Babysitter.configure do |c|
       c.enable_simple_notification_service(
-        access_key_id: "YOUR_ACCESS_KEY_ID",
-        secret_address_key: "YOUR_SECRET_ADDRESS_KEY",
-        topic_arn: "my-topic-arn"
+        topic_arn: "my-topic-arn",
+        credentials: -> { 
+          access_key_id: "YOUR_ACCESS_KEY_ID",
+          secret_address_key: "YOUR_SECRET_ADDRESS_KEY",
+        }
       )
     end
 
+The credentials should be supplied as a Proc so that they are only requested when they are required. This supports the use of temporary
+credentials with IAM and prevents any credentials fetched at configuration time having expired at some point later when an error occurs.
+
 ### Monitoring
 
     monitor = Babysitter.monitor("statsd.bucket.name")

data/lib/babysitter/exception_notifiers/simple_notification_service.rb

@@ -4,20 +4,28 @@ module Babysitter
   module ExceptionNotifiers
     class SimpleNotificationService
       def initialize(opts = {})
-        topic_arn = opts.delete(:topic_arn)
-        raise ArgumentError, "topic_arn is required." if topic_arn.nil?
+        @topic_arn = opts.delete(:topic_arn)
+        @get_credentials = opts.delete(:credentials)
+        raise ArgumentError, "topic_arn is required." if @topic_arn.nil?
+        raise ArgumentError, "credentials is required and must be a Proc." if @get_credentials.nil? || !@get_credentials.is_a?(Proc)
 
-        @sns = AWS::SNS.new(opts)
-        @topic = @sns.topics[topic_arn]
         validate_topic
       end
 
       def notify(subject, msg)
-        @topic.publish(msg, subject: sanitise_subject(subject))
+        topic.publish(msg, subject: sanitise_subject(subject))
       end
 
       private
 
+      def sns
+        AWS::SNS.new(@get_credentials.call)
+      end
+
+      def topic
+        sns.topics[@topic_arn]
+      end
+
       def sanitise_subject(subject)
         sanitised = /\s*([^\x00-\x1F]*)/.match(subject)[1]
 
@@ -27,7 +35,7 @@ module Babysitter
       end
 
       def validate_topic
-        @topic.display_name
+        topic.display_name
       end
     end
   end

data/lib/babysitter/version.rb

@@ -1,3 +1,3 @@
 module Babysitter
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/lib/babysitter/exception_notifiers/simple_notification_service_spec.rb

@@ -4,9 +4,14 @@ module Babysitter
   module ExceptionNotifiers
     describe SimpleNotificationService do
       subject { SimpleNotificationService.new(valid_opts) }
+      let(:get_credentials_lambda) { -> {
+        {
+          access_key_id: 'an-access-key-id',
+          secret_access_key: 'a-secret-address-key',
+        }
+      } }
       let(:valid_opts) { {
-        access_key_id: 'an-access-key-id',
-        secret_access_key: 'a-secret-address-key',
+        credentials: get_credentials_lambda,
         topic_arn: 'my-topic-arn'
       } }
       let(:sns) { double :sns, topics: { 'my-topic-arn' => topic } }
@@ -16,11 +21,22 @@ module Babysitter
       end
 
       it 'requires a topic_arn' do
-        -> { SimpleNotificationService.new() }.should raise_error(ArgumentError, /topic_arn/)
+        valid_opts.delete :topic_arn
+        -> { subject }.should raise_error(ArgumentError, /topic_arn/)
+      end
+
+      it "requires credentials" do
+        valid_opts.delete :credentials
+        -> { subject }.should raise_error(ArgumentError, /credentials/)
+      end
+
+      it 'requires a block to retrieve AWS credentials' do
+        valid_opts[:credentials] = {}
+        -> { subject }.should raise_error(ArgumentError, /credentials/)
       end
 
       it 'uses the options passed to configure the credentials for sns' do
-        AWS::SNS.should_receive(:new).with(valid_opts.reject { |key| key == :topic_arn } )
+        AWS::SNS.should_receive(:new).with(get_credentials_lambda.call)
         subject
       end
 
@@ -33,6 +49,11 @@ module Babysitter
         let(:message) { "the message" }
         let(:notification_subject) { "the subject" }
 
+        it 'again uses the options passed to configure the credentials for sns' do
+          AWS::SNS.should_receive(:new).with(get_credentials_lambda.call).twice
+          subject.notify(notification_subject, message)
+        end
+
         it 'publishes to the topic specified' do
           topic.should_receive(:publish)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babysitter
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fozzie
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Babysits long-running processes and reports progress or failures