From 53f10e67aa4185ef39f3892e512fb17a4a65c4a7 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Thu, 21 Nov 2024 20:40:31 +0800
Subject: [PATCH 1/6] ignore terraform_required_providers in the test folder

---
 test/providers.tf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/providers.tf b/test/providers.tf
index 2ab3d9c2..99af09b3 100644
--- a/test/providers.tf
+++ b/test/providers.tf
@@ -1,9 +1,11 @@
 terraform {
   required_version = ">= 1.0"
   required_providers {
+    # tflint-ignore: terraform_required_providers
     aws = {
       source = "hashicorp/aws"
     }
+    # tflint-ignore: terraform_required_providers
     cloudflare = {
       source = "cloudflare/cloudflare"
     }

From 52b874686a2be72cb3faa3d3d067fb27e2e0bffd Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Mon, 25 Nov 2024 10:58:50 +0800
Subject: [PATCH 2/6] run init and validate in the test directory

---
 .github/workflows/terraform.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index d1df1327..da2b6ee9 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -5,8 +5,8 @@ on:
     branches: [ '**' ]
 
 jobs:
-  build:
-    uses: silinternational/workflows/.github/workflows/terraform.yml@main
+  test:
+    uses: silinternational/workflows/.github/workflows/terraform.yml@test-dir
     with:
       terraform-version: '~> 1.1'
-      directory: test
+      test-dir: test

From a5cc41e9fb56c3b3b97a325b9363ab737d03471d Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Mon, 25 Nov 2024 11:09:35 +0800
Subject: [PATCH 3/6] temporary change: confirm the test-dir input works as
 expected

---
 .github/workflows/terraform.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index da2b6ee9..07791935 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -9,4 +9,4 @@ jobs:
     uses: silinternational/workflows/.github/workflows/terraform.yml@test-dir
     with:
       terraform-version: '~> 1.1'
-      test-dir: test
+#      test-dir: test

From 07937a2fcdd65debacd73ac99d959576630fbcd7 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Mon, 25 Nov 2024 11:10:42 +0800
Subject: [PATCH 4/6] Revert "temporary change: confirm the test-dir input
 works as expected"

This reverts commit a5cc41e9fb56c3b3b97a325b9363ab737d03471d.
---
 .github/workflows/terraform.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 07791935..da2b6ee9 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -9,4 +9,4 @@ jobs:
     uses: silinternational/workflows/.github/workflows/terraform.yml@test-dir
     with:
       terraform-version: '~> 1.1'
-#      test-dir: test
+      test-dir: test

From b567ed4ee32d62e189701d965eafd7d773f2ff37 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Mon, 25 Nov 2024 11:11:42 +0800
Subject: [PATCH 5/6] remove unused Cloudflare provider in 070-id-sync

---
 terraform/070-id-sync/versions.tf | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/terraform/070-id-sync/versions.tf b/terraform/070-id-sync/versions.tf
index 5a8d3999..9ab05c56 100644
--- a/terraform/070-id-sync/versions.tf
+++ b/terraform/070-id-sync/versions.tf
@@ -6,13 +6,6 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 4.0.0, < 6.0.0"
     }
-    cloudflare = {
-      source = "cloudflare/cloudflare"
-
-      // 4.39.0 deprecated cloudflare_record.value
-      // While waiting for version 5 to mature, we'll constrain to earlier versions.
-      version = ">= 2.0.0, < 4.39.0"
-    }
     random = {
       source  = "hashicorp/random"
       version = ">= 2.2.0, < 4.0.0"

From 295ea27ec683f363497e681e5ea1c87989f10682 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:36:18 +0800
Subject: [PATCH 6/6] change back to main branch for terraform workflow

---
 .github/workflows/terraform.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index da2b6ee9..81c4112b 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   test:
-    uses: silinternational/workflows/.github/workflows/terraform.yml@test-dir
+    uses: silinternational/workflows/.github/workflows/terraform.yml@main
     with:
       terraform-version: '~> 1.1'
       test-dir: test