From b982b1010ea4c75df73af1dd9e82965793088cda Mon Sep 17 00:00:00 2001
From: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>
Date: Mon, 27 Jan 2025 15:20:13 +0100
Subject: [PATCH] fix(server): import cmd config (#1377)

fix
---
 server/internal/infrastructure/gcp/config.go     | 1 +
 server/internal/infrastructure/gcp/taskrunner.go | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/internal/infrastructure/gcp/config.go b/server/internal/infrastructure/gcp/config.go
index f92694d71..cb6626b8d 100644
--- a/server/internal/infrastructure/gcp/config.go
+++ b/server/internal/infrastructure/gcp/config.go
@@ -13,5 +13,6 @@ type TaskConfig struct {
 	DecompressorDiskSideGb  int64  `default:"2000"`
 	CopierImage             string `default:"reearth/reearth-cms-copier"`
 	DBSecretName            string `default:"reearth-cms-db"`
+	AccountDBSecretName     string `default:"reearth-cms-db-users"`
 	CmsImage                string `default:"reearth/reearth-cms"`
 }
diff --git a/server/internal/infrastructure/gcp/taskrunner.go b/server/internal/infrastructure/gcp/taskrunner.go
index c89160cd1..ffa4a4991 100644
--- a/server/internal/infrastructure/gcp/taskrunner.go
+++ b/server/internal/infrastructure/gcp/taskrunner.go
@@ -218,7 +218,6 @@ func importItems(ctx context.Context, p task.Payload, conf *TaskConfig) error {
 
 	project := conf.GCPProject
 	region := conf.GCPRegion
-	dbSecretName := conf.DBSecretName
 
 	args := []string{
 		"item",
@@ -245,6 +244,7 @@ func importItems(ctx context.Context, p task.Payload, conf *TaskConfig) error {
 				Name: conf.CmsImage,
 				SecretEnv: []string{
 					"REEARTH_CMS_DB",
+					"REEARTH_CMS_DB_USERS",
 				},
 				Args: args,
 			},
@@ -255,9 +255,13 @@ func importItems(ctx context.Context, p task.Payload, conf *TaskConfig) error {
 		AvailableSecrets: &cloudbuild.Secrets{
 			SecretManager: []*cloudbuild.SecretManagerSecret{
 				{
-					VersionName: fmt.Sprintf("projects/%s/secrets/%s/versions/latest", project, dbSecretName),
+					VersionName: fmt.Sprintf("projects/%s/secrets/%s/versions/latest", project, conf.DBSecretName),
 					Env:         "REEARTH_CMS_DB",
 				},
+				{
+					VersionName: fmt.Sprintf("projects/%s/secrets/%s/versions/latest", project, conf.AccountDBSecretName),
+					Env:         "REEARTH_CMS_DB_USERS",
+				},
 			},
 		},
 	}