fix: update terraform log path and configuration, adjust docker-compo…

…se volume mappings
ictsc · Nov 19, 2024 · fe4f3a3 · fe4f3a3
1 parent 2311cb6
commit fe4f3a3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/config.sample.yaml b/config.sample.yaml
@@ -8,6 +8,7 @@ worker:
 
 terraform:
   options:
+    path: "/usr/bin/terraform"
     workingDirectory: "/deploy"
     parallelism: 4
   secrets:

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -5,12 +5,13 @@ services:
       SLACK_WEBHOOK_URL:
       DISCORD_WEBHOOK_team100:
     build: .
-    #working_dir: /deploy
     network_mode: "host"
     tty: true
     #    ports:
     #      - "8089:8089"
     volumes:
-      # tfファイルのディレクトリ
-      - ./deploy:/deploy
+      - ./config.yaml:/app/config.yaml
+      - ./logs:/app/logs
       - /etc/localtime:/etc/localtime:ro
+# tfファイルのディレクトリをマウント
+#      - ../tf-dir:/deploy
diff --git a/pkg/terraform/client.go b/pkg/terraform/client.go
@@ -25,7 +25,7 @@ func NewClient(path, workDir, workspace, parallelism string, stdout bool, envs [
 	mergeEnv := append(os.Environ(), envs...)
 	mergeEnv = append(mergeEnv, "TF_WORKSPACE="+workspace)
 	mergeEnv = append(mergeEnv, "TF_LOG=INFO")
-	logPath := fmt.Sprintf("TF_LOG_PATH=/app/recreate-logs/%s-%s.json", workspace, time.Now().Format("2006-01-02-15-04-05"))
+	logPath := fmt.Sprintf("TF_LOG_PATH=/app/logs/%s-%s.json", workspace, time.Now().Format("2006-01-02-15-04-05"))
 	mergeEnv = append(mergeEnv, logPath)
 	c := &Client{
 		parallelism: parallelism,
@@ -37,7 +37,7 @@ func NewClient(path, workDir, workspace, parallelism string, stdout bool, envs [
 	log.Printf("%#v", c.env)
 	str, err := c.init()
 	if err != nil {
-		panic(str)
+		log.Println(str)
 	}
 	return c
 }

diff --git a/pkg/terraform/operation.go b/pkg/terraform/operation.go
@@ -39,19 +39,6 @@ func (c *Client) DestroyFromProblemId(problemId string, plan bool) (string, erro
 	return c.apply(str)
 }
 
-func (c *Client) RecreateTeam(plan bool) (string, int, error) {
-	_, resourceCount, err := c.GetResourceTargetId("")
-	if err != nil {
-		return "", resourceCount, err
-	}
-
-	if _, err := c.DestroyTeam(plan); err != nil {
-		return "", resourceCount, err
-	}
-	result, err := c.CreateTeam(plan)
-	return result, resourceCount, err
-}
-
 func (c *Client) RecreateFromProblemId(problemId string, plan bool) (string, int, error) {
 	str, resourceCount, err := c.GetResourceTargetId("module." + problemId)
 	/*