ecs_helper 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d1b2b206fb9bcb80cc9fe9bb35359dbc4de0123e0d2a7a4dff79aa37cadfe3
-  data.tar.gz: 5fc0e17c2bd9d3e07cd9aca28c453fe57f248e511f54838b4998f492a9b2729c
+  metadata.gz: f4e40c9c0050075171080514f957eeef76fce51e292c5305d2003005326ad1bb
+  data.tar.gz: f48a33a223c127b561f7e639834fa59c0b7c0ad96f42fc661af062e50ef6f439
 SHA512:
-  metadata.gz: 3d0484fc39baa8577017b0acb6ba1730bf6691e44893d2fa844495d9331dc37c4ca8a82e323e44f3d73d9bf0720459cbab23efb67328886a310a21754afe457b
-  data.tar.gz: be29a8a6547814bc3ec94e29bf97245ff0ea58812e44ef272347ccef9a185e53befe9cd3e9f85ebc65de503c4eb3a24c9676321df510c21fa6b8c885c4dd5fae
+  metadata.gz: 849243dae8979adaf2ee254edbe49142af2a96e32143472653f124030c8f5389d278ae55b26c063b6b05793f544e7d2183424d0630b0680761371e3dfb7b10d6
+  data.tar.gz: e4cc9793f2962554bfa56ccad5d0c4f7045eb098ff5d98be470be58dc97a03fec07966d23601085971baa94594c73698c603796dffdd85e28988717562aec322

data/lib/ecs_helper/command/build_and_push.rb

@@ -32,7 +32,6 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
   def auth_public
     auth_cmd = Terrapin::CommandLine.new("aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws")
     auth_cmd.run
-
   end
 
   def auth_private

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,9 +12,10 @@ 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
@@ -25,7 +26,7 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
     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 +38,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 +57,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
@@ -77,11 +82,11 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
   end
 
   def repositories
-    @repositories ||= client.repositories
+    @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 +104,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 +112,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 +125,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")

data/lib/ecs_helper/command/ecr_login.rb

@@ -16,10 +16,16 @@ class ECSHelper::Command::ECRLogin < ECSHelper::Command::Base
 
   def run
     log("Command", type)
-    log("Auth", auth)
+    log("Auth Private", auth_private)
+    log("Auth Public", auth_public)
   end
 
-  def auth
+  def auth_public
+    auth_cmd = Terrapin::CommandLine.new("aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws")
+    auth_cmd.run
+  end
+
+  def auth_private
     auth_cmd = Terrapin::CommandLine.new("aws ecr get-login --no-include-email | sh")
     auth_cmd.run
   end

data/lib/ecs_helper/command/export_images.rb

@@ -18,12 +18,6 @@ class ECSHelper::Command::ExportImages < ECSHelper::Command::Base
     puts export_images
   end
 
-  def auth
-    auth_cmd = Terrapin::CommandLine.new("aws ecr get-login --no-include-email | sh")
-    auth_cmd.run
-  end
-
-
   private
 
   def project
@@ -35,7 +29,7 @@ class ECSHelper::Command::ExportImages < ECSHelper::Command::Base
   end
 
   def export_images
-    variables = (['export'] + client.repositories.map do |repo|
+    variables = (['export'] + client.private_repositories.map do |repo|
       container_name = repo.repository_name.scan(/#{project}-#{application}-(.*)/).flatten.first
       key = container_name.upcase.gsub("-", "_") + "_IMAGE"
       value = "#{repo.repository_uri}:#{helper.version}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.10
 platform: ruby
 authors:
 - Artem Petrov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs