ecs_helper 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d05ce978784d1c02d0f7efe1cc4ab9391e966cced3173da83d493c302986fd50
-  data.tar.gz: ce2fad2f9f61369ce063826779f11bb8c65396876ed1f90d7c6bf643fb135253
+  metadata.gz: a134e023494ab0c6d2ba533f5a377f2c9e0a1328239001e776b6523f27dcad80
+  data.tar.gz: 2fa77ec7e58de90005f3ebfbf099011adf4c22e2f3325a19d86ed01c7fb6be65
 SHA512:
-  metadata.gz: c6fed82da13e7462d2064620936d511005888393a66481f694523b841a02a90af566a83946366c4df5bddbc4e4107543bfaa5b442237a2bf923c67750643513c
-  data.tar.gz: e3d0eef470cc0fcf49ed895e53df0d692506c4f7178e8ab1225b1d239ddf21f987229a295cc5192a340d3b974c1fb3418c9bd8de1235845b9d13736e0b53479f
+  metadata.gz: 8b6eef42ab91d82356fd191d2175cc09ad44d68ad0f394ca933db747c23c0f0a1b28158a2f6104c0a1d661fd7c7cbf152d8f13659bb91efe6cefb2b7cce71ad8
+  data.tar.gz: 90a2aa25b21c4d33636663729c93c7724552730a575de445880326a36a8b762dc35c38f91a6c03a2054e4205030a6464e87060af2efa30591adf5f1e532d3525

data/.gitignore

@@ -0,0 +1,13 @@
+/.bundle
+
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+*.gem
+
+.aws
+.env
+tmp
+coverage/
+

data/Dockerfile

@@ -0,0 +1,15 @@
+FROM ruby:3.0.2-alpine3.12
+
+RUN apk update && apk upgrade
+RUN apk add bash
+RUN apk add curl-dev ruby-dev build-base git curl ruby-json openssl apache2-utils sqlite-libs sqlite sqlite-dev
+
+RUN mkdir -p /gem
+WORKDIR /gem
+
+COPY lib/ecs_helper/version.rb /gem/lib/ecs_helper/
+COPY ecs_helper.gemspec /gem/
+COPY Gemfile* /gem/
+RUN bundle install --jobs 4
+
+COPY . /gem

data/Gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+ruby '3.0.2'
+
+# Specify your gem's dependencies in kirpich.gemspec
+gemspec
+
+gem 'coveralls', require: false

data/Gemfile.lock

@@ -0,0 +1,126 @@
+PATH
+  remote: .
+  specs:
+    ecs_helper (0.0.21)
+      aws-sdk-ecr (~> 1.42, >= 1.42)
+      aws-sdk-ecrpublic (~> 1.3, >= 1.3)
+      aws-sdk-ecs (~> 1.80, >= 1.80)
+      colorize (~> 0.8, >= 0.8)
+      json (~> 2.5, >= 2.5)
+      rake
+      terrapin (~> 0.6, >= 0.6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    awesome_print (1.9.2)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.494.0)
+    aws-sdk-core (3.120.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-ecr (1.45.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ecrpublic (1.6.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ecs (1.85.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.3.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    byebug (11.1.3)
+    climate_control (0.2.0)
+    coderay (1.1.3)
+    colorize (0.8.1)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    crack (0.4.5)
+      rexml
+    docile (1.4.0)
+    hashdiff (1.0.1)
+    jmespath (1.4.0)
+    json (2.5.1)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    pry-inline (1.0.7)
+      pry (> 0.10.0)
+      unicode (~> 0.4.4)
+    public_suffix (4.0.6)
+    rainbow (3.0.0)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (1.20.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.9.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
+    rubocop-minitest (0.15.0)
+      rubocop (>= 0.90, < 2.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
+    thor (1.1.0)
+    tins (1.29.1)
+      sync
+    unicode (0.4.4.4)
+    unicode-display_width (2.0.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+
+PLATFORMS
+  x86_64-linux-musl
+
+DEPENDENCIES
+  awesome_print
+  coveralls
+  ecs_helper!
+  minitest
+  pry
+  pry-byebug
+  pry-inline
+  rubocop
+  rubocop-minitest
+  webmock
+
+RUBY VERSION
+   ruby 3.0.2p107
+
+BUNDLED WITH
+   2.2.22

data/Rakefile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task default: :test

data/bin/console

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'ecs_helper'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+require 'pry'
+Pry.start

data/bin/ecs_helper

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
+require 'bundler/setup'
 require 'ecs_helper'
 
 helper = ECSHelper.new
-helper.run
+helper.run

data/docker-compose.yml

@@ -0,0 +1,31 @@
+version: "3.7"
+
+services:
+  gem:
+    build: .
+    volumes:
+      - ./:/gem:cached
+      - ~/.ssh:/root/.ssh
+      - ~/.bash_history:/root/.bash_history
+      - ~/.pryrc:/root/.pryrc
+      - bundle_cache:/bundle_cache
+    environment:
+      - AWS_REGION
+      - AWS_DEFAULT_REGION
+      - AWS_ACCESS_KEY_ID
+      - AWS_SECRET_ACCESS_KEY
+      - AWS_SESSION_TOKEN
+      - AWS_SECURITY_TOKEN
+      - AWS_SESSION_EXPIRATION
+      - BUNDLE_PATH=/bundle_cache
+      - GEM_HOME=/bundle_cache
+      - GEM_PATH=/bundle_cache
+
+  bundle_cache:
+    image: busybox
+    volumes:
+      - bundle_cache:/bundle_cache
+
+volumes:
+  bundle_cache:
+  public:

data/ecs_helper.gemspec

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'ecs_helper/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'ecs_helper'
+  s.version     = ECSHelper::VERSION
+  s.summary     = 'ECSHelper'
+  s.description = 'A simple gem which make CI CD process easier for AWS ECS service'
+  s.authors     = ['Artem Petrov']
+  s.email       = 'artem.petrov@dualbootpartners.com'
+  s.files       = Dir['lib/**/*.rb']
+  s.bindir      = 'bin'
+  s.executables << 'ecs_helper'
+  s.homepage    = 'https://github.com/artempartos/ecs_helper'
+  s.license     = 'MIT'
+  s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.require_paths = ['lib']
+
+  s.add_development_dependency 'awesome_print'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency 'pry-inline'
+  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-minitest'
+  s.add_development_dependency 'webmock'
+
+  s.add_runtime_dependency 'aws-sdk-ecr', '~> 1.42', '>= 1.42'
+  s.add_runtime_dependency 'aws-sdk-ecrpublic', '~> 1.3', '>= 1.3'
+  s.add_runtime_dependency 'aws-sdk-ecs', '~> 1.80', '>= 1.80'
+  s.add_runtime_dependency 'colorize', '~> 0.8', '>= 0.8'
+  s.add_runtime_dependency 'json', '~> 2.5', '>= 2.5'
+  s.add_runtime_dependency 'terrapin', '~> 0.6', '>= 0.6'
+
+  s.add_dependency 'rake'
+end

data/lib/ecs_helper/command/build_and_push.rb

@@ -1,16 +1,29 @@
+# frozen_string_literal: true
+
 require 'terrapin'
 
 class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
-
   def cmd_option_parser
-    options = {}
+    options = { build_args: [] }
     parser = ::OptionParser.new do |opts|
-      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) }
-      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("-c", "--cache", "Cache image before build, default false") { options[:cache] = 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)') do |c|
+        options[:image] = processEqual(c)
+      end
+      opts.on('-d VALUE', '--directory VALUE', "Set directory for dockerfile and context, default = './'") do |c|
+        options[:directory] = processEqual(c)
+      end
+      opts.on('-p VALUE', '--project VALUE',
+              "Set project name, if not specified will look at ENV['PROJECT'], will be used to detect cluster") do |p|
+        options[:project] = processEqual(p)
+      end
+      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") do |a|
+        options[:application] = processEqual(a)
+      end
+      opts.on('-c', '--cache', 'Cache image before build, default false') { options[:cache] = true }
+      opts.on('--build-arg=VALUE', 'Pass --build-arg to the build command') { |o| options[:build_args] << o }
     end
     [parser, options]
   end
@@ -30,7 +43,7 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
   end
 
   def auth_private
-    auth_cmd = Terrapin::CommandLine.new("aws ecr get-login --no-include-email | sh")
+    auth_cmd = Terrapin::CommandLine.new('aws ecr get-login --no-include-email | sh')
     auth_cmd.run
   end
 
@@ -47,10 +60,12 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
 
   def build
     build_command = ["docker build #{directory}"]
+    build_args = options[:build_args].map { |a| "--build-arg=#{a}" }
     cache_command = should_cache? ? ["--cache-from #{latest_tag}"] : []
     tags_command = ["--tag #{latest_tag} --tag #{version_tag}"]
-    command = (build_command + cache_command + tags_command).join(' ')
+    command = (build_command + build_args + cache_command + tags_command).join(' ')
     build_cmd = Terrapin::CommandLine.new(command)
+
     puts "Building with two tags: #{latest_tag} & #{version_tag}"
     build_cmd.run
   end
@@ -67,7 +82,7 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
   end
 
   def directory
-    options[:directory] || "./"
+    options[:directory] || './'
   end
 
   def latest_tag
@@ -78,12 +93,10 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
     "#{repository}:#{helper.version}"
   end
 
-
   def repository
     @repository ||= begin
-      private_repos = client.private_repositories
-      public_repos = client.public_repositories
-      all = private_repos + public_repos
+      all = client.private_repositories
+
       with_name = all.select { |r| r.repository_arn.include?(image_name) }
       return with_name[0].repository_uri if with_name.length === 1
 
@@ -93,4 +106,4 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
       raise "Can't detect ECR repository"
     end
   end
-end
+end

data/lib/ecs_helper/command/export_images.rb

@@ -31,6 +31,7 @@ class ECSHelper::Command::ExportImages < ECSHelper::Command::Base
   def export_images
     variables = (['export'] + client.private_repositories.map do |repo|
       container_name = repo.repository_name.scan(/#{project}-#{application}-(.*)/).flatten.first
+      next if conainer_name.nil?
       key = container_name.upcase.gsub("-", "_") + "_IMAGE"
       value = "#{repo.repository_uri}:#{helper.version}"
       "#{key}=#{value}"

data/lib/ecs_helper/command.rb

@@ -48,25 +48,3 @@ def global_option_parser
     opts.banner = "Usage: ecs_helper command [options]"
   end
 end
-
-
-def self.parse
-  options = {}
-  command = ARGV.shift
-
-  unless command && Command::AVAILABLE_COMMANDS.include?(command)
-    puts "Command not found".light_white
-    puts "Available commands are #{Command::AVAILABLE_COMMANDS}".light_white
-    puts global
-    exit
-  end
-
-  subcommands_parser, required = subcommands(command, options)
-  subcommands_parser.permute!(into: options)
-
-  validate(command, options, required, subcommands_parser)
-
-  [command, options]
-end
-
-

data/lib/ecs_helper/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class ECSHelper
+  VERSION = '0.0.21'
+end

metadata

@@ -1,35 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Artem Petrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-ecs
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.80'
-    - - "~>"
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.80'
-  type: :runtime
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.80'
-    - - "~>"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.80'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-inline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
   requirement: !ruby/object:Gem::Requirement
@@ -71,25 +163,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.80'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.80'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.80'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.80'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +202,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: terrapin
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +242,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple gem which make CI CD process easier for AWS ECS service
 email: artem.petrov@dualbootpartners.com
 executables:
@@ -137,7 +263,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- Dockerfile
+- Gemfile
+- Gemfile.lock
+- Rakefile
+- bin/console
 - bin/ecs_helper
+- docker-compose.yml
+- ecs_helper.gemspec
 - lib/ecs_helper.rb
 - lib/ecs_helper/client.rb
 - lib/ecs_helper/cluster_helper.rb
@@ -152,6 +286,7 @@ files:
 - lib/ecs_helper/logging.rb
 - lib/ecs_helper/service_helper.rb
 - lib/ecs_helper/task_definition_helper.rb
+- lib/ecs_helper/version.rb
 homepage: https://github.com/artempartos/ecs_helper
 licenses:
 - MIT