Get tests for private_zonal_with_network to function correctly

Author: ideasculptor

.kitchen.yml

@@ -77,7 +77,7 @@ suites:
           backend: local
           controls:
             - gcloud
-        - name: subnet
+        - name: private_zonal_with_networking
           backend: local
           controls:
             - subnet

examples/private_zonal_with_networking/outputs.tf

@@ -57,4 +57,3 @@ output "subnet_secondary_ranges" {
 }
 
 
-

examples/private_zonal_with_networking/test_outputs.tf

@@ -21,10 +21,6 @@ output "project_id" {
   value = var.project_id
 }
 
-output "region" {
-  value = module.gke.region
-}
-
 output "network" {
   value = var.network
 }
@@ -37,6 +33,10 @@ output "location" {
   value = module.gke.location
 }
 
+output "region" {
+  value = var.region
+}
+
 output "ip_range_pods_name" {
   description = "The secondary IP range used for pods"
   value       = var.ip_range_pods_name

examples/private_zonal_with_networking/variables.tf

@@ -25,7 +25,11 @@ variable "cluster_name" {
 
 variable "region" {
   description = "The region to host the cluster in"
-  default     = "us-central1"
+}
+
+variable "zones" {
+  type        = list(string)
+  description = "The zone to host the cluster in (required if is a zonal cluster)"
 }
 
 variable "network" {
@@ -48,7 +52,3 @@ variable "ip_range_services_name" {
   default     = "ip-range-scv"
 }
 
-variable "zones" {
-  default = []
-}
-

test/integration/private_zonal_with_networking/controls/gcloud.rb

@@ -75,53 +75,19 @@
           )
         )
       end
-    end
-
-    describe "node pool" do
-      let(:node_pools) { data['nodePools'].reject { |p| p['name'] == "default-pool" } }
-
-      it "has autoscaling enabled" do
-        expect(node_pools).to include(
-          including(
-            "autoscaling" => including(
-              "enabled" => true,
-            ),
-          )
-        )
-      end
-
-      it "has the expected minimum node count" do
-        expect(node_pools).to include(
-          including(
-            "autoscaling" => including(
-              "minNodeCount" => 1,
-            ),
-          )
-        )
-      end
-
-      it "has the expected maximum node count" do
-        expect(node_pools).to include(
-          including(
-            "autoscaling" => including(
-              "maxNodeCount" => 100,
-            ),
-          )
-        )
-      end
 
       it "is the expected machine type" do
-        expect(node_pools).to include(
+        expect(data['nodePools']).to include(
           including(
             "config" => including(
-              "machineType" => "n1-standard-2",
+              "machineType" => "n1-standard-1",
             ),
           )
         )
       end
 
       it "has the expected disk size" do
-        expect(node_pools).to include(
+        expect(data['nodePools']).to include(
           including(
             "config" => including(
               "diskSizeGb" => 100,
@@ -130,51 +96,6 @@
         )
       end
 
-      it "has the expected labels" do
-        expect(node_pools).to include(
-          including(
-            "config" => including(
-              "labels" => including(
-                "cluster_name" => cluster_name,
-                "node_pool" => "default-node-pool",
-              ),
-            ),
-          )
-        )
-      end
-
-      it "has the expected network tags" do
-        expect(node_pools).to include(
-          including(
-            "config" => including(
-              "tags" => match_array([
-                "gke-#{cluster_name}",
-                "gke-#{cluster_name}-default-node-pool",
-              ]),
-            ),
-          )
-        )
-      end
-
-      it "has autorepair enabled" do
-        expect(node_pools).to include(
-          including(
-            "management" => including(
-              "autoRepair" => true,
-            ),
-          )
-        )
-      end
-
-      it "has autoupgrade enabled" do
-        expect(node_pools).to include(
-          including(
-            "management" => including(
-              "autoUpgrade" => true,
-            ),
-          )
-        )
-      end
     end
   end
 end

test/integration/private_zonal_with_networking/controls/subnet.rb

@@ -18,29 +18,34 @@
 region = attribute('region')
 ip_range_pods_name = attribute('ip_range_pods_name')
 ip_range_services_name = attribute('ip_range_services_name')
+
 control "subnet" do
-    title "gcp subnetwork configuration"
-    describe command("gcloud compute networks subnets describe #{subnet_name} --project=#{project_id} --region=#{region} --format=json") do
-      its(:exit_status) { should eq 0 }
-      its(:stderr) { should eq '' }
-      let(:data) do
-        if subject.exit_status == 0
-          JSON.parse(subject.stdout)
-        else
-          {}
-        end
-      end
-      it "#should have the correct secondaryIpRanges configuration for #{ip_range_pods_name}" do
-        expect(data["secondaryIpRanges"][0]).to include(
-          "rangeName"   => ip_range_pods_name,
-          "ipCidrRange" => "192.168.0.0/18"
-        )
-      end
-      it "#should have the correct secondaryIpRanges configuration for #{ip_range_services_name}" do
-        expect(data["secondaryIpRanges"][1]).to include(
-          "rangeName"   => ip_range_services_name,
-          "ipCidrRange" => "192.168.64.0/18"
-        )
+  title "gcp subnetwork configuration"
+  describe command("gcloud compute networks subnets describe #{subnet_name} --project=#{project_id} --region=#{region} --format=json") do
+    its(:exit_status) { should eq 0 }
+    its(:stderr) { should eq '' }
+
+    let!(:data) do
+      if subject.exit_status == 0
+        JSON.parse(subject.stdout)
+      else
+        {}
       end
     end
+
+    it "#should have the correct secondaryIpRanges configuration for #{ip_range_pods_name}" do
+      expect(data["secondaryIpRanges"][0]).to include(
+        "rangeName"   => ip_range_pods_name,
+        "ipCidrRange" => "192.168.0.0/18"
+      )
+    end
+
+    it "#should have the correct secondaryIpRanges configuration for #{ip_range_services_name}" do
+      expect(data["secondaryIpRanges"][1]).to include(
+        "rangeName"   => ip_range_services_name,
+        "ipCidrRange" => "192.168.64.0/18"
+      )
+    end
+
   end
+end

test/integration/private_zonal_with_networking/inspec.yml

@@ -1,4 +1,4 @@
-name: simple_regional_with_networking
+name: private_zonal_with_networking
 depends:
   - name: inspec-gcp
     git: https://github.com/inspec/inspec-gcp.git