ecs_helper 0.0.24 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94ec8bc777deff0ff480a06146d0ba2279e43cb69ee8022298ddb1205c97ac12
-  data.tar.gz: d9ecf4394985744a91936dfba1c08c245e889297c1ba8c70153b7a6f82d080a8
+  metadata.gz: d7d7e1d62103b4759b19005b1bc248f562749be0bc5f7c5b1b351d2e5a7874f8
+  data.tar.gz: 8d2d35ef50190a45ed9ea689485d43776026eef91c496a3353c200a42c50389f
 SHA512:
-  metadata.gz: c043ec8866cdc97ddea947ef173299cd0bf5664eb9c2e9fbc7a5ecb6dff0d93f8321a9ea15bf99a73f1ad688d613f933a6996920598ad7c34bfa398295189a35
-  data.tar.gz: 3f853cb33f3d091367210e1a08fe1dcf0594cde62d4c490213ae85035b475970a815228817d43c50efa6e7cc30b582a2ecdfb817ffe9fb617bc72b44f5dd00aa
+  metadata.gz: 4440e1cc6a9cec9f38e8ea485c86131ebdf15635464bf577b02cb6557b908f43a1769b5289b826815d9ad8282c14446677f6b478a1771ce82706beeb2ea4d04d
+  data.tar.gz: c4cf0985abb1934130d7ad7266554d4c30643de641e2f3e3bb3d7b625fe1eb0b9c5c88d70ff935f2e9663d1ddb65e8c3782069782c8b4dd8aafb06ffa6644901

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    ecs_helper (0.0.23)
+    ecs_helper (0.0.28)
       aws-sdk-ecr (~> 1.42, >= 1.42)
       aws-sdk-ecrpublic (~> 1.3, >= 1.3)
       aws-sdk-ecs (~> 1.80, >= 1.80)
+      aws-sdk-ssm (~> 1.0.0.rc7)
       colorize (~> 0.8, >= 0.8)
       json (~> 2.5, >= 2.5)
       terrapin (~> 0.6, >= 0.6)
@@ -17,13 +18,13 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.496.0)
+    aws-partitions (1.503.0)
     aws-sdk-core (3.121.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-ecr (1.46.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecrpublic (1.6.0)
@@ -32,8 +33,12 @@ GEM
     aws-sdk-ecs (1.85.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
+    aws-sdk-ssm (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    bump (0.10.0)
     byebug (11.1.3)
     climate_control (0.2.0)
     coderay (1.1.3)
@@ -45,9 +50,14 @@ GEM
     json (2.5.1)
     method_source (1.0.0)
     minitest (5.14.4)
+    minitest-power_assert (0.3.1)
+      minitest
+      power_assert (>= 1.1)
+    mocha (1.13.0)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
+    power_assert (2.0.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -86,13 +96,17 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
-  x86_64-linux-musl
+  x86_64-darwin-18
+  x86_64-linux
 
 DEPENDENCIES
   awesome_print
+  bump
   bundler (~> 2.2)
   ecs_helper!
   minitest
+  minitest-power_assert
+  mocha
   pry
   pry-byebug
   pry-inline
@@ -102,4 +116,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.22
+   2.2.27

data/bin/ecs_helper

@@ -3,5 +3,10 @@
 
 require 'ecs_helper'
 
-helper = ECSHelper.new
-helper.run
+begin
+  helper = ECSHelper.new
+  helper.run
+rescue ECSHelper::Error::Base => e
+  puts e.message
+  exit 1
+end

data/docker-compose.yml

@@ -20,6 +20,7 @@ services:
       - BUNDLE_PATH=/bundle_cache
       - GEM_HOME=/bundle_cache
       - GEM_PATH=/bundle_cache
+      - SKIP_LOGS=true
 
   bundle_cache:
     image: busybox

data/ecs_helper.gemspec

@@ -21,12 +21,15 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'mocha'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'minitest-power_assert'
   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_development_dependency 'bump'
 
   s.add_development_dependency "bundler", "~> 2.2"
   s.add_development_dependency "rake"
@@ -34,6 +37,7 @@ Gem::Specification.new do |s|
   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 'aws-sdk-ssm', '~> 1.0.0.rc7'
   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'

data/lib/ecs_helper/client.rb

@@ -1,13 +1,13 @@
 require 'aws-sdk-ecs'
 require 'aws-sdk-ecr'
-require 'aws-sdk-ecrpublic'
+require 'aws-sdk-ssm'
 
 class ECSHelper::Client
-  attr_accessor :ecs, :ecr, :ecr_public
+  attr_accessor :ecs, :ecr, :ssm
   def initialize
     @ecs = Aws::ECS::Client.new
     @ecr = Aws::ECR::Client.new
-    @ecr_public = Aws::ECRPublic::Client.new
+    @ssm = Aws::SSM::Client.new
   end
 
   # ECS
@@ -61,11 +61,12 @@ class ECSHelper::Client
     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
+
+  # SSM
+  def get_ssm_parameters(params = {})
+    ssm.get_parameters(params).parameters
+  end
 end

data/lib/ecs_helper/command/base.rb

@@ -6,6 +6,7 @@ class ECSHelper::Command::Base
   include ECSHelper::Logging
   attr_accessor :type, :options, :helper, :client, :option_parser
 
+
   def initialize(helper)
     @client = helper.client
     @helper = helper
@@ -17,6 +18,14 @@ class ECSHelper::Command::Base
     helper.type
   end
 
+  def project
+    helper.project
+  end
+
+  def application
+    helper.application
+  end
+
   def validate
     required.each do |r|
       value = options[r]
@@ -28,12 +37,16 @@ class ECSHelper::Command::Base
     end
   end
 
-  private
-
   def required
     []
   end
 
+  def printable?
+    false
+  end
+
+  private
+
   def processEqual(value)
     value.start_with?('=') ? value[1..-1] : value
   end

data/lib/ecs_helper/command/build_and_push.rb

@@ -55,7 +55,7 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
     pull_cmd = Terrapin::CommandLine.new("docker pull #{latest_tag}")
     pull_cmd.run
   rescue Terrapin::ExitStatusError => e
-    puts e.message
+    console e.message
   end
 
   def build
@@ -66,7 +66,7 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
     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}"
+    console "Building with two tags: #{latest_tag} & #{version_tag}"
     build_cmd.run
   end
 
@@ -93,6 +93,14 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
     "#{repository}:#{helper.version}"
   end
 
+  def project
+    helper.project
+  end
+
+  def application
+    helper.application
+  end
+
   def repository
     @repository ||= begin
       all = client.private_repositories

data/lib/ecs_helper/command/export_env_secrets.rb

@@ -0,0 +1,51 @@
+require 'terrapin'
+
+class ECSHelper::Command::ExportEnvSecrets < ECSHelper::Command::Base
+  attr_accessor :params
+
+  def cmd_option_parser
+    options = {
+      env_vars: []
+    }
+    parser = ::OptionParser.new do |opts|
+      opts.banner = "Usage: ecs_helper export_env_secrets"
+      opts.on('-n', '--name=VARIABLE', '') { |o| options[:env_vars] << o }
+    end
+    [parser, options]
+  end
+
+  def required
+    []
+  end
+
+  def printable?
+    true
+  end
+
+  def run
+    return log("No ENV secrets to export. Please pass ENV variables names using -n") if options[:env_vars].empty?
+    export_values
+  end
+
+  private
+
+  def to_aws_ssm_name(name)
+    "/#{helper.project}-#{helper.application}-#{helper.environment}/#{name}"
+  end
+
+  def export_values
+    params_name = options[:env_vars].map {|var_name| to_aws_ssm_name(var_name)}
+    aws_ssm_params = client.get_ssm_parameters(names: params_name, with_decryption: true)
+
+    variables = (['export'] + aws_ssm_params.map do |aws_ssm_param|
+      next if aws_ssm_param.empty?
+      value = aws_ssm_param.value
+      name = aws_ssm_param.name.split('/').last
+
+      "#{name}=#{value}"
+    rescue Aws::SSM::Errors::ParameterNotFound
+      next
+    end).join(' ')
+    variables
+  end
+end

data/lib/ecs_helper/command/export_images.rb

@@ -14,8 +14,12 @@ class ECSHelper::Command::ExportImages < ECSHelper::Command::Base
     []
   end
 
+  def printable?
+    true
+  end
+
   def run
-    puts export_images
+    export_images
   end
 
   private

data/lib/ecs_helper/command.rb

@@ -6,6 +6,7 @@ class ECSHelper::Command
   autoload :ExportImages, 'ecs_helper/command/export_images'
   autoload :ECRLogin, 'ecs_helper/command/ecr_login'
   autoload :RunCommand, 'ecs_helper/command/run_command'
+  autoload :ExportEnvSecrets, 'ecs_helper/command/export_env_secrets'
 
   CMD_MAPPING  = {
     "build_and_push" => BuildAndPush,
@@ -13,6 +14,7 @@ class ECSHelper::Command
     "export_images" => ExportImages,
     "ecr_login" => ECRLogin,
     "run_command" => RunCommand,
+    "export_env_secrets" => ExportEnvSecrets,
   }
   AVAILABLE_COMMANDS = CMD_MAPPING.keys
 
@@ -26,10 +28,12 @@ class ECSHelper::Command
 
   def klass
     CMD_MAPPING[type] || begin
-      puts "Command not found".light_white
-      puts "Available commands are #{AVAILABLE_COMMANDS}".light_white
-      puts global_option_parser
-      exit
+      messages = [
+        "Command not found".light_white,
+        "Available commands are #{AVAILABLE_COMMANDS}".light_white,
+        global_option_parser
+      ]
+      raise ECSHelper::Error::CommandNotFound.new(messages)
     end
   end
 
@@ -39,7 +43,9 @@ class ECSHelper::Command
 
   def run
     command.validate
-    command.run
+    result = command.run
+    puts result if command.printable?
+    result
   end
 end
 

data/lib/ecs_helper/error/base.rb

@@ -0,0 +1,10 @@
+class ECSHelper::Error::Base < StandardError
+  def initialize(builder)
+    @builder = builder
+  end
+
+  def message
+    return @builder.join("\n") if @builder
+    "Failed"
+  end
+end

data/lib/ecs_helper/error/command_not_found.rb

@@ -0,0 +1,2 @@
+class ECSHelper::Error::CommandNotFound < ECSHelper::Error::Base
+end

data/lib/ecs_helper/error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class ECSHelper::Error
+  autoload :Base, 'ecs_helper/error/base'
+  autoload :CommandNotFound, 'ecs_helper/error/command_not_found'
+end

data/lib/ecs_helper/logging.rb

@@ -1,16 +1,20 @@
 module ECSHelper::Logging
+  def console(message)
+    puts message if ENV["SKIP_LOGS"].nil?
+  end
+
   def log(title, message = nil, color = "light_white")
     if message
-      puts title.send(color)
-      puts message
+      console title.send(color)
+      console message
     else
-      puts title
+      console title
     end
   end
 
   def error(message, code = 1)
-    puts "Error".red
-    puts message
+    console "Error".red
+    console message
     exit code
   end
 end

data/lib/ecs_helper/version.rb

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

data/lib/ecs_helper.rb

@@ -11,6 +11,7 @@ class ECSHelper
   autoload :ClusterHelper, 'ecs_helper/cluster_helper'
   autoload :ServiceHelper, 'ecs_helper/service_helper'
   autoload :TaskDefinitionHelper, 'ecs_helper/task_definition_helper'
+  autoload :Error, 'ecs_helper/error'
   autoload :Command, 'ecs_helper/command'
 
   def_delegators :client, :task_definitions, :clusters, :services, :tasks, :repositories, :repositories, :task_definition, :run_task

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.28
 platform: ruby
 authors:
 - Artem Petrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  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
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-power_assert
+  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-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +252,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.80'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ssm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc7
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -294,9 +350,13 @@ files:
 - 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_env_secrets.rb
 - lib/ecs_helper/command/export_images.rb
 - lib/ecs_helper/command/run_command.rb
 - lib/ecs_helper/common_helper.rb
+- lib/ecs_helper/error.rb
+- lib/ecs_helper/error/base.rb
+- lib/ecs_helper/error/command_not_found.rb
 - lib/ecs_helper/logging.rb
 - lib/ecs_helper/service_helper.rb
 - lib/ecs_helper/task_definition_helper.rb