ecs_deployer 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53c73ee2931e45cc8f3db8a292cef5f467d08895
-  data.tar.gz: e5e00d7575c48223a3f6952ba03338b2ed504c7e
+  metadata.gz: 5304affa2271b6914090f8c15f748b47b60e053a
+  data.tar.gz: 577e9bf00b0b8f648958b248947357d354f9cd96
 SHA512:
-  metadata.gz: f664e88c2e5dbe349f72cf2cbbb683496f9facba1a8b7592944c5c93cf9d0954ee6ea71ac2c540233f959783a16dd56c17e5bd1cfccfe2c85c8cc360d66b3dc0
-  data.tar.gz: ba609ad07fb2f6f4a1319fc6ba6592e3d6f18a5a4de0af96ad01216c3f987e322b31d3d28730b8d64280a097edf5e0bb1e23dbbeb9ac094da924d3bb34a0728b
+  metadata.gz: 4a0f025d15c4bb3143ff9151bb7437f6aeeb2c3d7a793b2e65a9af246f35095182afb872d0c2651a4a03bd19af69529efdcc7d6fbd4b8f2c7aaf7c30a082145c
+  data.tar.gz: ccb05e921c7d79eb5b75d3bb34c304166243e181eca1648d03e288254505b1ff4f7a581fd00f5267cfeb698fcfc6e0b5745f064b14b41812a7e1f64a745bd707

data/example/update_scheduled_task.rb

@@ -13,5 +13,10 @@ target_builder = scheduled_task.target_builder(Settings.scheduled_task_target_id
 target_builder.task_definition_arn = task_definition.task_definition_arn
 target_builder.override_container('rails', ['curl', 'http://153.122.13.159/'])
 
-task_definition = scheduled_task.update(Settings.scheduled_task_rule, 'cron(* * * * ? *)', [target_builder.to_hash])
+task_definition = scheduled_task.update(
+  Settings.scheduled_task_rule,
+  'cron(* * * * ? *)',
+  [target_builder.to_hash],
+  description: 'Test task'
+)
 puts task_definition.rule_arn

data/lib/ecs_deployer/scheduled_task/client.rb

@@ -22,33 +22,29 @@ module EcsDeployer
       end
 
       # @param [String] id
-      # @param [String] role
       # @return [EcsDeployer::ScheduledTask::Target]
-      def target_builder(id, role = 'ecsEventsRole')
-        EcsDeployer::ScheduledTask::Target.new(@cluster, id, role, @aws_options)
+      def target_builder(id)
+        EcsDeployer::ScheduledTask::Target.new(@cluster, id, @aws_options)
       end
 
       # @param [String] rule
       # @param [String] schedule_expression
       # @param [Array] targets
+      # @param [Hash] options
       # @return [CloudWatchEvents::Types::PutRuleResponse]
-      def update(rule, schedule_expression, targets)
+      def update(rule, schedule_expression, targets, options = { description: nil })
         response = @cloud_watch_events.put_rule(
           name: rule,
           schedule_expression: schedule_expression,
-          state: 'ENABLED'
+          state: 'ENABLED',
+          description: options[:description]
+        )
+        @cloud_watch_events.put_targets(
+          rule: rule,
+          targets: targets
         )
-        begin
-          @cloud_watch_events.put_targets(
-            rule: rule,
-            targets: targets
-          )
 
-          response
-        rescue => e
-          @cloud_watch_events.delete_rule(name: rule)
-          raise e
-        end
+        response
       end
     end
   end

data/lib/ecs_deployer/scheduled_task/target.rb

@@ -2,23 +2,33 @@ module EcsDeployer
   module ScheduledTask
     class Target
       attr_reader :id
-      attr_accessor :arn, :role_arn, :task_definition_arn, :task_count
+      attr_accessor :arn, :role_arn, :task_definition_arn, :task_count, :task_role_arn
+
+      TARGET_ROLE = 'ecsEventsRole'.freeze
 
       # @param [String] cluster
       # @param [String] id
-      # @param [String] role
       # @param [Hash] aws_options
       # @return EcsDeployer::ScheduledTask::Target]
-      def initialize(cluster, id, role = nil, aws_options = {})
+      def initialize(cluster, id, aws_options = {})
         ecs = Aws::ECS::Client.new(aws_options)
         clusters = ecs.describe_clusters(clusters: [cluster]).clusters
         raise ClusterNotFoundError, "Cluster does not eixst. [#{cluster}]" if clusters.count.zero?
 
         @id = id
         @arn = clusters[0].cluster_arn
-        @role_arn = Aws::IAM::Role.new(role, @aws_options).arn unless role.nil?
         @task_count = 1
         @container_overrides = []
+
+        role(TARGET_ROLE)
+      end
+
+      def role(role)
+        @role_arn = Aws::IAM::Role.new(role, @aws_options).arn
+      end
+
+      def task_role(task_role)
+        @task_role_arn = Aws::IAM::Role.new(task_role, @aws_options).arn
       end
 
       # @param [String] name
@@ -55,6 +65,7 @@ module EcsDeployer
             task_count: @task_count
           },
           input: {
+            taskRoleArn: @task_role_arn,
             containerOverrides: @container_overrides
           }.to_json.to_s
         }

data/lib/ecs_deployer/version.rb

@@ -1,3 +1,3 @@
 module EcsDeployer
-  VERSION = '2.1.5'.freeze
+  VERSION = '2.1.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deployer
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - naomichi-y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk