barbeque 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2d49fbe13b55d7fbcc1b00150bc61f2345136c
-  data.tar.gz: 6af129b187c7367753e9474bfe484bcedca466a4
+  metadata.gz: b27aeb159c85a1b575e449c041347a150842b86e
+  data.tar.gz: a19d444c16ebc67456f51caf69c36163ae30b953
 SHA512:
-  metadata.gz: a2b3986cc9434d160b9e5b7efdb3b74513f522eaacd8caf07a4bb641b4d6f2807c09d1d5255787c1a730a9aa3639a92ce0ce26dd011587a7365d0f7d322ed820
-  data.tar.gz: 1f6cf3e3279464919f88782a61eda99c4c464dc743aecc37325226ae92879aad56d4d8d00d69a67d121206f4725fda16170e7268abb59ff5cea2d43463c5f74b
+  metadata.gz: ca444daf5808c8875d9e027baf783eae542b6d375aaf2aaf912fc6067211c461dfbe18c87a81cf0c378a60fa440565b35e3387270b94fd0efdfe2fba9f294c8b
+  data.tar.gz: 4ab3dfe060908257447481b0eba56a3c5639d3b217739ab510b42a0971c5b71ea78a3cb5967191188546d489c615a4c90d8c6d72e7c782f0d315344f31bbdd18

data/lib/barbeque/execution_log.rb

@@ -1,6 +1,7 @@
 require 'aws-sdk'
 require 'active_support'
 require 'active_support/core_ext'
+require 'barbeque/exception_handler'
 
 module Barbeque
   class ExecutionLog

data/lib/barbeque/executor/hako.rb

@@ -1,8 +1,8 @@
 require 'barbeque/docker_image'
 require 'barbeque/execution_log'
+require 'barbeque/hako_s3_client'
 require 'barbeque/slack_notifier'
 require 'open3'
-require 'uri'
 
 module Barbeque
   module Executor
@@ -10,6 +10,8 @@ module Barbeque
       class HakoCommandError < StandardError
       end
 
+      attr_reader :hako_s3_client
+
       # @param [String] hako_dir
       # @param [Hash] hako_env
       # @param [String] yaml_dir
@@ -17,10 +19,7 @@ module Barbeque
         @hako_dir = hako_dir
         @hako_env = hako_env
         @yaml_dir = yaml_dir
-        uri = URI.parse(oneshot_notification_prefix)
-        @s3_bucket = uri.host
-        @s3_prefix = uri.path.sub(%r{\A/}, '')
-        @s3_region = URI.decode_www_form(uri.query || '').to_h['region']
+        @hako_s3_client = HakoS3Client.new(oneshot_notification_prefix)
       end
 
       # @param [Barbeque::JobExecution] job_execution
@@ -69,10 +68,8 @@ module Barbeque
       # @param [Barbeque::JobExecution] job_execution
       def poll_execution(job_execution)
         hako_task = Barbeque::EcsHakoTask.find_by!(message_id: job_execution.message_id)
-        result = get_stopped_result(hako_task)
-        if result
-          detail = result.fetch('detail')
-          task = Aws::Json::Parser.new(Aws::ECS::Client.api.operation('describe_tasks').output.shape.member(:tasks).shape.member).parse(JSON.dump(detail))
+        task = @hako_s3_client.get_stopped_result(hako_task)
+        if task
           status = :failed
           task.containers.each do |container|
             if container.name == 'app'
@@ -88,10 +85,8 @@ module Barbeque
       def poll_retry(job_retry)
         hako_task = Barbeque::EcsHakoTask.find_by!(message_id: job_retry.message_id)
         job_execution = job_retry.job_execution
-        result = get_stopped_result(hako_task)
-        if result
-          detail = result.fetch('detail')
-          task = Aws::Json::Parser.new(Aws::ECS::Client.api.operation('describe_tasks').output.shape.member(:tasks).shape.member).parse(JSON.dump(detail))
+        task = @hako_s3_client.get_stopped_result(hako_task)
+        if task
           status = :failed
           task.containers.each do |container|
             if container.name == 'app'
@@ -121,21 +116,6 @@ module Barbeque
         end
       end
 
-      def s3_key_for_stopped_result(hako_task)
-        "#{@s3_prefix}/#{hako_task.task_arn}/stopped.json"
-      end
-
-      def s3_client
-        @s3_client ||= Aws::S3::Client.new(region: @s3_region, http_read_timeout: 5)
-      end
-
-      def get_stopped_result(hako_task)
-        object = s3_client.get_object(bucket: @s3_bucket, key: s3_key_for_stopped_result(hako_task))
-        JSON.parse(object.body.read)
-      rescue Aws::S3::Errors::NoSuchKey
-        nil
-      end
-
       def extract_task_info(stdout)
         last_line = stdout.lines.last
         if last_line

data/lib/barbeque/hako_s3_client.rb

@@ -0,0 +1,35 @@
+require 'uri'
+
+module Barbeque
+  class HakoS3Client
+    # @param [String] oneshot_notification_prefix S3 location for oneshot notification
+    def initialize(oneshot_notification_prefix)
+      uri = URI.parse(oneshot_notification_prefix)
+      @s3_bucket = uri.host
+      @s3_prefix = uri.path.sub(%r{\A/}, '')
+      @s3_region = URI.decode_www_form(uri.query || '').to_h['region']
+    end
+
+    # @param [Barbeque::EcsHakoTask] hako_task
+    # @return [String]
+    def s3_key_for_stopped_result(hako_task)
+      "#{@s3_prefix}/#{hako_task.task_arn}/stopped.json"
+    end
+
+    # @return [Aws::S3::Client]
+    def s3_client
+      @s3_client ||= Aws::S3::Client.new(region: @s3_region, http_read_timeout: 5)
+    end
+
+    # @param [Barbeque::EcsHakoTask] hako_task
+    # @return [Aws::ECS::Types::Task, nil]
+    def get_stopped_result(hako_task)
+      object = s3_client.get_object(bucket: @s3_bucket, key: s3_key_for_stopped_result(hako_task))
+      result = JSON.parse(object.body.read)
+      detail = result.fetch('detail')
+      Aws::Json::Parser.new(Aws::ECS::Client.api.operation('describe_tasks').output.shape.member(:tasks).shape.member).parse(JSON.dump(detail))
+    rescue Aws::S3::Errors::NoSuchKey
+      nil
+    end
+  end
+end

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -373,6 +373,7 @@ files:
 - lib/barbeque/executor.rb
 - lib/barbeque/executor/docker.rb
 - lib/barbeque/executor/hako.rb
+- lib/barbeque/hako_s3_client.rb
 - lib/barbeque/message.rb
 - lib/barbeque/message/base.rb
 - lib/barbeque/message/invalid_message.rb