Skip to content

Commit

Permalink
chore: blue-green 배포 방식 변경에 따른 CD-dev 워크 플로우 파일 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
whereami2048 committed May 7, 2024
1 parent 62310e1 commit fd77cad
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 28 deletions.
23 changes: 6 additions & 17 deletions .github/workflows/CD-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CD-dev

on:
push:
branches: [ "main" ]
branches: [ "feat/flight-17" ]

permissions:
contents: read
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
echo "DB_URL=${{ secrets.DEV_DB_URL }}" >> ./.env
echo "DB_USERNAME=${{ secrets.DEV_DB_USERNAME }}" >> ./.env
echo "DB_PASSWORD=${{ secrets.DEV_DB_PASSWORD }}" >> ./.env
# echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> ./.env
echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> ./.env
# echo "KAKAO_APP_ID=${{ secrets.KAKAO_APP_ID }}" >> ./.env
# echo "APPLE_APP_ID=${{ secrets.APPLE_APP_ID }}" >> ./.env
# echo "S3_BUCKET=${{ secrets.S3_BUCKET }}" >> ./.env
Expand All @@ -65,17 +65,6 @@ jobs:
docker build -t ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }} .
docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}
## deploy.sh 파일 서버로 전달
- name: Send deploy.sh
uses: appleboy/scp-action@master
with:
username: ubuntu
host: ${{ secrets.HOST }}
key: ${{ secrets.KEY }}
port: 22
source: "./scripts/"
target: "/home/ubuntu/"

- name: Send docker-compose.yml
uses: appleboy/scp-action@master
with:
Expand All @@ -95,7 +84,7 @@ jobs:
key: ${{ secrets.KEY }}
script: |
sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}
chmod 777 ./scripts/deploy.sh
cp ./scripts/deploy.sh ./deploy.sh
./deploy.sh
docker image prune -f
sudo docker stop ${{secrets.DOCKER_REPOSITORY}}
sudo docker rm ${{secrets.DOCKER_REPOSITORY}}
sudo docker run --name ${{secrets.DOCKER_REPOSITORY}} -d -p 8080:8080 ${{secrets.DOCKER_REPOSITORY}}
docker image prune -f
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,22 @@ import org.springframework.stereotype.Component
class AuthInvoker (
private val authHandlerList: List<AuthHandler>,
private val jwtProvider: JwtProvider,
private val userReader: UserReader
// private val userReader: UserReader
) {

fun invoke(request: SocialLogin.Request, provider: SocialLoginProvider): SocialLogin.Response {
val response = attemptLogin(request, provider)
return TransactionUtils.writable {
return@writable userReader.findBySocialIdOrNull(response.socialId)?.let {
val accessToken = jwtProvider.generateAccessToken(Claims.UserClaims(it.id))
val refreshToken = jwtProvider.generateRefreshToken(Claims.UserClaims(it.id))
SocialLogin.Response.Success(accessToken, refreshToken)
} ?: run {
val registrationToken = jwtProvider.generateRegistrationToken(Claims.RegistrationClaims(response.socialId, provider))
SocialLogin.Response.UnRegistered(registrationToken, response.nickName)
}
}
return SocialLogin.Response.Success("accessToken", "refreshToken")
// return TransactionUtils.writable {
// return@writable userReader.findBySocialIdOrNull(response.socialId)?.let {
// val accessToken = jwtProvider.generateAccessToken(Claims.UserClaims(it.id))
// val refreshToken = jwtProvider.generateRefreshToken(Claims.UserClaims(it.id))
// SocialLogin.Response.Success(accessToken, refreshToken)
// } ?: run {
// val registrationToken = jwtProvider.generateRegistrationToken(Claims.RegistrationClaims(response.socialId, provider))
// SocialLogin.Response.UnRegistered(registrationToken, response.nickName)
// }
// }
}

private fun attemptLogin(request: SocialLogin.Request, provider: SocialLoginProvider): AuthHandler.Response {
Expand Down

0 comments on commit fd77cad

Please sign in to comment.