ecs_helper 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e312a9d8447eeb797b242831cdd654d03a5110eb2334868a33066761de47bd
-  data.tar.gz: ac1cdddf44eaeeabf20dcbc6fe05f677461bc8b67f8726bfda20f0890c69f978
+  metadata.gz: 69c2a9f0e010f46fd746986748e14f9a08ee5a0255a2779b7ea453d8dc47c685
+  data.tar.gz: b59a0b7bd4a045834a741dd34586dd87a8eec88c84fb11d63daeba3cfc5bbe8a
 SHA512:
-  metadata.gz: 704028fcd8b9669af080ba8cce93fff3149440ea22529a3a1c1c2582eec384cf261b8662e10f1274de3d8b359ec1e0cfdf3c7bd896478f3f8e05ff36f076ae8c
-  data.tar.gz: 5684fb3b793b810d89b9ad080acdad03fa79d91f7276ce3f2e41cc90cbf9c7e5f01e4b81cbdfbd13f036ae0c957c177361287ccc1048c5b04ebc38bb61035d3b
+  metadata.gz: 65f11ad6c8120a872900dbc61b91d08ad66e9b999931f298760de9baf0639d0a691bcd5bc7c37be095d94d7ed18a5fb5c34a205b8e22dd117f43f12b6239ced3
+  data.tar.gz: 20126689d683994f8ade23d02de2f81a25406b86ace18890be6f013c8bc64a467de567e9ccb23f3cf1fbf31ac3bec754400913ca23faad623fe1559495f7aecf

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.rb

@@ -3,10 +3,14 @@ class ECSHelper::Command
   autoload :Base, 'ecs_helper/command/base'
   autoload :BuildAndPush, 'ecs_helper/command/build_and_push'
   autoload :Deploy, 'ecs_helper/command/deploy'
+  autoload :ExportImages, 'ecs_helper/command/export_images'
+  autoload :ECRLogin, 'ecs_helper/command/ecr_login'
 
   CMD_MAPPING  = {
     "build_and_push" => BuildAndPush,
-    "deploy" => Deploy
+    "deploy" => Deploy,
+    "export_images" => ExportImages,
+    "ecr_login" => ECRLogin,
   }
   AVAILABLE_COMMANDS = CMD_MAPPING.keys
 

data/lib/ecs_helper/command/build_and_push.rb

@@ -1,13 +1,11 @@
 require 'terrapin'
 
 class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
-  # attr_accessor :type, :client, :project, :application, :version
 
   def cmd_option_parser
     options = {}
     parser = ::OptionParser.new do |opts|
-      opts.banner = "Usage: ecs_helper build_and_push [options]]"
-      opts.on("-v", "--verbose", "Show debug information") { o[:verbose] = true }
+      opts.banner = "Usage: ecs_helper build_and_push [options]"
       opts.on("-i VALUE", "--image VALUE", "Set image name, will be used to detect ecr repo where to push image, for example web/nginx/toolbox (required)") { |c| options[:image] = processEqual(c) }
       opts.on("-d VALUE", "--directory VALUE", "Set directory for dockerfile and context, default = './'") { |c| options[:directory] = processEqual(c) }
       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) }
@@ -24,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
@@ -74,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

@@ -8,8 +8,7 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
   def cmd_option_parser
     options = {}
     parser = ::OptionParser.new do |opts|
-      opts.banner = "Usage: ecs_helper deploy [options]]"
-      opts.on("-v", "--verbose", "Show debug information") { o[:verbose] = true }
+      opts.banner = "Usage: ecs_helper deploy [options]"
       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) }
@@ -78,7 +77,7 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
   end
 
   def repositories
-    @repositories ||= client.repositories
+    @repositories ||= client.private_repositories
   end
 
   def tag_image(repo)

data/lib/ecs_helper/command/ecr_login.rb

@@ -0,0 +1,32 @@
+require 'terrapin'
+
+class ECSHelper::Command::ECRLogin < ECSHelper::Command::Base
+
+  def cmd_option_parser
+    options = {}
+    parser = ::OptionParser.new do |opts|
+      opts.banner = "Usage: ecs_helper ecr_login"
+    end
+    [parser, options]
+  end
+
+  def required
+    []
+  end
+
+  def run
+    log("Command", type)
+    log("Auth Private", auth_private)
+    log("Auth Public", auth_public)
+  end
+
+  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
+end

data/lib/ecs_helper/command/export_images.rb

@@ -0,0 +1,40 @@
+require 'terrapin'
+
+class ECSHelper::Command::ExportImages < ECSHelper::Command::Base
+
+  def cmd_option_parser
+    options = {}
+    parser = ::OptionParser.new do |opts|
+      opts.banner = "Usage: ecs_helper export_images"
+    end
+    [parser, options]
+  end
+
+  def required
+    []
+  end
+
+  def run
+    puts export_images
+  end
+
+  private
+
+  def project
+    helper.project
+  end
+
+  def application
+    helper.application
+  end
+
+  def export_images
+    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}"
+      "#{key}=#{value}"
+    end).join(' ')
+    variables
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - Artem Petrov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-13 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
@@ -51,45 +51,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.42'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: aws-sdk-ecrpublic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -110,26 +110,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: docker-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: terrapin
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +145,8 @@ files:
 - lib/ecs_helper/command/base.rb
 - lib/ecs_helper/command/build_and_push.rb
 - lib/ecs_helper/command/deploy.rb
+- lib/ecs_helper/command/ecr_login.rb
+- lib/ecs_helper/command/export_images.rb
 - lib/ecs_helper/common_helper.rb
 - lib/ecs_helper/logging.rb
 - lib/ecs_helper/service_helper.rb