From 9b329671a3437247e87c3d74b4ae9974c2a56942 Mon Sep 17 00:00:00 2001
From: woowahan-neo <jaeyeonling@woowahan.com>
Date: Wed, 8 Jan 2025 13:51:03 +0900
Subject: [PATCH] fix: enhance terraform

---
 .github/workflows/terraform.yml    |  6 +-----
 terraform/backend.tf               |  9 ---------
 terraform/environments/dev/main.tf | 28 ++++++++++++++++++++++++++++
 terraform/provider.tf              | 17 -----------------
 terraform/variables.tf             |  1 -
 5 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 100644 terraform/backend.tf
 delete mode 100644 terraform/provider.tf
 delete mode 100644 terraform/variables.tf

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index a6c14fc21..48d495bc6 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -23,12 +23,8 @@ jobs:
         with:
           terraform_version: 1.5.3
 
-      - name: Select workspace
-        run: |
-          ENVIRONMENT=${{ github.event.inputs.environment }}
-          terraform workspace select "$ENVIRONMENT" || terraform workspace new "$ENVIRONMENT"
-
       - name: Terraform Init and Apply
+        working-directory: terraform/environments/${{ github.event.inputs.environment }}
         run: |
           terraform init
           terraform plan -out=tfplan
diff --git a/terraform/backend.tf b/terraform/backend.tf
deleted file mode 100644
index 1f908b9a8..000000000
--- a/terraform/backend.tf
+++ /dev/null
@@ -1,9 +0,0 @@
-terraform {
-    cloud {
-        organization = "cholog"
-
-        workspaces {
-            name = "cholog"
-        }
-    }
-}
diff --git a/terraform/environments/dev/main.tf b/terraform/environments/dev/main.tf
index e30525842..083fefa18 100644
--- a/terraform/environments/dev/main.tf
+++ b/terraform/environments/dev/main.tf
@@ -1,3 +1,29 @@
+terraform {
+    required_providers {
+        aws = {
+            source  = "hashicorp/aws"
+            version = "5.54.1"
+        }
+    }
+
+    cloud {
+        organization = "cholog"
+
+        workspaces {
+            name = "cholog-dev"
+        }
+    }
+}
+
+provider "aws" {
+    region = var.region
+
+    /** Note: access_key와 secret_key는 환경변수를 통해 설정하면 된다.
+    export AWS_ACCESS_KEY_ID="your-access-key"
+    export AWS_SECRET_ACCESS_KEY="your-secret-key"
+     */
+}
+
 module "tags" {
     source = "../../modules/tags"
 
@@ -83,3 +109,5 @@ module "database" {
     server_tags        = module.tags.server_tags
     database_tags      = module.tags.database_tags
 }
+
+
diff --git a/terraform/provider.tf b/terraform/provider.tf
deleted file mode 100644
index 2be9fc62a..000000000
--- a/terraform/provider.tf
+++ /dev/null
@@ -1,17 +0,0 @@
-provider "aws" {
-    region = var.region
-
-    /** Note: access_key와 secret_key는 환경변수를 통해 설정하면 된다.
-    export AWS_ACCESS_KEY_ID="your-access-key"
-    export AWS_SECRET_ACCESS_KEY="your-secret-key"
-     */
-}
-
-terraform {
-    required_providers {
-        aws = {
-            source  = "hashicorp/aws"
-            version = "5.54.1"
-        }
-    }
-}
diff --git a/terraform/variables.tf b/terraform/variables.tf
deleted file mode 100644
index 1028ecf5e..000000000
--- a/terraform/variables.tf
+++ /dev/null
@@ -1 +0,0 @@
-variable "region" {}