fix(server): use configurable DB secret name instead of hardcoding (#…

…1359) * fix: add secret db to env
reearth · Jan 17, 2025 · a6f1815 · a6f1815
1 parent b271769
commit a6f1815
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/server/.env.example b/server/.env.example
@@ -98,6 +98,7 @@ REEARTH_CMS_TASK_DECOMPRESSORTOPIC=
 REEARTH_CMS_TASK_DECOMPRESSORGZIPEXT=
 REEARTH_CMS_TASK_DECOMPRESSORMACHINETYPE=
 REEARTH_CMS_TASK_COPIERIMAGE=
+REEARTH_CMS_TASK_DBSECRETNAME=
 
 #AWS
 REEARTH_CMS_AWSTASK_TOPICARN=

diff --git a/server/internal/infrastructure/gcp/config.go b/server/internal/infrastructure/gcp/config.go
@@ -12,4 +12,5 @@ type TaskConfig struct {
 	DecompressorMachineType string `default:"E2_HIGHCPU_8"`
 	DecompressorDiskSideGb  int64  `default:"2000"`
 	CopierImage             string `default:"reearth/reearth-cms-copier"`
+	DBSecretName            string `default:"reearth-cms-db"`
 }
diff --git a/server/internal/infrastructure/gcp/taskrunner.go b/server/internal/infrastructure/gcp/taskrunner.go
@@ -156,6 +156,7 @@ func copy(ctx context.Context, p task.Payload, conf *TaskConfig) error {
 
 	project := conf.GCPProject
 	region := conf.GCPRegion
+	dbSecretName := conf.DBSecretName
 
 	build := &cloudbuild.Build{
 		Timeout:  "86400s", // 1 day
@@ -179,7 +180,7 @@ func copy(ctx context.Context, p task.Payload, conf *TaskConfig) error {
 		AvailableSecrets: &cloudbuild.Secrets{
 			SecretManager: []*cloudbuild.SecretManagerSecret{
 				{
-					VersionName: fmt.Sprintf("projects/%s/secrets/reearth-cms-db/versions/latest", project),
+					VersionName: fmt.Sprintf("projects/%s/secrets/%s/versions/latest", project, dbSecretName),
 					Env:         "REEARTH_CMS_WORKER_DB",
 				},
 			},