ecs_cmd 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a57e9187e720bc1b0d82d6fb1509f0f4fcb70bf593b18838d46d2966b0d8d8
-  data.tar.gz: 3934d820b3a774b45cc675c4b1f7fc36f9d0fdf35d71f617c00ea57e05679fcd
+  metadata.gz: 364c2ce1e5efde7c1b03633a2a49538bb3e67a8b7a144ae7f64fe0cd6bf01237
+  data.tar.gz: acb50a84aa34496a6cead40dac6e6eac938685b59ce6d0fdf1dee7a48de065e2
 SHA512:
-  metadata.gz: b3de007e28f83c6d76db7834e28a141ad1162754f458137397e91d362e172970ce7d4c5679338fc3ef60cf3235ad75fbd3867eb9f757e25361835016eb9c028a
-  data.tar.gz: ed7906caeb48818e79729374ebf355da530b5f8a49f6631cf7babdd1caff7aa9ea2ab38ed693dead570ffe62e8ab6987cab587441e5ae165bc3f980d9ed7de3d
+  metadata.gz: 499703cbf2f95e27647ed1f735523aade77009bf078161151dc4609d53ebd3551cddf87ae0d4cb530f63d5397276405caef17c6ed14060e1500bfb74bf460604
+  data.tar.gz: 84b96c418ac4fe57931185e3f032b5612fddb95b13b11e4c8b25fdb1672babc81f2af94837733f2b42651755ac9f5f89644cc431f027e5739f417e67a7f6f321

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+.vscode
 
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    ecs_cmd (0.1.2)
+    ecs_cmd (0.1.3)
+      aws-sdk-ec2
       aws-sdk-ecs
       gli (= 2.17.1)
       terminal-table
@@ -10,14 +11,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.1)
-    aws-partitions (1.100.0)
-    aws-sdk-core (3.24.1)
+    aws-partitions (1.103.0)
+    aws-sdk-core (3.27.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ecs (1.17.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-ec2 (1.45.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-ecs (1.19.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)
     coderay (1.1.2)

data/bin/ecs-cmd

@@ -11,7 +11,7 @@ subcommand_option_handling :normal
 arguments :strict
 
 desc 'Set the aws region'
-default_value 'us-east-1'
+default_value ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
 arg_name 'region'
 flag %i[r region]
 
@@ -73,6 +73,57 @@ command :'run-task' do |c|
   end
 end
 
+desc 'SSH into Host Task is Running On'
+command :ssh do |c|
+  c.flag %i[c cluster], desc: 'cluster name', arg_name: 'cluster', required: true
+  c.flag %i[s service], desc: 'service name', arg_name: 'service', required: true
+  c.action do |global_options, options, args|
+    ip = EcsCmd::Service.new(options[:c], options[:s], global_options[:region]).container_instance_ips[0]
+    puts "opening ssh connection to  #{ip}"
+    EcsCmd::Exec.ssh(ip)
+  end
+end
+
+desc 'Execute a Command Within a Service\'s Container'
+arg_name 'command', :required
+command :exec do |c|
+  c.flag %i[c cluster], desc: 'cluster name', arg_name: 'cluster', required: true
+  c.flag %i[s service], desc: 'service name', arg_name: 'service', required: true
+  c.action do |global_options, options, args|
+    service = EcsCmd::Service.new(options[:c], options[:s], global_options[:region])
+    ip = service.container_instance_ips[0]
+    task_family = service.task_family
+    command = args.join(' ')
+    EcsCmd::Exec.execute(task_family, ip, command)
+  end
+end
+
+desc "Open a Shell Inside a Service's Container"
+command 'shell' do |c|
+  c.flag %i[c cluster], desc: 'cluster name', arg_name: 'cluster', required: true
+  c.flag %i[s service], desc: 'service name', arg_name: 'service', required: true
+  c.switch %i[sh], desc: 'use sh instead of bash', default_value: false
+  c.action do |global_options, options, args|
+    service = EcsCmd::Service.new(options[:c], options[:s], global_options[:region])
+    ip = service.container_instance_ips[0]
+    task_family = service.task_family
+    shell = options[:sh] ? 'sh' : 'bash'
+    EcsCmd::Exec.shell(task_family, ip, shell)
+  end
+end
+
+desc "Tail Logs From a Service's Container"
+command 'logs' do |c|
+  c.flag %i[c cluster], desc: 'cluster name', arg_name: 'cluster', required: true
+  c.flag %i[s service], desc: 'service name', arg_name: 'service', required: true
+  c.flag %i[l lines], desc: 'number of historical lines to tail', arg_name: 'lines', default_value: 30, required: false
+  c.action do |global_options, options, args|
+    service = EcsCmd::Service.new(options[:c], options[:s], global_options[:region])
+    ip = service.container_instance_ips[0]
+    task_family = service.task_family
+    EcsCmd::Exec.logs(task_family, ip, options[:lines])
+  end
+end
 # desc 'Describe complete here'
 # arg_name 'Describe arguments to complete here'
 # command :complete do |c|

data/ecs_cmd.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.bindir = 'bin'
   spec.executables << 'ecs-cmd'
   spec.require_paths = ['lib']
+  spec.add_runtime_dependency 'aws-sdk-ec2'
   spec.add_runtime_dependency 'aws-sdk-ecs'
   spec.add_runtime_dependency 'gli', '2.17.1'
   spec.add_runtime_dependency 'terminal-table'

data/lib/ecs_cmd/exec.rb

@@ -0,0 +1,46 @@
+require 'aws-sdk-ec2'
+require 'aws-sdk-ecs'
+require 'open3'
+require 'shellwords'
+
+module EcsCmd
+  module Exec
+    class << self
+      # move this to a config
+      def ssh_cmd(ip)
+        cmd = 'ssh -tt -o StrictHostKeyChecking=no '
+        cmd << ip.to_s
+      end
+
+      def ssh(ip)
+        exec(ssh_cmd(ip))
+      end
+
+      # used to run arbitrary command inside a container
+      def execute(task_family, ip, command)
+        cmd = "docker exec -i -t `#{docker_ps_task(task_family)}` #{command}"
+        Open3.popen2e(ssh_cmd(ip) + " '#{cmd}' ") do |stdin, stdout, stderr, status_thread|
+          stdout.each_line do |line|
+            puts line
+          end
+        end
+      end
+
+      # used to open a shell within a container?
+      def shell(task_family, ip, shell='bash')
+        cmd = "docker exec -i -t `#{docker_ps_task(task_family)}` #{shell}"
+        exec(ssh_cmd(ip) + " '#{cmd}' ")
+      end
+
+      def logs(task_family, ip, lines)
+        cmd = "docker logs -f --tail=#{lines} `#{docker_ps_task(task_family)}`"
+        exec(ssh_cmd(ip) + " '#{cmd}' ")
+      end
+
+      # docker ps command to get container id
+      def docker_ps_task(task_family)
+        "docker ps -n 1 -q --filter name=#{Shellwords.shellescape(task_family)}"
+      end
+    end
+  end
+end

data/lib/ecs_cmd/service.rb

@@ -1,10 +1,14 @@
 require 'aws-sdk-ecs'
+require 'aws-sdk-ec2'
 require 'terminal-table'
 
 module EcsCmd
   class Service
     def initialize(cluster, name, region)
       @client = Aws::ECS::Client.new(region: region)
+      @ec2_client = Aws::EC2::Client.new(region: region)
+      @cluster = cluster
+      @name = name
       @service_stats = @client.describe_services(cluster: cluster, services: [name])[0]
       raise 'service does not appear to exist' if @service_stats.empty?
     end
@@ -30,7 +34,7 @@ module EcsCmd
         t << ['updated at', e['updated_at']]
         t << ["\n"]
       end
-      table = Terminal::Table.new headings: ['DEPLOYMENTS'], rows: t
+      table = Terminal::Table.new headings: ['DEPLOYMENTS', ''], rows: t
       table
     end
 
@@ -54,6 +58,50 @@ module EcsCmd
       @service_stats[0]['task_definition']
     end
 
+    def task_family
+      # known issue, won't work with / in task family names
+      # TODO: improve this later
+      @service_stats[0]['task_definition'].split('/')[1].split(':')[0]
+    end
+
+    def tasks
+      @client.list_tasks(cluster: @cluster, service_name: @name)[0]
+    end
+
+    def container_instances
+      instances = []
+      @client.describe_tasks(cluster: @cluster, tasks: tasks)[0].each do |e|
+        instances << e[:container_instance_arn]
+      end
+      instances
+    end
+
+    def container_instance_id(arn)
+      instance = [arn.to_s]
+      @client.describe_container_instances(cluster: @cluster, container_instances: instance)[0][0][:ec2_instance_id]
+    end
+
+    def container_instance_ids
+      ids = []
+      @client.describe_container_instances(cluster: @cluster, container_instances: container_instances)[0].each do |e|
+        ids << e[:ec2_instance_id]
+      end
+      ids.uniq
+    end
+
+    def container_instance_ip(instance_id)
+      id = [instance_id]
+      @ec2_client.describe_instances(instance_ids: id)[:reservations][0][:instances][0][:private_ip_address]
+    end
+
+    def container_instance_ips
+      ips = []
+      @ec2_client.describe_instances(instance_ids: container_instance_ids)[:reservations][0][:instances].each do |e|
+        ips << e[:private_ip_address]
+      end
+      ips
+    end
+
     def health_check_grace_period
       @service_stats[0]['health_check_grace_period_seconds']
     end
@@ -68,6 +116,15 @@ module EcsCmd
       @service_stats[0]['service_name']
     end
 
+    def list_container_instances
+      t = []
+      container_instances.each do |e|
+        t << [container_instance_id(e), container_instance_ip(container_instance_id(e))]
+      end
+      table = Terminal::Table.new headings: ['INSTANCE ID', 'IP'], rows: t
+      table
+    end
+
     def list_service
       row1 = []
       row1 << [name, status, running_count, desired_count, pending_count,
@@ -80,6 +137,7 @@ module EcsCmd
       table2 = Terminal::Table.new headings: ['TASK DEFINITION'], rows: row2
       puts table1
       puts table2
+      puts list_container_instances
       puts deployments
     end
   end

data/lib/ecs_cmd/version.rb

@@ -1,3 +1,3 @@
 module EcsCmd
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/ecs_cmd.rb

@@ -1,5 +1,6 @@
 require 'ecs_cmd/version'
 require 'ecs_cmd/clusters.rb'
+require 'ecs_cmd/exec.rb'
 require 'ecs_cmd/run_task.rb'
 require 'ecs_cmd/services.rb'
 require 'ecs_cmd/service.rb'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ecs_cmd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Daniel Schaaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ec2
+  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'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +146,7 @@ files:
 - ecs_cmd.gemspec
 - lib/ecs_cmd.rb
 - lib/ecs_cmd/clusters.rb
+- lib/ecs_cmd/exec.rb
 - lib/ecs_cmd/run_task.rb
 - lib/ecs_cmd/service.rb
 - lib/ecs_cmd/services.rb