opsicle 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1ad1bea72c477d7da8b1f4a433b43c2e9b2a046
-  data.tar.gz: bcfa61ba70e1041e5a7b4284dd6f4a8199b679c1
+  metadata.gz: 8a75d1113150783a01d54f283183d80ebd130752
+  data.tar.gz: 235fca70e248b9d6f5a8a5e7981fdbac0f3253ce
 SHA512:
-  metadata.gz: 6693a08f3cdecbbba71746f248a623e9611cbfaeaf6b3b79d011b5a1cef44981293fb3a484fea8d6155663e482f54e556dd014f9e67c07bfdc6c3f2876df2bcd
-  data.tar.gz: 0a0ec60a2747b605b22dd49150c3bf204b247c23a83177ba2f72e575eb6fed11da9f192d75dbea163f7b9051e23ae2b4d3340bb4fc428b95091f77ed095886c4
+  metadata.gz: 009279aec4c5366d91e71cde98ee00cd90d3a9e643731a940cd555197deb9779df3acd1ec367ba0c03255eed9fecfd8d0fcef811cc463cc2a9b2505f5f4ac921
+  data.tar.gz: 769f9652489b563bdd867676e979c2855f4e9694d65c84c94ab4c2d59a5cc625bb9d3a60a5b9fadfedc2871568d01f513de013a3259a16442f3980b08c884773

data/lib/opsicle/commands/ssh.rb

@@ -54,11 +54,13 @@ module Opsicle
         bastion_hostname = client.config.opsworks_config[:bastion_hostname]
         Output.say "Connecting via bastion with hostname '#{bastion_hostname}'"
         bastion_hostname
-      else
-        false
       end
     end
 
+    def use_bastion?
+      !!(client.config.opsworks_config[:bastion_layer_id] || client.config.opsworks_config[:bastion_hostname])
+    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."
@@ -71,8 +73,12 @@ 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)
+      external_ip = public_ips.sample
+      if use_bastion?
+        external_ip = bastion_ip
+        ssh_string = "#{ssh_username}@#{external_ip} ssh #{instance[:private_ip]}"
+        ssh_options.concat('-A -t ')
+      elsif instance_ip = ssh_ip(instance)
         ssh_string = "#{ssh_username}@#{instance_ip}"
       else
         ssh_string = "#{ssh_username}@#{external_ip} ssh #{instance[:private_ip]}"

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.11.0"
+  VERSION = "2.11.1"
 end

data/spec/opsicle/commands/ssh_spec.rb

@@ -138,8 +138,34 @@ module Opsicle
         end
       end
       context "when bastion is not used" do
+        it "returns nil" do
+          allow(client).to receive(:api_call).with(:describe_instances, {stack_id: "1234"})
+            .and_return(instances: [{:hostname => "taco", :status => "online"},{:hostname => "bar", :status => "online"}])
+          expect(subject.bastion_ip).to eq(nil)
+        end
+      end
+    end
+
+    context "#use_bastion" do
+      context "when bastion config option is disabled and some instances have public IPs" do
         it "returns false" do
-          expect(subject.bastion_ip).to eq(false)
+          allow(subject).to receive(:instances) {[
+                      { hostname: "host1", elastic_ip: "123.123.123.123", public_ip: "123.345.567.789"},
+                      { hostname: "host2", public_ip: "456.456.456.456" },
+                      { hostname: "host2", private_ip: "789.789.789.789" },
+                    ]}
+          expect(subject.use_bastion?).to eq(false)
+        end
+      end
+      context "when bastion config option is enabled and some instances have public IPs" do
+        let(:client) { double(config: double(opsworks_config: {stack_id: "1234", bastion_layer_id: "4321"})) }
+        it "returns false" do
+          allow(subject).to receive(:instances) {[
+                      { hostname: "host1", elastic_ip: "123.123.123.123", public_ip: "123.345.567.789"},
+                      { hostname: "host2", public_ip: "456.456.456.456" },
+                      { hostname: "host2", private_ip: "789.789.789.789" },
+                    ]}
+          expect(subject.use_bastion?).to eq(true)
         end
       end
     end
@@ -197,15 +223,16 @@ module Opsicle
       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"})
+        it "creates the proper ssh_commands" do
+          allow(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")
           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
+        it "properly adds ssh options to the ssh_commands" 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"},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk