knuckle_cluster 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59963fda23e1d0884eac11bf2a2847143e401bdc
-  data.tar.gz: d928d2f5075505884aa89f32ebbdb62acd66b0a9
+  metadata.gz: a45740ee1e2f621c56a0797856e5e35b8c1a4f0a
+  data.tar.gz: 491c8b5a5cbea377eccd8398e50e06d437947fbe
 SHA512:
-  metadata.gz: ba13719e348fd5fa75ed0de38820e37e1629d3992c747e5a9d61a2f9ec71550923b3b1ce98671749b1bf329be615caa826a4f57fbafc1a40597312b3fa97791d
-  data.tar.gz: c42358f506487275be118c2654f58167fc0233a6c366c9ec39e1597e4bebcd691688cc17c0988310c1ede496dcbee305adf2af5778fd2237319627d911ab8350
+  metadata.gz: 4e4985e14bd91410df373307d0dea915e597946b8e5f5c6ecd94e194abf0cefda86d4431449323650563475a3a09cd6e9995345dab24f719414c8316981f35ca
+  data.tar.gz: 83a2963607d32e6ec4694512bcef3e1618113226c23454446b3ee00fa1e6e131b914983370df040496e980b190e921623157f42130ca1c0384be2e883bd43c61

data/README.md

@@ -89,6 +89,17 @@ default_platform: &default_platform
   ssh_username: ubuntu
   sudo: true
   aws_vault_profile: platform_super_user
+
+other_platform: &other_platform
+  region: us-east-1
+  bastion:
+    username: ubuntu
+    host: bastion.endpoint.example.com
+    rsa_key_location: ~/.ssh/bastion_rsa_key
+  rsa_key_location: ~/.ssh/platform_rsa_key
+  ssh_username: ubuntu
+  sudo: true
+  aws_vault_profile: platform_super_user
 ```
 
 See [Options for Knuckle Cluster](#options-for-knuckle-cluster) below for a list of what each option does.
@@ -191,7 +202,7 @@ cluster_name | The name of the cluster (not the ARN). eg 'my-super-cluster'. One
 spot_request_id | The spot request ID you are connecting to. eg 'sfr-abcdef'. One of `cluster_name`,`spot_request_id` or `asg_name` is required.
 asg_name | The auto-scaling group name you are connecting to. eg 'very-scaly-group'. One of `cluster_name`,`spot_request_id` or `asg_name` is required.
 region | The AWS region you would like to use. Defaults to `us-east-1`
-bastion | if you have a bastion to proxy to your ecs cluster via ssh, put the name of it here as defined in your `~/.ssh/config` file.
+bastion | if you have a bastion to proxy to your ecs cluster via ssh, put the name of it here as defined in your `~/.ssh/config` file.  Alternatively, this can be a collection of keys for `username`, `host`, and `rsa_key_location`
 rsa_key_location | The RSA key needed to connect to an ecs agent eg `~/.ssh/id_rsa`.
 ssh_username | The username to conncet. Will default to `ec2-user`
 sudo | true or false - will sudo the `docker` command on the target machine. Usually not needed unless the user is not a part of the `docker` group.

data/lib/knuckle_cluster/version.rb

@@ -1,3 +1,3 @@
 module KnuckleCluster
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/lib/knuckle_cluster.rb

@@ -189,7 +189,11 @@ module KnuckleCluster
       ip = bastion ? agent.private_ip : agent.public_ip
       command = "ssh #{ip} -l#{ssh_username}"
       command += " -i #{rsa_key_location}" if rsa_key_location
-      command += " -o ProxyCommand='ssh -qxT #{bastion} nc #{ip} 22'" if bastion
+      if bastion.is_a? String
+        command += " -o ProxyCommand='ssh -qxT #{bastion} nc #{ip} 22'"
+      elsif bastion.is_a? Hash
+        command += " -o Proxycommand='ssh -qxt #{bastion[:host]} -l#{bastion[:username]} -i #{bastion[:rsa_key_location]} nc #{ip} 22'"
+      end
       command += " -L #{port_forward}" if port_forward
       command += " -t \"#{subcommand}\"" if subcommand
       command

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knuckle_cluster
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Envato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler