ecs_helper 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3a8956a9f6eda0de978eae11de21c36ff09fd45c6c0a9c1df13ccd6b2bdba95
-  data.tar.gz: 40391c6c317e96687b9ad72ebcf03df0cdb0bb1b1a1fd381db720df7720d2801
+  metadata.gz: 30d1b2b206fb9bcb80cc9fe9bb35359dbc4de0123e0d2a7a4dff79aa37cadfe3
+  data.tar.gz: 5fc0e17c2bd9d3e07cd9aca28c453fe57f248e511f54838b4998f492a9b2729c
 SHA512:
-  metadata.gz: 497a68f0ae2b2e8cce1701b821195dc1f07f5a7a7a6f67b442abc59a4e69005ff5de067943037b63e5e4ec1f09e318b4ec3136a6b92f5b2ec92d3911be58199c
-  data.tar.gz: 1a01a3f9ca2b5c94fdd5a146b6cc3f41c6fa6b35620748068f9cbee3f10afc102f2dee0a32e5884007bb7f6cb7c6d02a9e72dfddcf1df1c0ddfd94fb2d831a5f
+  metadata.gz: 3d0484fc39baa8577017b0acb6ba1730bf6691e44893d2fa844495d9331dc37c4ca8a82e323e44f3d73d9bf0720459cbab23efb67328886a310a21754afe457b
+  data.tar.gz: be29a8a6547814bc3ec94e29bf97245ff0ea58812e44ef272347ccef9a185e53befe9cd3e9f85ebc65de503c4eb3a24c9676321df510c21fa6b8c885c4dd5fae

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,20 @@ 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 +79,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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Artem Petrov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-06-15 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