deploy: ECR에 image push하는 스크립트 추가 및 서버 에러 수정

.github/workflows/packy-cd.yml

@@ -0,0 +1,41 @@
+name: packy API Server - CD
+
+on:
+  push:
+    branches:
+      - develop
+
+permissions:
+  contents: read
+
+jobs:
+  CD:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.ACTION_TOKEN }}
+          submodules: true
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: ${{ secrets.AWS_REGION }}
+          role-session-name: GitHubActions
+          role-to-assume: ${{ secrets.ROLE_ARN }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Build with Gradle
+        run: ./gradlew -Pdev clean jib -x test

.gitignore

@@ -38,3 +38,4 @@ out/
 
 ### application.yml ###
 /packy-api/src/main/resources/
+/packy-domain/src/main/resources/

packy-api/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'java'
+    id 'com.google.cloud.tools.jib' version '3.4.0'
 }
 
 group = 'com.dilly'
@@ -34,7 +35,7 @@ dependencies {
     // webflux (for WebClient)
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
 
-    // TODO: Remove this dependency
+    // json parser
     implementation 'com.google.code.gson:gson:2.8.7'
 }
 
@@ -49,5 +50,11 @@ tasks.register('copySecret', Copy) {
     into './src/main/resources'
 }
 
+if (project.hasProperty('dev')) {
+    apply from: project.file('profile-dev.gradle');
+} else if (project.hasProperty('prod')) {
+    apply from: project.file('profile-prod.gradle');
+}
+
 bootJar.enabled = true
 jar.enabled = false

packy-api/profile-dev.gradle

@@ -0,0 +1,20 @@
+jib {
+    from {
+        image = "amazoncorretto:17.0.4-al2"
+        platforms {
+            platform {
+                architecture = "arm64"
+                os = "linux"
+            }
+        }
+    }
+    to {
+        image = "714646531644.dkr.ecr.ap-northeast-2.amazonaws.com/packy-dev"
+        tags = ["latest", "${project.name}-" + System.currentTimeMillis()]
+    }
+    container {
+        creationTime = "USE_CURRENT_TIMESTAMP"
+        jvmFlags = ['-Dspring.profiles.active=dev', '-XX:+UseContainerSupport']
+        ports = ['8082']
+    }
+}

packy-api/profile-prod.gradle

@@ -0,0 +1,20 @@
+jib {
+    from {
+        image = "amazoncorretto:17.0.4-al2"
+        platforms {
+            platform {
+                architecture = "arm64"
+                os = "linux"
+            }
+        }
+    }
+    to {
+        image = "714646531644.dkr.ecr.ap-northeast-2.amazonaws.com/packy-prod"
+        tags = ["latest", "${project.name}-" + System.currentTimeMillis()]
+    }
+    container {
+        creationTime = "USE_CURRENT_TIMESTAMP"
+        jvmFlags = ['-Dspring.profiles.active=prod', '-XX:+UseContainerSupport']
+        ports = ['8083']
+    }
+}

packy-api/src/main/java/com/dilly/admin/api/AdminController.java

@@ -0,0 +1,19 @@
+package com.dilly.admin.api;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.dilly.global.response.DataResponseDto;
+
+@RestController
+@RequestMapping("/api/v1/admin")
+public class AdminController {
+
+	@GetMapping("/health")
+	public DataResponseDto<String> healthCheck() {
+		String activeProfile = System.getProperty("spring.profiles.active");
+
+		return DataResponseDto.from("This is " + activeProfile + " server!");
+	}
+}

packy-api/src/main/java/com/dilly/auth/api/AuthController.java

@@ -34,7 +34,7 @@ public DataResponseDto<JwtResponse> signUp(
 	}
 
 	@GetMapping("/token/kakao/{code}")
-	public DataResponseDto<String> getKakaoAccessToken(@PathVariable String code) {
+	public DataResponseDto<String> getKakaoAccessToken(@PathVariable(name = "code") String code) {
 		return DataResponseDto.from(kakaoService.getKakaoAccessToken(code));
 	}
 }

packy-domain/build.gradle

@@ -28,5 +28,12 @@ test {
     useJUnitPlatform()
 }
 
+processResources.dependsOn('copySecret')
+tasks.register('copySecret', Copy) {
+    from '../packy-submodule/domain'
+    include '*'
+    into './src/main/resources'
+}
+
 bootJar.enabled = false
 jar.enabled = true

packy-domain/src/main/java/com/dilly/global/config/JpaConfig.java

@@ -0,0 +1,15 @@
+package com.dilly.global.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+@Configuration
+@EnableJpaRepositories(basePackages = "com.dilly",
+	excludeFilters = @ComponentScan.Filter(
+		type = FilterType.ASPECTJ, pattern = "com.dilly.jwt.*"
+	)
+)
+public class JpaConfig {
+}

packy-domain/src/main/java/com/dilly/global/config/RedisConfig.java

@@ -0,0 +1,9 @@
+package com.dilly.global.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+
+@Configuration
+@EnableRedisRepositories(basePackages = "com.dilly.jwt")
+public class RedisConfig {
+}