Revert "Merge pull request #141 from UMC5th-bias/main"

This reverts commit 318503f, reversing
changes made to 6eb93cc.

.github/workflows/main.yml

@@ -28,16 +28,13 @@ jobs:
       uses: actions/checkout@v3
 
     # (2) JDK 11 세팅
-    - name: Set up JDK 17
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '17'
 
     # (3) Gradle build (Test 제외)
-    - name: Grant execute permission for gradlew
-      run: chmod +x ./gradlew
-
     - name: Build with Gradle
       uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
       with:
@@ -67,5 +64,4 @@ jobs:
           --application-name ${{ env.CODE_DEPLOY_APPLICATION_NAME }} \
           --deployment-config-name CodeDeployDefault.AllAtOnce \
           --deployment-group-name ${{ env.CODE_DEPLOY_DEPLOYMENT_GROUP_NAME }} \
-          --s3-location bucket=$S3_BUCKET_NAME,key=$GITHUB_SHA.zip,bundleType=zip \
-          --file-exists-behavior OVERWRITE
+          --s3-location bucket=$S3_BUCKET_NAME,key=$GITHUB_SHA.zip,bundleType=zip

appspec.yml

@@ -13,21 +13,13 @@ permissions:
     group: ubuntu
 
 hooks:
-#  ApplicationStart:
-#    - location: scripts/run_new_was.sh
-#      timeout: 180
-#      runas: ubuntu
-#    - location: scripts/health_check.sh
-#      timeout: 180
-#      runas: ubuntu
-#    - location: scripts/switch.sh
-#      timeout: 180
-#      runas: ubuntu
-  AfterInstall:
-    - location: scripts/stop.sh
-      timeout: 60
-      runas: ubuntu
   ApplicationStart:
-    - location: scripts/start.sh
-      timeout: 60
-      runas: ubuntu
+    - location: scripts/run_new_was.sh
+      timeout: 180
+      runas: ubuntu
+    - location: scripts/health_check.sh
+      timeout: 180
+      runas: ubuntu
+    - location: scripts/switch.sh
+      timeout: 180
+      runas: ubuntu

scripts/health_check.sh

@@ -22,7 +22,7 @@ echo "> Start health check of WAS at 'http://127.0.0.1:${TARGET_PORT}' ..."
 for RETRY_COUNT in 1 2 3 4 5 6 7 8 9 10
 do
     echo "> #${RETRY_COUNT} trying..."
-    RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}"  http://127.0.0.1:${TARGET_PORT}/hello)
+    RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}"  http://127.0.0.1:${TARGET_PORT}/health)
 
     if [ ${RESPONSE_CODE} -eq 200 ]; then
         echo "> New WAS successfully running"

src/main/java/com/favoriteplace/app/controller/HealthCheckController.java

@@ -1,13 +1,15 @@
 package com.favoriteplace.app.controller;
 
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/health")
 public class HealthCheckController {
 
-    @GetMapping()
+    @GetMapping("/health")
     public String health(){
         return "hello success!";
     }