chore(ci): Provider cache for lint (#641)

terraform-google-modules · Oct 22, 2020 · c8096a4 · c8096a4
1 parent 56af31d
commit c8096a4
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.1
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.2
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 
@@ -68,6 +68,7 @@ docker_test_integration:
 .PHONY: docker_test_lint
 docker_test_lint:
 	docker run --rm -it \
+		-e ENABLE_PARALLEL=1 \
 		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/usr/local/bin/test_lint.sh

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -429,6 +429,6 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.1'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'
 options:
   machineType: 'N1_HIGHCPU_8'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
@@ -22,4 +22,8 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.1'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'
+options:
+  machineType: 'N1_HIGHCPU_8'
+  env:
+  - ENABLE_PARALLEL=1
diff --git a/test/bundle.hcl b/test/bundle.hcl
@@ -0,0 +1,12 @@
+terraform {
+  version = "0.12.29"
+}
+
+providers {
+  google = ["~> 3.42.0"]
+  google-beta = ["~> 3.42.0"]
+  external = ["~> 1.0"]
+  kubernetes = ["~> 1.12.0"]
+  null = ["~> 2.0"]
+  random = ["~> 2.0"]
+}
diff --git a/test/integration/beta_cluster/controls/gcp.rb b/test/integration/beta_cluster/controls/gcp.rb
@@ -18,13 +18,7 @@
   service_account = attribute("service_account")
   project_id = attribute("project_id")
 
-  if service_account.start_with? "projects/"
-    service_account_name = service_account
-  else
-    service_account_name = "projects/#{project_id}/serviceAccounts/#{service_account}"
-  end
-
-  describe google_service_account name: service_account_name do
+  describe google_service_account(project: project_id, name: service_account) do
     its("display_name") { should eq "Terraform-managed service account for cluster #{attribute("cluster_name")}" }
     its("project_id") { should eq project_id }
   end

diff --git a/test/integration/beta_cluster/inspec.yml b/test/integration/beta_cluster/inspec.yml
@@ -2,7 +2,7 @@ name: beta_cluster
 depends:
   - name: inspec-gcp
     git: https://github.com/inspec/inspec-gcp.git
-    tag: v0.10.0
+    tag: v1.8.0
 attributes:
   - name: project_id
     required: true

diff --git a/test/integration/private_zonal_with_networking/controls/gcloud.rb b/test/integration/private_zonal_with_networking/controls/gcloud.rb
@@ -83,7 +83,7 @@
         expect(data['nodePools']).to include(
           including(
             "config" => including(
-              "machineType" => "n1-standard-1",
+              "machineType" => "e2-medium",
             ),
           )
         )

diff --git a/test/integration/private_zonal_with_networking/inspec.yml b/test/integration/private_zonal_with_networking/inspec.yml
@@ -2,7 +2,7 @@ name: private_zonal_with_networking
 depends:
   - name: inspec-gcp
     git: https://github.com/inspec/inspec-gcp.git
-    tag: v0.10.0
+    tag: v1.8.0
 attributes:
   - name: project_id
     required: true

diff --git a/test/integration/safer_cluster/inspec.yml b/test/integration/safer_cluster/inspec.yml
@@ -2,7 +2,7 @@ name: safer_cluster
 depends:
   - name: inspec-gcp
     git: https://github.com/inspec/inspec-gcp.git
-    tag: v0.11.0
+    tag: v1.8.0
 attributes:
   - name: project_id
     required: true

diff --git a/test/integration/simple_regional_with_networking/inspec.yml b/test/integration/simple_regional_with_networking/inspec.yml
@@ -2,7 +2,7 @@ name: simple_regional_with_networking
 depends:
   - name: inspec-gcp
     git: https://github.com/inspec/inspec-gcp.git
-    tag: v0.10.0
+    tag: v1.8.0
 attributes:
   - name: project_id
     required: true

diff --git a/test/integration/simple_zonal/controls/gcp.rb b/test/integration/simple_zonal/controls/gcp.rb
@@ -18,13 +18,7 @@
   service_account = attribute("service_account")
   project_id = attribute("project_id")
 
-  if service_account.start_with? "projects/"
-    service_account_name = service_account
-  else
-    service_account_name = "projects/#{project_id}/serviceAccounts/#{service_account}"
-  end
-
-  describe google_service_account(name: service_account_name) do
+  describe google_service_account(project: project_id, name: service_account) do
     its("display_name") { should eq "Terraform-managed service account for cluster #{attribute("cluster_name")}" }
     its("project_id") { should eq project_id }
   end

diff --git a/test/integration/simple_zonal/inspec.yml b/test/integration/simple_zonal/inspec.yml
@@ -2,7 +2,7 @@ name: simple_zonal
 depends:
   - name: inspec-gcp
     git: https://github.com/inspec/inspec-gcp.git
-    tag: v0.16.0
+    tag: v1.8.0
 attributes:
   - name: project_id
     required: true