opsicle 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f8bc9ead683ab1997fd4fb96b7f348c67dad1df
-  data.tar.gz: f0f6bf0fdc3cd66f04db2dbaa64938393fd4b3db
+  metadata.gz: bfb0c5b2df559b5e304081b7873a6b2a1cb54056
+  data.tar.gz: 003e30c1669eaa33aca7fe4c98d9442099c30e4d
 SHA512:
-  metadata.gz: a5ddb67d3098dd6007e5f80900397ffc014c2c9b61aba164c448078300aa2eaf0a64027d6418a51f957919dd022a0631d7c96994bcec67e2ad2026fceaff50ca
-  data.tar.gz: eace20aaf2d5bbb4ecffd5e5680b40f886c80d309e9726eb4056416872bf0d1579a7bf5a650e4c29e0650fc66bcd36f96c588a4263694f08901f3bcdae3ad9a3
+  metadata.gz: d94244b39e85e12301faa568330dae5a22fb937397fd55acee3f57fa0843e220d3bad89c1b3f45e08805dda16e609efd9d38a7792078ef5b313189242ddbf14c
+  data.tar.gz: d46d043f5ef64d3f74580cb9645a6b733533dc49323922f16f51bdb8acd523e2711e63aef8ce4b47c71db5be0dd7edff72cccfd2d19e1573148b75791067746d

data/lib/opsicle/commands/ssh.rb

@@ -42,6 +42,23 @@ module Opsicle
       @user_profile.ssh_username
     end
 
+    def bastion_ip
+      if client.config.opsworks_config[:bastion_layer_id]
+        online_bastions = client.api_call(
+          :describe_instances, {layer_id: client.config.opsworks_config[:bastion_layer_id] }
+        )[:instances].select { |instance| instance[:status].to_s == 'online'}
+        bastion_ip = online_bastions.sample[:public_ip]
+        Output.say "Connecting via bastion with IP #{bastion_ip}"
+        bastion_ip
+      elsif client.config.opsworks_config[:bastion_hostname]
+        bastion_hostname = client.config.opsworks_config[:bastion_hostname]
+        Output.say "Connecting via bastion with hostname '#{bastion_hostname}'"
+        bastion_hostname
+      else
+        false
+      end
+    end
+
     def ssh_ip(instance)
       if client.config.opsworks_config[:internal_ssh_only]
         Output.say "This stack requires a private connection, only using internal IPs."
@@ -54,10 +71,11 @@ module Opsicle
     def ssh_command(instance, options={})
       ssh_command = " \"#{options[:"ssh-cmd"].gsub(/'/){ %q(\') }}\"" if options[:"ssh-cmd"] #escape single quotes
       ssh_options = options[:"ssh-opts"] ? "#{options[:"ssh-opts"]} " : ""
+      external_ip = bastion_ip || public_ips.sample
       if instance_ip = ssh_ip(instance)
         ssh_string = "#{ssh_username}@#{instance_ip}"
       else
-        ssh_string = "#{ssh_username}@#{public_ips.sample} ssh #{instance[:private_ip]}"
+        ssh_string = "#{ssh_username}@#{external_ip} ssh #{instance[:private_ip]}"
         ssh_options.concat('-A -t ')
       end
 

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.4.1"
+  VERSION = "2.5.0"
 end

data/spec/opsicle/commands/ssh_spec.rb

@@ -120,6 +120,30 @@ module Opsicle
       end
     end
 
+    context "#bastion_ip" do
+      let(:instance) { { hostname: "host1", elastic_ip: "123.123.123.123", public_ip: "123.345.567.789", private_ip: "10.10.10.10" } }
+      context "when bastion_layer_id is enabled" do
+        let(:client) { double(config: double(opsworks_config: {stack_id: "1234", bastion_layer_id: "4321"})) }
+        it "returns a Bastion IP" do
+          expect(client).to receive(:api_call).with(:describe_instances, {layer_id: "4321"})
+            .and_return(instances: [{:hostname => "taco", :status => "stopped", :public_ip => "123.123.123.123"},{:hostname => "bar", :status => "online", :public_ip => "213.213.213.213"}])
+          expect(Output).to receive(:say).with("Connecting via bastion with IP 213.213.213.213")
+          expect(subject.bastion_ip).to eq("213.213.213.213")
+        end
+      end
+      context "when bastion_hostname is enabled" do
+        let(:client) { double(config: double(opsworks_config: {stack_id: "1234", bastion_hostname: "sebastion"})) }
+        it "returns the hostname of the bastion host" do
+          expect(subject.bastion_ip).to eq("sebastion")
+        end
+      end
+      context "when bastion is not used" do
+        it "returns false" do
+          expect(subject.bastion_ip).to eq(false)
+        end
+      end
+    end
+
     context "#ssh_ip" do
       let(:instance) { { hostname: "host1", elastic_ip: "123.123.123.123", public_ip: "123.345.567.789", private_ip: "10.10.10.10" } }
       context "when internal_ssh_only is enabled" do
@@ -165,12 +189,42 @@ module Opsicle
       it "creates the proper ssh_command for an instance with a private ip" do
         expect(subject.ssh_command({private_ip: "789.789.789.789" })).to eq("ssh -A -t mrderpyman2014@123.123.123.123 ssh 789.789.789.789")
       end
-      it "properly adds ssh options to the ssh_command for an isntance with a public ip" do
+      it "properly adds ssh options to the ssh_command for an instance with a public ip" do
         expect(subject.ssh_command({elastic_ip: "123.123.123.123" }, { :"ssh-opts" => "-c"})).to eq("ssh -c mrderpyman2014@123.123.123.123")
       end
-      it "properly adds ssh options to the ssh_command for an isntance with a private ip" do
+      it "properly adds ssh options to the ssh_command for an instance with a private ip" do
         expect(subject.ssh_command({private_ip: "789.789.789.789"}, { :"ssh-opts" => "-c"} )).to eq("ssh -c -A -t mrderpyman2014@123.123.123.123 ssh 789.789.789.789")
       end
+      context "when bastion_layer_id is enabled" do
+        let(:client) { double(config: double(opsworks_config: {stack_id: "1234", bastion_layer_id: "4321"})) }
+        it "creates the proper ssh_command for an instance with a private ip" do
+          expect(client).to receive(:api_call).with(:describe_instances, {layer_id: "4321"})
+            .and_return(instances: [
+                        {:hostname => "taco", :status => "stopped", :public_ip => "123.123.123.123"},
+                        {:hostname => "bar", :status => "online", :public_ip => "213.213.213.213"}
+            ])
+          expect(subject.ssh_command({private_ip: "789.789.789.789" })).to eq("ssh -A -t mrderpyman2014@213.213.213.213 ssh 789.789.789.789")
+        end
+        it "properly adds ssh options to the ssh_command for an instance with a private ip" do
+          expect(client).to receive(:api_call).with(:describe_instances, {layer_id: "4321"})
+            .and_return(instances: [
+                        {:hostname => "taco", :status => "stopped", :public_ip => "123.123.123.123"},
+                        {:hostname => "bar", :status => "online", :public_ip => "213.213.213.213"}
+            ])
+          expect(subject.ssh_command({private_ip: "789.789.789.789"}, { :"ssh-opts" => "-c"} )).to eq("ssh -c -A -t mrderpyman2014@213.213.213.213 ssh 789.789.789.789")
+        end
+      end
+      context "when bastion_hostname is enabled" do
+        let(:client) { double(config: double(opsworks_config: {stack_id: "1234", bastion_hostname: "sebastion"})) }
+        it "creates the proper ssh_command for an instance with a private ip" do
+          expect(Output).to receive(:say).with("Connecting via bastion with hostname 'sebastion'")
+          expect(subject.ssh_command({private_ip: "789.789.789.789" })).to eq("ssh -A -t mrderpyman2014@sebastion ssh 789.789.789.789")
+        end
+        it "properly adds ssh options to the ssh_command for an instance with a private ip" do
+          expect(Output).to receive(:say).with("Connecting via bastion with hostname 'sebastion'")
+          expect(subject.ssh_command({private_ip: "789.789.789.789"}, { :"ssh-opts" => "-c"} )).to eq("ssh -c -A -t mrderpyman2014@sebastion ssh 789.789.789.789")
+        end
+      end
     end
 
     context "#instance_info" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk