Merge pull request #85 from cloud-barista/feature/fix-operate-service

Fix: operate Service

data/var/run/data-manager/template/example/AWS/BUILDER/main.tf

@@ -55,16 +55,16 @@ module "s3" {
   bucket_name = var.bucket_name
 }
 
-# mysql module call
-module "mysql" {
-  source  = "./modules/mysql"
-  db_name = var.db_name
-  db_user = var.db_user
-  db_pswd = var.db_pswd
-}
+# # mysql module call
+# module "mysql" {
+#   source  = "./modules/mysql"
+#   db_name = var.db_name
+#   db_user = var.db_user
+#   db_pswd = var.db_pswd
+# }
 
-# DynamoDB module call
-module "dynamodb" {
-  source     = "./modules/dynamodb"
-  table_name = var.table_name
-}
+# # DynamoDB module call
+# module "dynamodb" {
+#   source     = "./modules/dynamodb"
+#   table_name = var.table_name
+# }

data/var/run/data-manager/template/example/AWS/BUILDER/modules/mysql/main.tf

@@ -12,4 +12,5 @@ resource "aws_db_instance" "default" {
   parameter_group_name = "default.mysql8.0"
   skip_final_snapshot  = true
   deletion_protection = false
+  publicly_accessible = true # Allow public access
 }

data/var/run/data-manager/template/example/AWS/BUILDER/modules/mysql/variables.tf

@@ -1,50 +1,10 @@
 # variables.tf
 
-# variable "access_key" {
-#   description = "AWS Access Key"
-#   type        = string
-# }
-
-# variable "secret_key" {
-#   description = "AWS Secret Key"
-#   type        = string
-# }
-
-# variable "region" {
-#   description = "AWS Region"
-#   type        = string
-#   default     = "KR"
-# }
-
-# variable "vpc_name" {
-#   description = "vpc_name"
-#   type        = string
-#   default     = "mcmp-vpc"
-
-# }
-
-# variable "private_subnet_name" {
-#   description = "private_subnet_name"
-#   type        = string
-
-# }
-# variable "public_subnet_name" {
-#   description = "public_subnet_name"
-#   type        = string
-
-# }
-
-# variable "bucket_name" {
-#   description = "bucket_name"
-#   type        = string
-# }
-
 variable "db_name" {
   description = "DB name"
   type        = string
 }
 
-
 variable "db_user" {
   description = "DB user"
   type        = string

data/var/run/data-manager/template/example/AWS/BUILDER/modules/storage/main.tf

@@ -2,5 +2,5 @@
 
 resource "aws_s3_bucket" "bucket" {
   bucket = var.bucket_name
-
+  force_destroy = true
 }

data/var/run/data-manager/template/example/AWS/BUILDER/variables.tf

@@ -47,33 +47,33 @@ variable "public_subnet_name" {
 variable "bucket_name" {
   description = "bucket_name"
   type        = string
-  default     = "mc-data-manager"
+  default     = "mcdatamanager"
 }
 
 variable "table_name" {
   description = "table_name"
   type        = string
-  default     = "mc-data-manager"
+  default     = "mcdatamanager"
 }
 
 
 variable "db_name" {
   description = "DB name"
   type        = string
-  default     = "MCDataManager"
+  default     = "mcdatamanager"
 }
 
 
 variable "db_user" {
   description = "DB user"
   type        = string
-  default     = "datamanager"
+  default     = "mcdatamanager"
 }
 
 variable "db_pswd" {
   description = "DB PW"
   type        = string
-  default     = "NAmutech7^^7"
+  default     = "mcdatamanager"
 }
 
 

data/var/run/data-manager/template/example/GCP/BUILDER/main.tf

@@ -18,18 +18,26 @@ module "firestore_database" {
   source     = "./modules/firestore"
   project_id = var.project_id
   region     = var.region
+  nrdbName   = var.nrdbName
+
 }
 
 # MySQL RDB Gen
 module "mysql" {
   source     = "./modules/mysql"
   project_id = var.project_id
   region     = var.region
+  cidr_range = var.cidr_range
+  dbName     = var.dbName
+  userName   = var.dbName
+  password   = var.password
+
 }
 
 # Google Cloud Storage Gen
 module "storage" {
   source     = "./modules/storage"
   project_id = var.project_id
   region     = var.region
+  bucketName = var.bucketName
 }

data/var/run/data-manager/template/example/GCP/BUILDER/modules/firestore/main.tf

@@ -3,12 +3,11 @@
 resource "google_firestore_database" "datastore_mode_database" {
   project     = var.project_id     
   location_id = var.region         # Firestore region
-  name        = var.dbName         # Firestore DB name
+  name        = var.nrdbName         # Firestore DB name
   type        = "FIRESTORE_NATIVE" # Firestore type
 
   # DELETE Policty and State
   deletion_policy = "DELETE"
   delete_protection_state = "DELETE_PROTECTION_DISABLED" # Firestore state
 
-}
-
+}

data/var/run/data-manager/template/example/GCP/BUILDER/modules/firestore/variables.tf

@@ -1,19 +1,15 @@
-# 공통 변수 설정
+# module
 variable "project_id" {
   description = "GCP 프로젝트 ID"
   type        = string
-  default     = "spatial-conduit-399006"
 }
 
 variable "region" {
   description = "GCP 리전"
   type        = string
-  default     = "asia-east1"
 }
 
-# 로컬 변수 설정
-variable "dbName" {
+variable "nrdbName" {
   description = "DB 이름"
   type        = string
-  default     = "mc-data-manager"
 }

data/var/run/data-manager/template/example/GCP/BUILDER/modules/mysql/main.tf

@@ -8,6 +8,14 @@ resource "google_sql_database_instance" "mysql_instance" {
 
   settings {
     tier = "db-f1-micro" # instance reesource flavor
+    ip_configuration {
+      ipv4_enabled = true
+      authorized_networks {
+        name = "Allow All Port"
+        value = var.cidr_range
+      }
+    }
+
   }
   deletion_protection = false # Delete protection
 

data/var/run/data-manager/template/example/GCP/BUILDER/modules/mysql/variables.tf

@@ -1,34 +1,34 @@
-# 공통 변수 설정
+# common
 
 variable "project_id" {
   description = "GCP 프로젝트 ID"
   type        = string
-  default     = "spatial-conduit-399006"
 }
 
 variable "region" {
   description = "GCP 리전"
   type        = string
-  default     = "asia-east1"
 }
 
 
-# 로컬 변수 설정
+# local
 variable "dbName" {
   description = "DB 이름"
   type        = string
-  default     = "mc-data-manager"
 }
 
 
 variable "userName" {
   description = "DB 유저"
   type        = string
-  default     = "mc-data-manager"
 }
 
 variable "password" {
   description = "DB PW"
   type        = string
-  default     = "mcdatamanager"
+}
+
+variable "cidr_range" {
+  description = "DB PW"
+  type        = string
 }

data/var/run/data-manager/template/example/GCP/BUILDER/modules/storage/main.tf

@@ -8,4 +8,5 @@ resource "google_storage_bucket" "data_storage" {
   versioning {
     enabled = true
   }
+  force_destroy = true
 }

data/var/run/data-manager/template/example/GCP/BUILDER/modules/storage/variables.tf

@@ -1,20 +1,16 @@
-# 공통 변수 설정
+# common
 variable "project_id" {
   description = "GCP 프로젝트 ID"
   type        = string
-  default     = "spatial-conduit-399006"
 }
 
 variable "region" {
   description = "GCP 리전"
   type        = string
-  default     = "asia-east1"
 }
 
-# 로컬 변수 설정
-
+# local
 variable "bucketName" {
   description = "버킷 명"
   type        = string
-  default     = "mc-data-manager"
 }

data/var/run/data-manager/template/example/GCP/BUILDER/variables.tf

@@ -1,4 +1,4 @@
-# 공통 변수 설정
+# Common
 
 variable "project_id" {
   description = "GCP 프로젝트 ID"
@@ -9,5 +9,45 @@ variable "project_id" {
 variable "region" {
   description = "GCP 리전"
   type        = string
-  default     = "asia-east1"
+  default     = "asia-northeast3"
+}
+
+## storage
+variable "bucketName" {
+  description = "버킷 명"
+  type        = string
+  default     = "mcdatamanager"
+}
+
+## rdb
+variable "dbName" {
+  description = "DB 이름"
+  type        = string
+  default     = "mcdatamanager"
+}
+
+
+variable "userName" {
+  description = "DB 유저"
+  type        = string
+  default     = "mcdatamanager"
+}
+
+variable "password" {
+  description = "DB PW"
+  type        = string
+  default     = "mcdatamanager"
+}
+
+variable "cidr_range" {
+  description = "DB PW"
+  type        = string
+  default     = "0.0.0.0/0"
+}
+
+## nrdb
+variable "nrdbName" {
+  description = "DB 이름"
+  type        = string
+  default     = "(default)"
 }