feat(terraform): Migrate to Terraform Cloud

alexwilson · Jul 1, 2024 · 8cd71d9 · 8cd71d9
1 parent e116f9f
commit 8cd71d9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -15,6 +15,7 @@ jobs:
 
     env:
       FASTLY_API_KEY: ${{ secrets.TERRAFORM_FASTLY_API_KEY }}
+      TF_WORKSPACE: "test"
 
     defaults:
       run:
@@ -25,15 +26,14 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Terraform
-        uses: hashicorp/setup-terraform@v1
+        uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 1.9.0
+          cli_config_credentials_token: ${{ secrets.TERRAFORM_API_TOKEN }}
 
       - name: Set-up test workspace
         run: |
           terraform init
-          terraform workspace select -or-create test
-          terraform import --var-file=environments/test.tfvars module.fastly.fastly_service_vcl.cdn Fd19VLeN2NT4QGtaxR3lb2
 
       - name: Apply test configuration
         run: terraform apply -auto-approve -var-file=environments/test.tfvars
@@ -52,6 +52,7 @@ jobs:
 
     env:
       FASTLY_API_KEY: ${{ secrets.TERRAFORM_FASTLY_API_KEY }}
+      TF_WORKSPACE: "prod"
 
     defaults:
       run:
@@ -62,15 +63,14 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Terraform
-        uses: hashicorp/setup-terraform@v1
+        uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 1.9.0
+          cli_config_credentials_token: ${{ secrets.TERRAFORM_API_TOKEN }}
 
       - name: Set-up prod workspace
         run: |
           terraform init
-          terraform workspace select -or-create prod
-          terraform import --var-file=environments/prod.tfvars module.fastly.fastly_service_vcl.cdn YNPeuDdYdC78w34AsmfIA7
 
       - name: Apply prod configuration
         run: terraform apply -auto-approve -var-file=environments/prod.tfvars

diff --git a/terraform/main.tf b/terraform/main.tf
@@ -1,6 +1,16 @@
+terraform {
+  cloud {
+    organization = "Alex_Wilson"
+    workspaces {
+      project = "platform"
+      tags    = ["platform-environment"]
+    }
+  }
+}
+
 module "fastly" {
-  source         = "./modules/fastly"
-  domains        = var.domains
-  backends       = var.backends
-  environment    = terraform.workspace
+  source      = "./modules/fastly"
+  domains     = var.domains
+  backends    = var.backends
+  environment = terraform.workspace
 }
diff --git a/terraform/modules/fastly/main.tf b/terraform/modules/fastly/main.tf
@@ -8,7 +8,7 @@ terraform {
 }
 
 locals {
-  vcl  = fileset("${path.module}/vcl", "*.vcl")
+  vcl         = fileset("${path.module}/vcl", "*.vcl")
   module_root = path.module
 }