Merge branch 'ci/backend' of github.com:GreenTeaProgrammers/WhereChil…

…dBus into ci/backend

.github/workflows/deploy-to-gcloud.yml

@@ -6,7 +6,9 @@ permissions:
 on:
   push:
     branches:
-      - ci/backend # デプロイをトリガーするブランチを指定
+      - develop
+    paths:
+      - "backend/**"
 
 jobs:
   setup-build-deploy:

.github/workflows/deploy_cloudrun_machine_learning.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - develop
-      - feature/machine-learning/cicd
     paths:
       - "machine-learning/**"
 

backend/Dockerfile

@@ -19,9 +19,6 @@ ARG ML_ADDR
 
 ARG INSIDE_OF_CREDENTIALS
 
-RUN echo "Port is: $PORT" && echo "Mode is: $MODE_DEV"
-
-
 # .env ファイルを生成
 RUN echo "DSN=$DSN" > .env \
     && echo "DB_USER_NAME=$DB_USER_NAME" >> .env \
@@ -70,12 +67,5 @@ COPY --from=builder /srv/grpc/.env /app/.env
 # secretsディレクトリを/appディレクトリにコピー
 COPY --from=builder /srv/grpc/secrets /app/secrets
 
-RUN ls -la /app/secrets
-RUN echo "gcp-credentials.json is: $(cat /app/secrets/gcp-credentials.json)"
-
-# /appディレクトリ以下の全てのサブファイルディレクトリも含めた構造を出力
-RUN ls -laR /app
-ENV GOOGLE_APPLICATION_CREDENTIALS=/app/secrets/gcp-credentials.json
-
 # アプリケーションの起動
 ENTRYPOINT ["/app/server"]

backend/cmd/server/main.go

@@ -15,6 +15,7 @@ import (
 	mlv1 "github.com/GreenTeaProgrammers/WhereChildBus/backend/proto-gen/go/machine_learning/v1"
 	"github.com/go-sql-driver/mysql"
 	_ "github.com/go-sql-driver/mysql"
+	"google.golang.org/api/option"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
@@ -73,7 +74,8 @@ func main() {
 	// Cloud Storageへの接続を開始
 	log.Println("Connecting to Cloud Storage...")
 	ctx := context.Background()
-	storageClient, err := storage.NewClient(ctx)
+	credPath := "./secrets/gcp-credentials.json"
+	storageClient, err := storage.NewClient(ctx, option.WithCredentialsFile(credPath))
 	if err != nil {
 		log.Fatalf("Failed to create Cloud Storage client: %v", err)
 	}