Revert "feat: Add OpenTofu" (#159)

Reverts #157
terramate-io · May 3, 2024 · a722008 · a722008
2 parents 754fce3 + 9ac5377
commit a722008
Show file tree

Hide file tree

Showing 38 changed files with 19 additions and 199 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -38,11 +38,6 @@ jobs:
           asdf plugin add terraform
           asdf install terraform
 
-      - name: Install OpenTofu with asdf
-        run: |
-          asdf plugin add opentofu
-          asdf install opentofu
-
       ### Check for changed stacks
 
       - name: List changed stacks
@@ -74,7 +69,7 @@ jobs:
             -C stacks \
             --parallel 1 \
             --changed \
-            init
+            terraform init
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
@@ -86,7 +81,7 @@ jobs:
             -C stacks \
             --parallel 5 \
             --changed \
-            deploy
+            terraform deploy
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
@@ -97,6 +92,6 @@ jobs:
             -C stacks \
             --parallel 5 \
             --changed \
-            drift detect
+            terraform drift detect
         env:
           GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/drift-detection.yml b/.github/workflows/drift-detection.yml
@@ -40,11 +40,6 @@ jobs:
           asdf plugin add terraform
           asdf install terraform
 
-      - name: Install OpenTofu with asdf
-        run: |
-          asdf plugin add opentofu
-          asdf install opentofu
-
       ### Configure cloud credentials
 
       - name: Configure AWS credentials
@@ -66,7 +61,7 @@ jobs:
           terramate script run \
             -C stacks \
             --parallel 1 \
-            init
+            terraform init
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
@@ -78,7 +73,7 @@ jobs:
             --parallel 5 \
             --continue-on-error \
             -- \
-            drift detect
+            terraform drift detect
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
@@ -92,6 +87,6 @@ jobs:
             --parallel 5 \
             --continue-on-error \
             -- \
-            drift reconcile
+            terraform drift reconcile
         env:
           GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -51,11 +51,6 @@ jobs:
           asdf plugin add terraform
           asdf install terraform
 
-      - name: Install OpenTofu with asdf
-        run: |
-          asdf plugin add opentofu
-          asdf install opentofu
-
       ### Linting
 
       - name: Check Terramate formatting
@@ -95,7 +90,7 @@ jobs:
             -C stacks \
             --changed \
             --parallel 1 \
-            init
+            terraform init
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
@@ -108,7 +103,7 @@ jobs:
             --parallel 5 \
             --continue-on-error \
             -- \
-            preview
+            terraform preview
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
@@ -131,15 +126,9 @@ jobs:
           echo >>pr-comment.txt "#### Terraform Plan"
           echo >>pr-comment.txt
           echo >>pr-comment.txt '```terraform'
-          terramate run -C stacks/terraform --changed -- terraform show -no-color out.tfplan |& dd bs=1024 count=248 >>pr-comment.txt
+          terramate run -C stacks --changed -- terraform show -no-color out.tfplan |& dd bs=1024 count=248 >>pr-comment.txt
           [ "${PIPESTATUS[0]}" == "141" ] && sed -i 's/#### Terraform Plan/#### :warning: Terraform Plan truncated: please check console output :warning:/' pr-comment.txt
           echo >>pr-comment.txt '```'
-          echo >>pr-comment.txt "#### OpenTofu Plan"
-          echo >>pr-comment.txt
-          echo >>pr-comment.txt '```terraform'
-          terramate run -C stacks/opentofu --changed -- tofu show -no-color out.tfplan |& dd bs=1024 count=248 >>pr-comment.txt
-          [ "${PIPESTATUS[0]}" == "141" ] && sed -i 's/#### OpenTofu Plan/#### :warning: OpenTofu Plan truncated: please check console output :warning:/' pr-comment.txt
-          echo >>pr-comment.txt '```'
           cat pr-comment.txt >>$GITHUB_STEP_SUMMARY
 
       - name: Generate preview when no stacks changed

diff --git a/.tool-versions b/.tool-versions
@@ -1,4 +1,3 @@
 terraform 1.7.5
 terramate 0.8.0
 pre-commit 3.6.2
-opentofu 1.6.2
diff --git a/_bootstrap/terraform-state-bucket/config.tm.hcl b/_bootstrap/terraform-state-bucket/config.tm.hcl
@@ -35,7 +35,7 @@ generate_hcl "_main.tf" {
     }
 
     resource "aws_dynamodb_table" "terraform-lock" {
-      name           = tm_try(global.terraform.backend.dyanmodb_table, "terraform-lock")
+      name           = tm_try(global.terraform.backend.dyanmodb_table, "terraform_state")
       read_capacity  = 5
       write_capacity = 5
       hash_key       = "LockID"

diff --git a/config.tm.hcl b/config.tm.hcl
@@ -3,8 +3,9 @@ globals "terraform" {
 }
 
 globals "terraform" "backend" {
-  bucket = "terramate-example-terraform-state-backend"
-  region = "us-east-1"
+  bucket         = "terramate-example-terraform-state-backend"
+  dyanmodb_table = "terraform-lock"
+  region         = "us-east-1"
 }
 
 globals "aws" "oidc" {

diff --git a/imports/mixins/backend.tm.hcl b/imports/mixins/backend.tm.hcl
@@ -6,7 +6,7 @@ generate_hcl "backend.tf" {
       backend "s3" {
         region         = global.terraform.backend.region
         bucket         = global.terraform.backend.bucket
-        key            = tm_try(global.terraform.backend.key, "terraform/stacks/by-id/${terramate.stack.id}/terraform.tfstate")
+        key            = "terraform/stacks/by-id/${terramate.stack.id}/terraform.tfstate"
         encrypt        = true
         dynamodb_table = tm_try(global.terraform.backend.dyanmodb_table, "terraform-lock")
       }

diff --git a/scripts/script_tofu_deploy.tm b/scripts/script_tofu_deploy.tm
diff --git a/scripts/script_tofu_detect_drift.tm b/scripts/script_tofu_detect_drift.tm
diff --git a/scripts/script_tofu_preview.tm b/scripts/script_tofu_preview.tm
diff --git a/stacks/terraform/config.tm.hcl → stacks/config.tm.hcl b/stacks/terraform/config.tm.hcl → stacks/config.tm.hcl
diff --git a/stacks/opentofu/config.tm.hcl b/stacks/opentofu/config.tm.hcl
diff --git a/stacks/opentofu/empty/backend.tf b/stacks/opentofu/empty/backend.tf
diff --git a/stacks/opentofu/empty/stack.tm.hcl b/stacks/opentofu/empty/stack.tm.hcl
diff --git a/stacks/opentofu/empty/terraform.tf b/stacks/opentofu/empty/terraform.tf
diff --git a/stacks/opentofu/workflows.tm.hcl b/stacks/opentofu/workflows.tm.hcl
diff --git a/stacks/terraform/prod/config.tm.hcl → stacks/prod/config.tm.hcl b/stacks/terraform/prod/config.tm.hcl → stacks/prod/config.tm.hcl
diff --git a/stacks/terraform/prod/us-east-1/alb/alb.tf → stacks/prod/us-east-1/alb/alb.tf b/stacks/terraform/prod/us-east-1/alb/alb.tf → stacks/prod/us-east-1/alb/alb.tf
diff --git a/...s/terraform/prod/us-east-1/alb/backend.tf → stacks/prod/us-east-1/alb/backend.tf b/...s/terraform/prod/us-east-1/alb/backend.tf → stacks/prod/us-east-1/alb/backend.tf
diff --git a/...erraform/prod/us-east-1/alb/import.tm.hcl → stacks/prod/us-east-1/alb/import.tm.hcl b/...erraform/prod/us-east-1/alb/import.tm.hcl → stacks/prod/us-east-1/alb/import.tm.hcl
diff --git a/...terraform/prod/us-east-1/alb/stack.tm.hcl → stacks/prod/us-east-1/alb/stack.tm.hcl b/...terraform/prod/us-east-1/alb/stack.tm.hcl → stacks/prod/us-east-1/alb/stack.tm.hcl
diff --git a/...terraform/prod/us-east-1/alb/terraform.tf → stacks/prod/us-east-1/alb/terraform.tf b/...terraform/prod/us-east-1/alb/terraform.tf → stacks/prod/us-east-1/alb/terraform.tf
diff --git a/.../us-east-1/ecs-fargate-cluster/backend.tf → .../us-east-1/ecs-fargate-cluster/backend.tf b/.../us-east-1/ecs-fargate-cluster/backend.tf → .../us-east-1/ecs-fargate-cluster/backend.tf
diff --git a/...cs-fargate-cluster/ecs-fargate-cluster.tf → ...cs-fargate-cluster/ecs-fargate-cluster.tf b/...cs-fargate-cluster/ecs-fargate-cluster.tf → ...cs-fargate-cluster/ecs-fargate-cluster.tf
diff --git a/...-east-1/ecs-fargate-cluster/import.tm.hcl → ...-east-1/ecs-fargate-cluster/import.tm.hcl b/...-east-1/ecs-fargate-cluster/import.tm.hcl → ...-east-1/ecs-fargate-cluster/import.tm.hcl
diff --git a/...s-east-1/ecs-fargate-cluster/stack.tm.hcl → ...s-east-1/ecs-fargate-cluster/stack.tm.hcl b/...s-east-1/ecs-fargate-cluster/stack.tm.hcl → ...s-east-1/ecs-fargate-cluster/stack.tm.hcl
diff --git a/...s-east-1/ecs-fargate-cluster/terraform.tf → ...s-east-1/ecs-fargate-cluster/terraform.tf b/...s-east-1/ecs-fargate-cluster/terraform.tf → ...s-east-1/ecs-fargate-cluster/terraform.tf
diff --git a/...t-1/ecs-fargate-services/nginx/backend.tf → ...t-1/ecs-fargate-services/nginx/backend.tf b/...t-1/ecs-fargate-services/nginx/backend.tf → ...t-1/ecs-fargate-services/nginx/backend.tf
diff --git a/...ate-services/nginx/ecs_fargate_service.tf → ...ate-services/nginx/ecs_fargate_service.tf b/...ate-services/nginx/ecs_fargate_service.tf → ...ate-services/nginx/ecs_fargate_service.tf
diff --git a/.../ecs-fargate-services/nginx/import.tm.hcl → .../ecs-fargate-services/nginx/import.tm.hcl b/.../ecs-fargate-services/nginx/import.tm.hcl → .../ecs-fargate-services/nginx/import.tm.hcl
diff --git a/...1/ecs-fargate-services/nginx/stack.tm.hcl → ...1/ecs-fargate-services/nginx/stack.tm.hcl b/...1/ecs-fargate-services/nginx/stack.tm.hcl → ...1/ecs-fargate-services/nginx/stack.tm.hcl
diff --git a/...1/ecs-fargate-services/nginx/terraform.tf → ...1/ecs-fargate-services/nginx/terraform.tf b/...1/ecs-fargate-services/nginx/terraform.tf → ...1/ecs-fargate-services/nginx/terraform.tf
diff --git a/...s/terraform/prod/us-east-1/vpc/backend.tf → stacks/prod/us-east-1/vpc/backend.tf b/...s/terraform/prod/us-east-1/vpc/backend.tf → stacks/prod/us-east-1/vpc/backend.tf
diff --git a/...erraform/prod/us-east-1/vpc/import.tm.hcl → stacks/prod/us-east-1/vpc/import.tm.hcl b/...erraform/prod/us-east-1/vpc/import.tm.hcl → stacks/prod/us-east-1/vpc/import.tm.hcl
diff --git a/...terraform/prod/us-east-1/vpc/stack.tm.hcl → stacks/prod/us-east-1/vpc/stack.tm.hcl b/...terraform/prod/us-east-1/vpc/stack.tm.hcl → stacks/prod/us-east-1/vpc/stack.tm.hcl
diff --git a/...terraform/prod/us-east-1/vpc/terraform.tf → stacks/prod/us-east-1/vpc/terraform.tf b/...terraform/prod/us-east-1/vpc/terraform.tf → stacks/prod/us-east-1/vpc/terraform.tf
diff --git a/stacks/terraform/prod/us-east-1/vpc/vpc.tf → stacks/prod/us-east-1/vpc/vpc.tf b/stacks/terraform/prod/us-east-1/vpc/vpc.tf → stacks/prod/us-east-1/vpc/vpc.tf
diff --git a/stacks/terraform/workflows.tm.hcl → workflows.tm.hcl b/stacks/terraform/workflows.tm.hcl → workflows.tm.hcl
@@ -1,4 +1,4 @@
-script "init" {
+script "terraform" "init" {
   name        = "Terraform Init"
   description = "Downloads the required provider plugins and modules and setting up the backend"
 
@@ -9,7 +9,7 @@ script "init" {
   }
 }
 
-script "preview" {
+script "terraform" "preview" {
   name        = "Terraform Deployment Preview"
   description = "Create a preview of Terraform Changes and synchronize it to Terramate Cloud."
 
@@ -24,7 +24,7 @@ script "preview" {
   }
 }
 
-script "deploy" {
+script "terraform" "deploy" {
   name        = "Terraform Deployment"
   description = "Run a full Terraform deployment cycle and synchronize the result to Terramate Cloud."
 
@@ -40,7 +40,7 @@ script "deploy" {
   }
 }
 
-script "drift" "detect" {
+script "terraform" "drift" "detect" {
   name        = "Terraform Drift Check"
   description = "Detect drifts in Terraform configuration and synchronize it to Terramate Cloud."
 
@@ -54,7 +54,7 @@ script "drift" "detect" {
   }
 }
 
-script "drift" "reconcile" {
+script "terraform" "drift" "reconcile" {
   name        = "Terraform Drift Reconciliation"
   description = "Reconciles drifts in all changed stacks."