Merge pull request #350 from let-s-record-it/infra-349

Infra 349: 새로운 GCP 계정으로 이전

Author: soun997

.github/workflows/deploy.yml

@@ -75,10 +75,10 @@ jobs:
           key: ${{ secrets.GCP_SSH_PRIVATE_KEY }}
           envs: GITHUB_SHA
           script: |
-            docker ps -q -f letsrecordit-server && docker stop letsrecordit-server && docker rm letsrecordit-server
-            docker images -q ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:latest && docker rmi ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:latest
-            docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:latest
-            sudo docker-compose up -d
+            sudo docker ps -q -f name=letsrecordit-server && sudo docker stop letsrecordit-server && sudo docker rm letsrecordit-server
+            sudo docker images -q ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:latest && sudo docker rmi ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:latest
+            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:latest
+            sudo docker compose up -d
 
       - name: Health Check
         uses: appleboy/ssh-action@master
@@ -115,6 +115,6 @@ jobs:
             if [ -z "$HEALTH_CHECK_CONTAINER_NAME" ]; then
               echo "HEALTH_CHECK_CONTAINER_NAME not set, please add it on github actions secrets"
             else
-              docker logs --since "10m" "$HEALTH_CHECK_CONTAINER_NAME" 2>&1 || echo "Could not get logs for container: $HEALTH_CHECK_CONTAINER_NAME"
+              sudo docker logs --since "10m" "$HEALTH_CHECK_CONTAINER_NAME" 2>&1 || echo "Could not get logs for container: $HEALTH_CHECK_CONTAINER_NAME"
             fi
             exit 1

src/main/java/com/sillim/recordit/config/gcp/GCSConfig.java

@@ -1,30 +1,18 @@
 package com.sillim.recordit.config.gcp;
 
-import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
 import java.io.IOException;
-import java.io.InputStream;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.util.ResourceUtils;
 
 @Configuration
 @Profile("!test")
 public class GCSConfig {
 
-	@Value("${spring.cloud.gcp.storage.credentials.location}")
-	private String keyFileName;
-
 	@Bean
 	public Storage storage() throws IOException {
-		InputStream keyFile = ResourceUtils.getURL(keyFileName).openStream();
-
-		return StorageOptions.newBuilder()
-				.setCredentials(GoogleCredentials.fromStream(keyFile))
-				.build()
-				.getService();
+		return StorageOptions.getDefaultInstance().getService();
 	}
 }

src/main/resources/application-local.yml

@@ -22,9 +22,6 @@ spring:
   cloud:
     gcp:
       storage:
-        credentials:
-          location: ${GCP_CREDENTIAL_LOCATION}
-        project-id: ${GCP_PROJECT_ID}
         bucket: ${GCP_BUCKET_NAME}
   security:
     oauth2:

src/main/resources/application-prod.yml

@@ -19,9 +19,6 @@ spring:
   cloud:
     gcp:
       storage:
-        credentials:
-          location: ${GCP_CREDENTIAL_LOCATION}
-        project-id: ${GCP_PROJECT_ID}
         bucket: ${GCP_BUCKET_NAME}
   security:
     oauth2: