Merge pull request #106 from ChaosCloud/abk

make public_ip work for any case 'none' at 'instance_access_configs_for'

.rspec

@@ -1,3 +1,3 @@
---color
--fdocumentation
-
+--color
+-fdocumentation
+

.travis.yml

@@ -4,7 +4,6 @@ sudo: false
 rvm:
 - 2.2.5
 - 2.3.1
-- ruby-head
 branches:
   only:
   - master

lib/chef/knife/cloud/google_service.rb

@@ -408,7 +408,9 @@ def instance_network_interfaces_for(options)
     end
 
     def instance_access_configs_for(public_ip)
-      return [] if public_ip.nil? || public_ip == "NONE"
+      public_ip.downcase! if public_ip.respond_to?(:downcase)
+
+      return [] if public_ip.nil? || public_ip == "none"
 
       access_config = Google::Apis::ComputeV1::AccessConfig.new
       access_config.name = "External NAT"

spec/cloud/google_service_spec.rb

@@ -677,6 +677,34 @@
     end
   end
 
+  describe "#instance_access_configs_for" do
+    let(:interface) { double("interface" ) }
+
+    context "for None public_ip" do
+      it "empty public_ip none|None|NONE|~" do
+        expect(service.instance_access_configs_for("none")).to eq([])
+
+        expect(service.instance_access_configs_for("None")).to eq([])
+
+        expect(service.instance_access_configs_for("NONE")).to eq([])
+      end
+    end
+
+    context "for valid public_ip" do
+      it "valid public_ip" do
+        access_config = service.instance_access_configs_for("8.8.8.8")
+        expect(access_config.first.nat_ip).to eq("8.8.8.8")
+      end
+    end
+
+    context "for invalid public_ip" do
+      it "empty public_ip none|None|NONE|~" do
+        access_config = service.instance_access_configs_for("oh no not a valid IP")
+        expect(access_config.first.nat_ip).to eq(nil)
+      end
+    end
+  end
+
   describe "#network_url_for" do
     it "returns a properly-formatted network URL" do
       expect(service.network_url_for("test_network")).to eq("projects/test_project/global/networks/test_network")