Deprecation of Kitchen-Terraform

Fixes #36t
osinfra-io · Apr 27, 2024 · a04c07e · a04c07e
1 parent dbc397c
commit a04c07e
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 42 deletions.
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,11 +13,11 @@ permissions:
   id-token: write
 
 jobs:
-  default:
-    name: "Default"
-    uses: osinfra-io/github-terraform-called-workflows/.github/workflows/[email protected]
+  tests:
+    name: Tests
+    uses: osinfra-io/github-terraform-gcp-called-workflows/.github/workflows/[email protected]
     if: github.actor != 'dependabot[bot]'
     with:
-      service_account: "plt-lz-testing-github@ptl-lz-terraform-tf91-sb.iam.gserviceaccount.com"
+      service_account: plt-lz-testing-github@ptl-lz-terraform-tf91-sb.iam.gserviceaccount.com
       terraform_version: ${{ vars.TERRAFORM_VERSION }}
-      workload_identity_provider: "projects/746490462722/locations/global/workloadIdentityPools/github-actions/providers/github-actions-oidc"
+      workload_identity_provider: projects/746490462722/locations/global/workloadIdentityPools/github-actions/providers/github-actions-oidc
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
       - id: check-symlinks
 
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.88.4
+    rev: v1.89.1
     hooks:
       - id: terraform_fmt
 

diff --git a/empty.tf b/empty.tf
@@ -0,0 +1,2 @@
+# This is currently required so we can initialize Terraform and run tests.
+# https://github.com/hashicorp/terraform/issues/35040
diff --git a/fixtures/default/tests/default.tftest.hcl b/fixtures/default/tests/default.tftest.hcl
diff --git a/tests/default.tftest.hcl b/tests/default.tftest.hcl
@@ -0,0 +1,7 @@
+run "default" {
+  command = apply
+
+  module {
+    source = "./tests/fixtures/default"
+  }
+}
diff --git a/fixtures/default/main.tf → tests/fixtures/default/main.tf b/fixtures/default/main.tf → tests/fixtures/default/main.tf
@@ -1,5 +1,5 @@
 module "test" {
-  source = "../../regional"
+  source = "../../../regional"
 
   client_certs = var.client_certs
 

diff --git a/fixtures/default/outputs.tf → tests/fixtures/default/outputs.tf b/fixtures/default/outputs.tf → tests/fixtures/default/outputs.tf
diff --git a/fixtures/default/variables.tf → tests/fixtures/default/variables.tf b/fixtures/default/variables.tf → tests/fixtures/default/variables.tf
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# This is currently required so we can initialize Terraform and run tests.
		# https://github.com/hashicorp/terraform/issues/35040