barbeque 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1ae358429ce7e4ddebf8a84f91790148e68a6bb
-  data.tar.gz: ab9055b050139257e02b6beb7f8848789f42d84e
+  metadata.gz: '0956004e27b896eda31157ad3cb964d216b1c575'
+  data.tar.gz: 20e711d2e9c7d68444d5cd79a73f1b83cd86eb90
 SHA512:
-  metadata.gz: c7ec8c8160b7f41594f1d0bf6fa5a6d0531823b592a59e3b2f5f71970a39272c7fa09bb0dc3d0f109c3ccaa51356a90b52c5b829464b2c5226fb88430758a23a
-  data.tar.gz: 3bec39419f1ffc4780104bf5c005f5844c5fe40aee74ab8c10ee02402428dfc4a6196236ae4f81559e545d96ebf670d3976b33d4b037bafed44add52181b8877
+  metadata.gz: 22b89b6062790e1d7e87e340ba18a95facfa7714d38ced1b4482fdfc3aab1e0a9a861a67f3ab5f99b3e156074129eec12f679ffec525a279d0e4e7a8d71682e0
+  data.tar.gz: 95d7fee60b607d649f444ef3e1c9ae71f30edfe7a8b59ec4e49a35e6c2efe561dab321d644df4d7a5d4864be4bef4ab002120fe720f8ab4e116fcc32145e7621

data/app/controllers/barbeque/job_definitions_controller.rb

@@ -49,6 +49,9 @@ class Barbeque::JobDefinitionsController < Barbeque::ApplicationController
 
   def destroy
     @job_definition = Barbeque::JobDefinition.find(params[:id])
+    @job_definition.sns_subscriptions.each do |sns_subscription|
+      Barbeque::SNSSubscriptionService.new.unsubscribe(sns_subscription)
+    end
     @job_definition.destroy
     redirect_to job_definitions_url, notice: 'Job definition was successfully destroyed.'
   end

data/app/controllers/barbeque/sns_subscriptions_controller.rb

@@ -18,23 +18,10 @@ class Barbeque::SnsSubscriptionsController < Barbeque::ApplicationController
 
   def create
     @sns_subscription = Barbeque::SNSSubscription.new(params.require(:sns_subscription).permit(:topic_arn, :job_queue_id, :job_definition_id))
-    if @sns_subscription.valid?
-      begin
-        subscribe_topic!
-      rescue Aws::SNS::Errors::AuthorizationError
-        @sns_subscription.errors[:topic_arn] << 'is not authorized'
-        @sns_topic_arns = fetch_sns_topic_arns
-        render :new
-      rescue Aws::SNS::Errors::NotFound
-        @sns_subscription.errors[:topic_arn] << 'is not found'
-        @sns_topic_arns = fetch_sns_topic_arns
-        render :new
-      else
-        @sns_subscription.save!
-        update_sqs_policy!
-        redirect_to @sns_subscription, notice: 'SNS subscription was successfully created.'
-      end
+    if Barbeque::SNSSubscriptionService.new.subscribe(@sns_subscription)
+      redirect_to @sns_subscription, notice: 'SNS subscription was successfully created.'
     else
+      @sns_topic_arns = fetch_sns_topic_arns
       render :new
     end
   end
@@ -49,101 +36,14 @@ class Barbeque::SnsSubscriptionsController < Barbeque::ApplicationController
   end
 
   def destroy
-    @sns_subscription = Barbeque::SNSSubscription.find(params[:id])
-    @sns_subscription.destroy
-    update_sqs_policy!
-    unsubscribe_topic!
+    sns_subscription = Barbeque::SNSSubscription.find(params[:id])
+    Barbeque::SNSSubscriptionService.new.unsubscribe(sns_subscription)
     redirect_to sns_subscriptions_path, notice: 'SNS subscription was successfully destroyed.'
   end
   
   private
 
   def fetch_sns_topic_arns
-    sns_client.list_topics.topics.map(&:topic_arn)
-  end
-
-  def update_sqs_policy!
-    attrs = sqs_client.get_queue_attributes(
-      queue_url: @sns_subscription.job_queue.queue_url,
-      attribute_names: ['QueueArn'],
-    )
-    queue_arn = attrs.attributes['QueueArn']
-    topic_arns = @sns_subscription.job_queue.sns_subscriptions.map(&:topic_arn)
-
-    if topic_arns.present?
-      policy = generate_policy(queue_arn: queue_arn, topic_arns: topic_arns)
-    else
-      policy = '' # Be blank when there're no subscriptions.
-    end
-
-    sqs_client.set_queue_attributes(
-      queue_url: @sns_subscription.job_queue.queue_url,
-      attributes: { 'Policy' => policy },
-    )
-  end
-
-  # @paaram [String] queue_arn
-  # @param [Array<String>] topic_arns
-  # @return [String] JSON formatted policy
-  def generate_policy(queue_arn:, topic_arns:)
-    {
-      'Version' => '2012-10-17',
-      'Statement' => [
-        'Effect' => 'Allow',
-        'Principal' => '*',
-        'Action' => 'sqs:SendMessage',
-        'Resource' => queue_arn,
-        'Condition' => {
-          'ArnEquals' => {
-            'aws:SourceArn' => topic_arns,
-          }
-        }
-      ]
-    }.to_json
-  end
-
-  def subscribe_topic!
-    sns_client.subscribe(
-      topic_arn: @sns_subscription.topic_arn,
-      protocol: 'sqs',
-      endpoint: queue_arn
-    )
-  end
-
-  def unsubscribe_topic!
-    sqs_attrs = sqs_client.get_queue_attributes(
-      queue_url: @sns_subscription.job_queue.queue_url,
-      attribute_names: ['QueueArn'],
-    )
-    queue_arn = sqs_attrs.attributes['QueueArn']
-
-    subscriptions = sns_client.list_subscriptions_by_topic(
-      topic_arn: @sns_subscription.topic_arn,
-    )
-    subscription_arn = subscriptions.subscriptions.find {|subscription| subscription.endpoint == queue_arn }.try!(:subscription_arn)
-
-    if subscription_arn
-      sns_client.unsubscribe(
-        subscription_arn: subscription_arn,
-      )
-    end
-  end
-
-  def sqs_client
-    @sqs_client ||= Aws::SQS::Client.new
-  end
-
-  def sns_client
-    @sns_client ||= Aws::SNS::Client.new
-  end
-
-  def queue_arn
-    return @queue_arn if @queue_arn
-
-    sqs_attrs = sqs_client.get_queue_attributes(
-      queue_url: @sns_subscription.job_queue.queue_url,
-      attribute_names: ['QueueArn'],
-    )
-    @queue_arn = sqs_attrs.attributes['QueueArn']
+    Barbeque::SNSSubscriptionService.sns_client.list_topics.topics.map(&:topic_arn)
   end
 end

data/app/models/barbeque/job_definition.rb

@@ -1,6 +1,7 @@
 class Barbeque::JobDefinition < Barbeque::ApplicationRecord
   belongs_to :app
   has_many :job_executions, dependent: :destroy
+  has_many :sns_subscriptions, class_name: 'SNSSubscription'
   has_one :slack_notification, dependent: :destroy
 
   validates :job, uniqueness: { scope: :app_id }

data/app/services/barbeque/sns_subscription_service.rb

@@ -0,0 +1,125 @@
+class Barbeque::SNSSubscriptionService
+  def self.sqs_client
+    @sqs_client ||= Aws::SQS::Client.new
+  end
+
+  def self.sns_client
+    @sns_client ||= Aws::SNS::Client.new
+  end
+
+  # @param [Barbeque::SNSSubscription] sns_subscription
+  # @return [Boolean] `true` if succeeded to subscribe
+  def subscribe(sns_subscription)
+    if sns_subscription.valid?
+      begin
+        subscribe_topic!(sns_subscription)
+        sns_subscription.save!
+        update_sqs_policy!(sns_subscription)
+        true
+      rescue Aws::SNS::Errors::AuthorizationError
+        sns_subscription.errors[:topic_arn] << 'is not authorized'
+        false
+      rescue Aws::SNS::Errors::NotFound
+        sns_subscription.errors[:topic_arn] << 'is not found'
+        false
+      end
+    else
+      false
+    end
+  end
+
+  # @param [Barbeque::SNSSubscription] sns_subscription
+  def unsubscribe(sns_subscription)
+    sns_subscription.destroy
+    update_sqs_policy!(sns_subscription)
+    unsubscribe_topic!(sns_subscription)
+    nil
+  end
+
+  private
+
+  def sqs_client
+    Barbeque::SNSSubscriptionService.sqs_client
+  end
+
+  def sns_client
+    Barbeque::SNSSubscriptionService.sns_client
+  end
+
+  # @param [Barbeque::SNSSubscription] sns_subscription
+  def update_sqs_policy!(sns_subscription)
+    attrs = sqs_client.get_queue_attributes(
+      queue_url: sns_subscription.job_queue.queue_url,
+      attribute_names: ['QueueArn'],
+    )
+    queue_arn = attrs.attributes['QueueArn']
+    topic_arns = sns_subscription.job_queue.sns_subscriptions.map(&:topic_arn)
+
+    if topic_arns.present?
+      policy = generate_policy(queue_arn: queue_arn, topic_arns: topic_arns)
+    else
+      policy = '' # Be blank when there're no subscriptions.
+    end
+
+    sqs_client.set_queue_attributes(
+      queue_url: sns_subscription.job_queue.queue_url,
+      attributes: { 'Policy' => policy },
+    )
+  end
+
+  # @paaram [String] queue_arn
+  # @param [Array<String>] topic_arns
+  # @return [String] JSON formatted policy
+  def generate_policy(queue_arn:, topic_arns:)
+    {
+      'Version' => '2012-10-17',
+      'Statement' => [
+        'Effect' => 'Allow',
+        'Principal' => '*',
+        'Action' => 'sqs:SendMessage',
+        'Resource' => queue_arn,
+        'Condition' => {
+          'ArnEquals' => {
+            'aws:SourceArn' => topic_arns,
+          }
+        }
+      ]
+    }.to_json
+  end
+
+  # @param [Barbeque::SNSSubscription] sns_subscription
+  def subscribe_topic!(sns_subscription)
+    sqs_attrs = sqs_client.get_queue_attributes(
+      queue_url: sns_subscription.job_queue.queue_url,
+      attribute_names: ['QueueArn'],
+    )
+    queue_arn = sqs_attrs.attributes['QueueArn']
+
+    sns_client.subscribe(
+      topic_arn: sns_subscription.topic_arn,
+      protocol: 'sqs',
+      endpoint: queue_arn
+    )
+  end
+
+  # @param [Barbeque::SNSSubscription] sns_subscription
+  def unsubscribe_topic!(sns_subscription)
+    sqs_attrs = sqs_client.get_queue_attributes(
+      queue_url: sns_subscription.job_queue.queue_url,
+      attribute_names: ['QueueArn'],
+    )
+    queue_arn = sqs_attrs.attributes['QueueArn']
+
+    subscriptions = sns_client.list_subscriptions_by_topic(
+      topic_arn: sns_subscription.topic_arn,
+    )
+    subscription_arn = subscriptions.subscriptions.find {|subscription| subscription.endpoint == queue_arn }.try!(:subscription_arn)
+
+    if subscription_arn
+      sns_client.unsubscribe(
+        subscription_arn: subscription_arn,
+      )
+    end
+  end
+
+end

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -309,6 +309,7 @@ files:
 - app/models/barbeque/sns_subscription.rb
 - app/services/barbeque/message_enqueuing_service.rb
 - app/services/barbeque/message_retrying_service.rb
+- app/services/barbeque/sns_subscription_service.rb
 - app/views/barbeque/apps/_form.html.haml
 - app/views/barbeque/apps/edit.html.haml
 - app/views/barbeque/apps/index.html.haml