Merge pull request #94 from BbeumbungE/dev

Hotfix: GOOGLE CREDENTIAL 오류 수정
BbeumbungE · Oct 5, 2023 · 11a514e · 11a514e
2 parents d9144b8 + f5d59c1
commit 11a514e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/.github/workflows/deploy_to_dev.yml b/.github/workflows/deploy_to_dev.yml
@@ -19,6 +19,12 @@ jobs:
           touch ./src/main/resources/application.yml 
           echo "${{ secrets.PROPERTIES_DEV }}" > ./src/main/resources/application.yml
         shell: bash
+
+      - name: Make key.json
+        run: |
+          touch ./src/main/resources/key.json
+          echo "${{ secrets.VISION_KEY }}" > ./src/main/resources/key.json
+        shell: bash
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2

diff --git a/.github/workflows/deploy_to_prod.yml b/.github/workflows/deploy_to_prod.yml
@@ -19,7 +19,13 @@ jobs:
           touch ./src/main/resources/application.yml 
           echo "${{ secrets.PROPERTIES_PROD }}" > ./src/main/resources/application.yml
         shell: bash
-
+
+      - name: Make key.json
+        run: |
+          touch ./src/main/resources/key.json
+          echo "${{ secrets.VISION_KEY }}" > ./src/main/resources/key.json
+        shell: bash
+
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-
+rich-suprstate-386908-7630a2d1a95f.json
 ### STS ###
 .apt_generated
 .classpath

diff --git a/src/main/java/com/siliconvalley/domain/google/service/GoogleVisionApiService.java b/src/main/java/com/siliconvalley/domain/google/service/GoogleVisionApiService.java
@@ -8,6 +8,7 @@
 import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -19,8 +20,8 @@
 @Slf4j
 public class GoogleVisionApiService {
 
-    @Value("${google.service.account.key}")
-    private String serviceAccountKey;
+    @Value("${GOOGLE_APPLICATION_CREDENTIALS}")
+    private String serviceAccountKeyPath;
 
     public Map<String, Float> detectLabels(String filePath) {
         List<AnnotateImageRequest> requests = new ArrayList<>();
@@ -39,9 +40,8 @@ public Map<String, Float> detectLabels(String filePath) {
                     .build();
             requests.add(request);
 
-            GoogleCredentials credentials = GoogleCredentials.fromStream(
-                    new ByteArrayInputStream(serviceAccountKey.getBytes(StandardCharsets.UTF_8))
-            );
+            GoogleCredentials credentials = GoogleCredentials.fromStream(new FileInputStream(serviceAccountKeyPath));
+
             ImageAnnotatorSettings settings = ImageAnnotatorSettings.newBuilder()
                     .setCredentialsProvider(FixedCredentialsProvider.create(credentials))
                     .build();