knuckle_cluster 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a86619f9fb8211ea0f2ff5c7f63c376c518594
-  data.tar.gz: 63403a1079066e89441bc79add6434376014f39f
+  metadata.gz: 78dfb68000ce016055de2e6a637eba4ac1f0c1e5
+  data.tar.gz: 921123b27124c87bdfd3c3c7c31a7f7073db1e8a
 SHA512:
-  metadata.gz: 9bf7bf698d1c171c7f1d014c8776dd2d9bc66c98c2f85a964a05ae3d444c4a58fdb751c00de0ac135f59dcd4a3be902fb3d0db5ddde3978d9beb5149a508f530
-  data.tar.gz: d3d36dfe6b4681b99365393ca25705c93a999588428cdc2b0488e333da244c729de19abb9b6a78f01af04dde6bbda103a1338214f6d96c3e7a5ef759015e48e3
+  metadata.gz: ad430a1a5c47d5674c3dccf646c7dfe315618733680d1b2946f4391cb63e02b5097887335b52ffc88408470f31c4b1f6395ff2e1c49bbabaa0c5da760aa5c63b
+  data.tar.gz: 1f21a272f73cf5815c3e4eaed44e367c30df0f443feb89150634e63ae05173e523bbea14a996c937398d8b639ff6c202c9fdac3a20a3b9add941b94b161c0e17

data/bin/knuckle_cluster

@@ -12,6 +12,7 @@ if ARGV.count < 2
     knuckle_cluster CLUSTER_PROFILE CONTAINER_NAME [OPTIONAL COMMANDS] - connect to a container and start a shell or run a command
     knuckle_cluster CLUSTER_PROFILE SHORTCUT_NAME - run a shortcut defined in your knuckle_cluster configuration
     knuckle_cluster CLUSTER_PROFILE tunnel TUNNEL_NAME - open a tunnel defined in your knuckle_cluster configuration
+    knuckle_cluster CLUSTER_PROFILE scp [agent|container] source_file destination - copies a file from your local machine to a destaination container or agent
   USAGE
   exit
 end
@@ -35,6 +36,12 @@ elsif ARGV[1] == 'logs'
   kc.container_logs(name: ARGV[2])
 elsif ARGV[1] == 'tunnel'
   kc.open_tunnel(name: ARGV[2])
+elsif ARGV[1] == 'scp'
+  if ARGV[2] == 'agent'
+    kc.scp_to_agent(source: ARGV[3], destination: ARGV[4])
+  elsif ARGV[2] == 'container'
+    kc.scp_to_container(source: ARGV[3], destination: ARGV[4])
+  end
 else
   command = ARGV.drop(2)
   if command.any?

data/lib/knuckle_cluster.rb

@@ -68,6 +68,27 @@ module KnuckleCluster
       run_command_in_container(container: container, command: command)
     end
 
+    def scp_to_agent(source:, destination:, agent: nil)
+      agent ||= select_agent
+      target_ip = bastion ? agent.private_ip : agent.public_ip
+      command = generate_scp_connection_string(agent: agent)
+      command += " #{source}"
+      command += " #{ssh_username}@#{target_ip}:#{destination}"
+      system(command)
+      puts "Done!"
+    end
+
+    def scp_to_container(source:, destination:)
+      container = select_container
+      agent     = container.task.agent
+      tmp_destination_file = '~/tmp_kc.tmp'
+      scp_to_agent(source: source, agent: agent, destination: tmp_destination_file)
+      container_id = get_container_id_command(container.name)
+      subcommand = "#{'sudo ' if sudo}docker cp #{tmp_destination_file} \\`#{container_id}\\`:#{destination} && rm #{tmp_destination_file}"
+      run_command_in_agent(agent: agent, command: subcommand)
+      puts "Done!"
+    end
+
     def container_logs(name:)
       container = find_container(name: name)
       subcommand = "#{'sudo ' if sudo}docker logs -f \\`#{get_container_id_command(container.name)}\\`"
@@ -89,7 +110,7 @@ module KnuckleCluster
                 :region, :bastion, :rsa_key_location, :ssh_username,
                 :sudo, :aws_vault_profile, :shortcuts, :tunnels
 
-    def select_agent(auto:)
+    def select_agent(auto: false)
       return agents.first if auto
 
       puts "\nListing Agents"
@@ -100,7 +121,7 @@ module KnuckleCluster
       agents[STDIN.gets.strip.to_i - 1]
     end
 
-    def select_container(auto:)
+    def select_container(auto: false)
       return containers.first if auto
 
       puts "\nListing Containers"
@@ -182,6 +203,14 @@ module KnuckleCluster
       end
     end
 
+    def generate_scp_connection_string(agent:)
+      ip = bastion ? agent.private_ip : agent.public_ip
+      command = "scp"
+      command += " -i #{rsa_key_location}" if rsa_key_location
+      command += " -o ProxyCommand='ssh -qxT #{bastion} nc #{ip} 22'" if bastion
+      command
+    end
+
     def generate_connection_string(agent:, subcommand: nil, port_forward: nil)
       ip = bastion ? agent.private_ip : agent.public_ip
       command = "ssh #{ip} -l#{ssh_username}"

data/lib/knuckle_cluster/version.rb

@@ -1,3 +1,3 @@
 module KnuckleCluster
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knuckle_cluster
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Envato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Handy cluster tool