ecs_helper 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d7e1d62103b4759b19005b1bc248f562749be0bc5f7c5b1b351d2e5a7874f8
-  data.tar.gz: 8d2d35ef50190a45ed9ea689485d43776026eef91c496a3353c200a42c50389f
+  metadata.gz: d9360d89edeb8333e9caf152cb45a4a1d6042c3f614ab0d6d5d45e8d6bcd6e61
+  data.tar.gz: b3d2c66d829a1cf4b35e0d9dd476427287770fd14beb4e28729cc263d58ec878
 SHA512:
-  metadata.gz: 4440e1cc6a9cec9f38e8ea485c86131ebdf15635464bf577b02cb6557b908f43a1769b5289b826815d9ad8282c14446677f6b478a1771ce82706beeb2ea4d04d
-  data.tar.gz: c4cf0985abb1934130d7ad7266554d4c30643de641e2f3e3bb3d7b625fe1eb0b9c5c88d70ff935f2e9663d1ddb65e8c3782069782c8b4dd8aafb06ffa6644901
+  metadata.gz: 20bc088dc9e4f3cbd8d04d83354faa39e3e319abcfe10335e0444fda5d755c32e883854f32a072c93f96129e98ba13b7d5dd53187a0b81dfc2cdcd3bc5bb8075
+  data.tar.gz: b588b0c7003c7e08afd46ce196b04cae8756c0c7b2ba3aafabbbc20c9a9e99ef319fc952d14f23a4bd9b19291714d20843149d86bb50371f689218868d5de4f3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ecs_helper (0.0.28)
+    ecs_helper (0.0.29)
       aws-sdk-ecr (~> 1.42, >= 1.42)
       aws-sdk-ecrpublic (~> 1.3, >= 1.3)
       aws-sdk-ecs (~> 1.80, >= 1.80)

data/Makefile

@@ -0,0 +1,30 @@
+.PHONY: test build bump-major bump-minor bump-patch help
+.DEFAULT_GOAL := test
+CURRENT_VERSION=$(shell bump current)
+NEXT_PATCH=$(shell bump show-next patch)
+NEXT_MINOR=$(shell bump show-next minor)
+NEXT_MAJOR=$(shell bump show-next major)
+GEM_VERSION=ecs_helper-${CURRENT_VERSION}.gem
+
+test: ## Run the unit tests
+	bundle exec rake --trace
+
+build: ## Build the ruby gem
+	gem build ecs_helper.gemspec
+
+push:
+	gem push ${GEM_VERSION}
+
+release:
+	bump set ${NEXT_PATCH}
+	make build
+	make push
+
+bump-major: ## Bump the major version (1.0.0 -> 2.0.0)
+	bump major
+
+bump-minor: ## Bump the minor version (0.1.0 -> 0.2.0)
+	bump minor
+
+bump-patch: ## Bump the patch version (0.0.1 -> 0.0.2)
+	bump patch

data/lib/ecs_helper/client.rb

@@ -56,6 +56,14 @@ class ECSHelper::Client
     ecs.describe_tasks(params).tasks
   end
 
+  def list_tasks(params = {})
+    ecs.list_tasks(params).task_arns
+  end
+
+  def execute_command(params = {})
+    ecs.execute_command(params)
+  end
+
   # ECR
   def private_repositories(params = {})
     ecr.describe_repositories(params).repositories

data/lib/ecs_helper/command/base.rb

@@ -22,6 +22,15 @@ class ECSHelper::Command::Base
     helper.project
   end
 
+  def check_bin(bin)
+    check_cmd = Terrapin::CommandLine.new("which #{bin}")
+    result = check_cmd.run
+    "success"
+  rescue Terrapin::CommandNotFoundError, Terrapin::ExitStatusError => e
+    messages = ["#{bin} not found"]
+    raise ECSHelper::Error::BinNotFound.new(messages)
+  end
+
   def application
     helper.application
   end
@@ -29,10 +38,12 @@ class ECSHelper::Command::Base
   def validate
     required.each do |r|
       value = options[r]
-      unless value
-        puts "'#{r}' required for command '#{type}'".light_white
-        puts option_parser.help
-        exit
+      if value.nil?
+        messages = [
+          "'#{r}' required for command '#{type}'".light_white,
+          option_parser.help
+        ]
+        raise ECSHelper::Error::CommandValidationError.new(messages)
       end
     end
   end

data/lib/ecs_helper/command/exec.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'terrapin'
+
+class ECSHelper::Command::Exec < ECSHelper::Command::Base
+  def cmd_option_parser
+    options = { command: 'bash -c' }
+    parser = ::OptionParser.new do |opts|
+      opts.banner = 'Usage: ecs_helper exec [options]. require session-manager-plugin and aws cli v2'
+      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', '--container VALUE', 'Cache image before build, default false') { |c| options[:container] = c }
+      opts.on('--command VALUE', 'Command to execute') { |c| options[:command] = c }
+    end
+    [parser, options]
+  end
+
+  def required
+    [:container]
+  end
+
+  def check_session_manager_plugin
+    check_bin('session-manager-plugin')
+  end
+
+  def check_aws_cli_version
+    check_cmd = Terrapin::CommandLine.new("aws --version")
+    result = check_cmd.run
+    version = parse_version(result)
+    if version === "1"
+      messages = [
+        "Exec command requires aws cli v2".light_white,
+        cmd_option_parser[0].help
+      ]
+      raise ECSHelper::Error::CommandValidationError.new(messages)
+    end
+  end
+
+  def check_aws_cli
+    check_bin('aws')
+    check_aws_cli_version
+    "success"
+  end
+
+
+  def check_aws_cli_version
+    check_cmd = Terrapin::CommandLine.new("aws --version")
+    result = check_cmd.run
+    version = parse_version(result)
+    if version === "1"
+      messages = [
+        "Exec command requires aws cli v2".light_white,
+        cmd_option_parser[0].help
+      ]
+      raise ECSHelper::Error::CommandValidationError.new(messages)
+    end
+  end
+
+  def run
+    log("Command", type)
+    log("Cluster", cluster_arn)
+    log("Service", service_arn)
+    log("Task", task_arn)
+    log("Options", options)
+    log("Check session-manager-plugin ", check_session_manager_plugin)
+    log("Check aws cli version", check_aws_cli)
+    exec
+  end
+
+  def exec
+    exec_cmd = Terrapin::CommandLine.new("aws ecs execute-command --cluster #{cluster_arn} --task #{task_arn}  --container=#{helper.options[:container]} --command=#{helper.options[:command]}  --interactive")
+    # --region us-east-1
+    exec_cmd.run
+  end
+
+  private
+
+  def parse_version(string)
+    string.split('/')[1][0]
+  end
+
+  def cluster_arn
+    helper.current_cluster
+  end
+
+  def service_arn
+    helper.current_service
+  end
+
+  def task_arn
+    @task_arn ||= helper.client.list_tasks({cluster: cluster_arn, service_name: service_arn, desired_status: "RUNNING"})[0]
+  end
+end

data/lib/ecs_helper/command.rb

@@ -5,6 +5,7 @@ class ECSHelper::Command
   autoload :Deploy, 'ecs_helper/command/deploy'
   autoload :ExportImages, 'ecs_helper/command/export_images'
   autoload :ECRLogin, 'ecs_helper/command/ecr_login'
+  autoload :Exec, 'ecs_helper/command/exec'
   autoload :RunCommand, 'ecs_helper/command/run_command'
   autoload :ExportEnvSecrets, 'ecs_helper/command/export_env_secrets'
 
@@ -15,6 +16,7 @@ class ECSHelper::Command
     "ecr_login" => ECRLogin,
     "run_command" => RunCommand,
     "export_env_secrets" => ExportEnvSecrets,
+    "exec" => Exec,
   }
   AVAILABLE_COMMANDS = CMD_MAPPING.keys
 

data/lib/ecs_helper/error/bin_not_found.rb

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

data/lib/ecs_helper/error/command_validation_error.rb

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

data/lib/ecs_helper/error.rb

@@ -3,4 +3,6 @@
 class ECSHelper::Error
   autoload :Base, 'ecs_helper/error/base'
   autoload :CommandNotFound, 'ecs_helper/error/command_not_found'
+  autoload :CommandValidationError, 'ecs_helper/error/command_validation_error'
+  autoload :BinNotFound, 'ecs_helper/error/bin_not_found'
 end

data/lib/ecs_helper/logging.rb

@@ -1,6 +1,6 @@
 module ECSHelper::Logging
   def console(message)
-    puts message if ENV["SKIP_LOGS"].nil?
+    puts message if ENV["SKIP_LOGS"] != 'true'
   end
 
   def log(title, message = nil, color = "light_white")

data/lib/ecs_helper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Artem Petrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -337,6 +337,7 @@ files:
 - Dockerfile
 - Gemfile
 - Gemfile.lock
+- Makefile
 - Rakefile
 - bin/console
 - bin/ecs_helper
@@ -350,13 +351,16 @@ 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/exec.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/bin_not_found.rb
 - lib/ecs_helper/error/command_not_found.rb
+- lib/ecs_helper/error/command_validation_error.rb
 - lib/ecs_helper/logging.rb
 - lib/ecs_helper/service_helper.rb
 - lib/ecs_helper/task_definition_helper.rb