ecs_helper 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3a8956a9f6eda0de978eae11de21c36ff09fd45c6c0a9c1df13ccd6b2bdba95
-  data.tar.gz: 40391c6c317e96687b9ad72ebcf03df0cdb0bb1b1a1fd381db720df7720d2801
+  metadata.gz: abb3dcfdd4e42b2bf86e57422c59ceda2458f359e557cd0f782385c3e673ecf1
+  data.tar.gz: d036e9dbfac6b04133e2667f13e897b1e43cbad438d586904e53bb26b9536eee
 SHA512:
-  metadata.gz: 497a68f0ae2b2e8cce1701b821195dc1f07f5a7a7a6f67b442abc59a4e69005ff5de067943037b63e5e4ec1f09e318b4ec3136a6b92f5b2ec92d3911be58199c
-  data.tar.gz: 1a01a3f9ca2b5c94fdd5a146b6cc3f41c6fa6b35620748068f9cbee3f10afc102f2dee0a32e5884007bb7f6cb7c6d02a9e72dfddcf1df1c0ddfd94fb2d831a5f
+  metadata.gz: 8d4df5b95e14fce83d28822904a4822bc6f8074cd7895b950a18ac68675790e8d998b0c9fa22b985430b1a5684b026b63c1caa771263025517d5272d7e54837c
+  data.tar.gz: 26dd182dcb2b0bc3d437acb41d3c89f2513b6ec4944c28a971244fcce3bece4efb63261591aadd31a5c4088557cc440e5ccc699cc1e014598e3424db427fa7ef

data/lib/ecs_helper/client.rb

@@ -1,11 +1,13 @@
 require 'aws-sdk-ecs'
 require 'aws-sdk-ecr'
+require 'aws-sdk-ecrpublic'
 
 class ECSHelper::Client
-  attr_accessor :ecs, :ecr
+  attr_accessor :ecs, :ecr, :ecr_public
   def initialize
     @ecs = Aws::ECS::Client.new
     @ecr = Aws::ECR::Client.new
+    @ecr_public = Aws::ECRPublic::Client.new
   end
 
   # ECS
@@ -47,10 +49,14 @@ class ECSHelper::Client
   end
 
   # ECR
-  def repositories(params = {})
+  def private_repositories(params = {})
     ecr.describe_repositories(params).repositories
   end
 
+  def public_repositories(params = {})
+    ecr_public.describe_repositories(params).repositories
+  end
+
   def describe_images(params = {})
     ecr.describe_images(params).image_details[0]
   end

data/lib/ecs_helper/command/build_and_push.rb

@@ -22,13 +22,19 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
     log("Command", type)
     log("Options", options)
     log("Repository", repository)
-    log("Auth", auth)
+    log("Auth Private", auth_private)
+    log("Auth Public", auth_public)
     log("Pull", pull)
     log("Build", build)
     log("Push", push)
   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
@@ -72,7 +78,9 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
 
   def repository
     @repository ||= begin
-      all = client.repositories
+      private_repos = client.private_repositories
+      public_repos = client.public_repositories
+      all = private_repos + public_repos
       with_name = all.select { |r| r.repository_arn.include?(image_name) }
       return with_name[0].repository_uri if with_name.length === 1
 

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
@@ -77,11 +84,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 +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")

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.4
+  version: 0.0.9
 platform: ruby
 authors:
 - Artem Petrov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
@@ -50,6 +50,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.42'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ecrpublic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement