From cff5724b26f60526ec7caaee34edb891170c5bdd Mon Sep 17 00:00:00 2001
From: "kuma.jung" <yj.jung5078@gmail.com>
Date: Sun, 20 Oct 2024 13:10:18 +0900
Subject: [PATCH] remove comment and modify code

---
 .github/workflows/gradle.yml                  | 40 +++++++++----------
 build.gradle                                  |  2 +-
 .../sample/controller/SampleController.java   |  7 +---
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 38c2d71..21037f3 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -65,26 +65,26 @@ jobs:
       run: |
           docker push ${{ secrets.AWS_ACCOUNT_NUM }}.dkr.ecr.${{ env.REGION }}.amazonaws.com/demoapp:d${{ steps.vars.outputs.sha_short }}          
       
-    # - name: Download task definition
-    #   run: |
-    #      aws ecs describe-task-definition --task-definition demo-tmcdapne2 --query taskDefinition > task-definition.json
+    - name: Download task definition
+      run: |
+         aws ecs describe-task-definition --task-definition demo-tmcdapne2 --query taskDefinition > task-definition.json
 
-    # - name: Fill in the new image ID in the Amazon ECS task definition
-    #   id: task-def
-    #   uses: aws-actions/amazon-ecs-render-task-definition@v1
-    #   with:
-    #     task-definition: task-definition.json
-    #     container-name: demo
-    #     image: ${{ secrets.AWS_ACCOUNT_NUM }}.dkr.ecr.${{ env.REGION }}.amazonaws.com/demoapp:${{ steps.vars.outputs.sha_short }}
+    - name: Fill in the new image ID in the Amazon ECS task definition
+      id: task-def
+      uses: aws-actions/amazon-ecs-render-task-definition@v1
+      with:
+        task-definition: task-definition.json
+        container-name: demo
+        image: ${{ secrets.AWS_ACCOUNT_NUM }}.dkr.ecr.${{ env.REGION }}.amazonaws.com/demoapp:d${{ steps.vars.outputs.sha_short }}
 
-    # - name: Deploy to Amazon ECS
-    #   uses: aws-actions/amazon-ecs-deploy-task-definition@v2
-    #   with:
-    #     task-definition: ${{ steps.task-def.outputs.task-definition }}
-    #     service: demo-tmcdapne2
-    #     cluster: demo-tmcdapne2
-    #     wait-for-service-stability: true
-    #     codedeploy-appspec: appspec.json
-    #     codedeploy-application: demo_app
-    #     codedeploy-deployment-group: demo_app
+    - name: Deploy to Amazon ECS
+      uses: aws-actions/amazon-ecs-deploy-task-definition@v2
+      with:
+        task-definition: ${{ steps.task-def.outputs.task-definition }}
+        service: demo-tmcdapne2
+        cluster: demo-tmcdapne2
+        wait-for-service-stability: true
+        codedeploy-appspec: appspec.json
+        codedeploy-application: demo_app
+        codedeploy-deployment-group: demo_app
   
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b110fc4..a5447f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.example'
-version = '0.0.1-SNAPSHOT'
+version = '0.0.1'
 
 java {
 	toolchain {
diff --git a/src/main/java/com/example/demo/api/sample/controller/SampleController.java b/src/main/java/com/example/demo/api/sample/controller/SampleController.java
index 638f4d0..c15791f 100644
--- a/src/main/java/com/example/demo/api/sample/controller/SampleController.java
+++ b/src/main/java/com/example/demo/api/sample/controller/SampleController.java
@@ -12,8 +12,8 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/v1/sample")
 public class SampleController {
-    @Value("${sample.id}")
-    String sampleId;
+    // @Value("${sample.id}")
+    // String sampleId;
 
     @Value("${sample.password}")
     String samplePassword;
@@ -32,9 +32,6 @@ public String getTerraform(){
     @GetMapping("/testSecrets")
     public String getValue() {
         StringBuilder returnMsg = new StringBuilder();
-        returnMsg.append("Id :");
-        returnMsg.append(sampleId);
-        returnMsg.append("\n");
         returnMsg.append("Password :");
         returnMsg.append(samplePassword);
         return returnMsg.toString();