kitchen-google 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5de129cbfac2e9fe5573b026c9afeccc09f1cf36
-  data.tar.gz: 844a3ac15fbfe368d8e1bb11f8735d4aaeda9048
+  metadata.gz: 7c0faf16d29ec697042b36e75a9120db978ca042
+  data.tar.gz: b11fe7fd427c9a50eec9ab53ee08d324ab7c45dd
 SHA512:
-  metadata.gz: fc2c20c9b86b5172da99dd5b19c007456d0cf6a6391b66ef7cff44a27282bfa3ee699b5afede66b664cbfe0fac8e29b47c8d7264611151690353df407ebba036
-  data.tar.gz: 3e711713b9f28027b5f8529e8c0752a4434962e7bf1ac230b8188cc46bc04f635ae9503193ce5ed682cd4a2078b0017d953db45911bd0ff96e6cc4825ad04d91
+  metadata.gz: c07e4218aff46c02b4cf32d2304bf4368df47d5445e025cf7bab5b4955a5b12432a32d6d4f78d8d27cccd0c11b5602a274b1c13e980ed11b902e3fb7f9b3c7ed
+  data.tar.gz: 99f3bcb22f2dd3382b6a8444a9e83acf52dee3899a9e2711335fcf399dffb3ee3b322966b1441cc824c08577afc3a675b8e2beee8dc51b34ee7fd44eb5297f44

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4.0 / 2017-09-28
+
+ * #47: Add support for Google Shared VPC Networks (XPN)
+
 ## 1.3.0 / 2017-09-15
 
  * #43: support adding custom metadata to instances

data/README.md

@@ -232,10 +232,18 @@ GCE instance type (size) to launch; default: `n1-standard-1`
 
 GCE network that instance will be attached to; default: `default`
 
+### `network_project`
+
+GCE project which network belongs to; default is same as `project`
+
 ### `subnet`
 
 GCE subnetwork that instance will be attached to. Only applies to custom networks.
 
+### `subnet_project`
+
+GCE project which subnet belongs to. Only applies when `subnet` is used; default is same as `project`
+
 ### `preemptible`
 
 If set to `true`, GCE instance will be brought up as a  [preemptible](https://cloud.google.com/compute/docs/instances/preemptible) virtual machine,

data/lib/kitchen/driver/gce.rb

@@ -66,7 +66,9 @@ module Kitchen
       default_config :disk_type, "pd-standard"
       default_config :machine_type, "n1-standard-1"
       default_config :network, "default"
+      default_config :network_project, nil
       default_config :subnet, nil
+      default_config :subnet_project, nil
       default_config :inst_name, nil
       default_config :service_account_name, "default"
       default_config :service_account_scopes, []
@@ -156,6 +158,7 @@ module Kitchen
         warn("Both zone and region specified - region will be ignored.") if config[:zone] && config[:region]
         warn("Both image family and name specified - image family will be ignored") if config[:image_family] && config[:image_name]
         warn("Image project not specified - searching current project only") unless config[:image_project]
+        warn("Subnet project not specified - searching current project only") if config[:subnet] && !config[:subnet_project]
         warn("Auto-migrate disabled for preemptible instance") if preemptible? && config[:auto_migrate]
         warn("Auto-restart disabled for preemptible instance") if preemptible? && config[:auto_restart]
       end
@@ -224,12 +227,12 @@ module Kitchen
 
       def valid_network?
         return false if config[:network].nil?
-        check_api_call { connection.get_network(project, config[:network]) }
+        check_api_call { connection.get_network(network_project, config[:network]) }
       end
 
       def valid_subnet?
         return false if config[:subnet].nil?
-        check_api_call { connection.get_subnetwork(project, region, config[:subnet]) }
+        check_api_call { connection.get_subnetwork(subnet_project, region, config[:subnet]) }
       end
 
       def valid_zone?
@@ -267,6 +270,14 @@ module Kitchen
         config[:image_project].nil? ? project : config[:image_project]
       end
 
+      def subnet_project
+        config[:subnet_project].nil? ? project : config[:subnet_project]
+      end
+
+      def network_project
+        config[:network_project].nil? ? project : config[:network_project]
+      end
+
       def region
         config[:region].nil? ? region_for_zone : config[:region]
       end
@@ -403,7 +414,7 @@ module Kitchen
 
       def instance_network_interfaces
         interface                = Google::Apis::ComputeV1::NetworkInterface.new
-        interface.network        = network_url
+        interface.network        = network_url if config[:subnet_project].nil?
         interface.subnetwork     = subnet_url if subnet_url
         interface.access_configs = interface_access_configs
 
@@ -411,13 +422,12 @@ module Kitchen
       end
 
       def network_url
-        "projects/#{project}/global/networks/#{config[:network]}"
+        "projects/#{network_project}/global/networks/#{config[:network]}"
       end
 
       def subnet_url
         return unless config[:subnet]
-
-        "projects/#{project}/regions/#{region}/subnetworks/#{config[:subnet]}"
+        "projects/#{subnet_project}/regions/#{region}/subnetworks/#{config[:subnet]}"
       end
 
       def interface_access_configs

data/lib/kitchen/driver/gce_version.rb

@@ -18,6 +18,6 @@
 
 module Kitchen
   module Driver
-    GCE_VERSION = "1.3.0".freeze
+    GCE_VERSION = "1.4.0".freeze
   end
 end

data/spec/kitchen/driver/gce_spec.rb

@@ -823,9 +823,18 @@ describe Kitchen::Driver::Gce do
   end
 
   describe "#network_url" do
-    it "returns a network URL" do
-      expect(driver).to receive(:config).and_return(network: "test_network")
-      expect(driver.network_url).to eq("projects/test_project/global/networks/test_network")
+    context "when the user does not provide network_project" do
+      it "returns a network URL" do
+        allow(driver).to receive(:config).and_return(network: "test_network")
+        expect(driver.network_url).to eq("projects/test_project/global/networks/test_network")
+      end
+    end
+
+    context "when the user provides network_project" do
+      it "returns a network URL" do
+        allow(driver).to receive(:config).and_return(network: "test_network", network_project: "test_xpn_project")
+        expect(driver.network_url).to eq("projects/test_xpn_project/global/networks/test_network")
+      end
     end
   end
 
@@ -835,10 +844,20 @@ describe Kitchen::Driver::Gce do
       expect(driver.subnet_url).to eq(nil)
     end
 
-    it "returns a properly-formatted subnet URL" do
-      allow(driver).to receive(:config).and_return(subnet: "test_subnet")
-      expect(driver).to receive(:region).and_return("test_region")
-      expect(driver.subnet_url).to eq("projects/test_project/regions/test_region/subnetworks/test_subnet")
+    context "when the user does not provide subnet_project" do
+      it "returns a properly-formatted subnet URL" do
+        allow(driver).to receive(:config).and_return(subnet: "test_subnet")
+        expect(driver).to receive(:region).and_return("test_region")
+        expect(driver.subnet_url).to eq("projects/test_project/regions/test_region/subnetworks/test_subnet")
+      end
+    end
+
+    context "when the user provides subnet_project" do
+      it "returns a properly-formatted subnet URL" do
+        allow(driver).to receive(:config).and_return(subnet_project: "test_xpn_project", subnet: "test_subnet")
+        expect(driver).to receive(:region).and_return("test_region")
+        expect(driver.subnet_url).to eq("projects/test_xpn_project/regions/test_region/subnetworks/test_subnet")
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-google
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Andrew Leonard