ecs_helper 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69c2a9f0e010f46fd746986748e14f9a08ee5a0255a2779b7ea453d8dc47c685
-  data.tar.gz: b59a0b7bd4a045834a741dd34586dd87a8eec88c84fb11d63daeba3cfc5bbe8a
+  metadata.gz: abb3dcfdd4e42b2bf86e57422c59ceda2458f359e557cd0f782385c3e673ecf1
+  data.tar.gz: d036e9dbfac6b04133e2667f13e897b1e43cbad438d586904e53bb26b9536eee
 SHA512:
-  metadata.gz: 65f11ad6c8120a872900dbc61b91d08ad66e9b999931f298760de9baf0639d0a691bcd5bc7c37be095d94d7ed18a5fb5c34a205b8e22dd117f43f12b6239ced3
-  data.tar.gz: 20126689d683994f8ade23d02de2f81a25406b86ace18890be6f013c8bc64a467de567e9ccb23f3cf1fbf31ac3bec754400913ca23faad623fe1559495f7aecf
+  metadata.gz: 8d4df5b95e14fce83d28822904a4822bc6f8074cd7895b950a18ac68675790e8d998b0c9fa22b985430b1a5684b026b63c1caa771263025517d5272d7e54837c
+  data.tar.gz: 26dd182dcb2b0bc3d437acb41d3c89f2513b6ec4944c28a971244fcce3bece4efb63261591aadd31a5c4088557cc440e5ccc699cc1e014598e3424db427fa7ef

data/lib/ecs_helper/command/deploy.rb

@@ -2,7 +2,7 @@ require 'terrapin'
 
 class ECSHelper::Command::Deploy < ECSHelper::Command::Base
   attr_accessor :repositories, :task_definition, :new_task_definition, :service
-  TIMEOUT = 300
+  DEFAULT_TIMEOUT = 300
   STEP = 5
 
   def cmd_option_parser
@@ -12,20 +12,23 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
       opts.on("-p VALUE", "--project VALUE", "Set project name, if not specified will look at ENV['PROJECT'], will be used to detect cluster") { |p| options[:project] = processEqual(p) }
       opts.on("-a VALUE", "--application VALUE", "Set application name, if not specified will look at ENV['APPLICATION'], will be used to detect service and task definition") { |a| options[:application] = processEqual(a) }
       opts.on("-e VALUE", "--environment VALUE", "Set environment, if not specified will look at ENV['ENVIRONMENT'], it there is empty will try to detect based on the branch") { |e| options[:environment] = processEqual(e) }
-      opts.on("-t VALUE", "--tag VALUE", "Set tag which will be applied to all containers in the task if tag is present in the repo") { |t| options[:tag] = processEqual(t) }
+      opts.on("-v VALUE", "--version VALUE", "Set version which will be applied to all containers in the task if tag is present in the repo") { |t| options[:version] = processEqual(t) }
       opts.on("-c VALUE", "--cluster VALUE", "Set cluster name, could be autodetected if project and environment are specified") { |c| options[:cluster] = processEqual(c) }
       opts.on("-s VALUE", "--service VALUE", "Set service, could be autodetected if application and environment are specified") { |s| options[:service] = processEqual(s) }
+      opts.on("-t VALUE", "--timeout VALUE", "Set timeout how long to wait until deployment finished") { |t| options[:timeout] = processEqual(t) }
     end
     [parser, options]
   end
 
+  def timeout
+
   def run
     log("Command", type)
     log("Options", options)
     log("Environment", environment)
     log("Cluster", cluster_arn)
     log("Service", service_arn)
-    log("Tag", tag)
+    log("Version", version)
     log("Service task definition", task_definition_arn)
     log("Containers", pretty_container_definitions)
     log("New task definition", new_task_definition.task_definition_arn)
@@ -37,7 +40,7 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
   def wait_for_deployment(time = 0)
     service = helper.client.describe_service(cluster_arn, service_arn)
     return true if service.deployments.count == 1
-    error("Deployment timeout (#{TIMEOUT})") if time > TIMEOUT
+    error("Deployment timeout (#{timeout})") if time > timeout
     sleep STEP
     wait_for_deployment(time + STEP)
   end
@@ -56,8 +59,12 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
     helper.current_service
   end
 
-  def tag
-    options[:tag] || helper.version
+  def version
+    options[:version] || helper.version
+  end
+
+  def timeout
+    options[:timeout] || DEFAULT_TIMEOUT
   end
 
   def service
@@ -80,8 +87,8 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
     @repositories ||= client.private_repositories
   end
 
-  def tag_image(repo)
-    client.describe_images({repository_name: repo.repository_name, image_ids: [image_tag: tag]})
+  def version_image(repo)
+    client.describe_images({repository_name: repo.repository_name, image_ids: [image_tag: version]})
   rescue
     nil
   end
@@ -99,7 +106,7 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
   def container_definition_to_ecr(cd)
     repo = repo_for(cd.name)
     is_ecr = cd.image.include?(ecr_base)
-    image = repo && tag_image(repo)
+    image = repo && version_image(repo)
     should_update = is_ecr && repo && image
     [repo, is_ecr, image, should_update]
   end
@@ -107,7 +114,7 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
   def new_container_definitions
     container_definitions.map do |cd|
       repo, is_ecr, image, should_be_updated =  container_definition_to_ecr(cd)
-      cd.image = "#{repo.repository_uri}:#{tag}" if should_be_updated
+      cd.image = "#{repo.repository_uri}:#{version}" if should_be_updated
       cd.to_hash
     end
   end
@@ -120,7 +127,7 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
         cd.image,
         is_ecr ? "ECR image" : "Not a ECR image",
         repo ? "Repo #{repo.repository_name}" : "Repo not found",
-        image ? "Image tag #{tag}" : "Image tag #{tag} not found",
+        image ? "Image version #{version}" : "Image version #{version} not found",
         should_be_updated ? "Will be updated" : "Not applicable"
       ].join(' | ')
     end.join("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Artem Petrov