Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Bug Template
about: ๋ฒ„๊ทธ ํ…œํ”Œ๋ฆฟ
title: ''
labels: ''
assignees: ''
---

## ๐Ÿ“ ๊ฐœ์š” ๋ฐ ์ฆ์ƒ

- ๋ฒ„๊ทธ ๋ฐœ์ƒ ์ƒํ™ฉ:
- ๊ธฐ๋Œ€ํ•œ ๋™์ž‘
- (์–ด๋–ป๊ฒŒ ๋™์ž‘ํ•  ๊ฒƒ์ด๋ผ๊ณ  ๊ธฐ๋Œ€ํ–ˆ๋Š”์ง€ ์ž‘์„ฑํ•ฉ๋‹ˆ๋‹ค.)
- ์‹ค์ œ ๋™์ž‘
- (์‹ค์ œ๋กœ ์–ด๋–ป๊ฒŒ ๋™์ž‘ํ–ˆ๋Š”์ง€ ์ž‘์„ฑํ•ฉ๋‹ˆ๋‹ค.)

<br>

## ๐Ÿ“ธ ์Šคํฌ๋ฆฐ์ƒท (ํ•„์š” ์‹œ)

<br>

## ๐Ÿ› ๋ฒ„๊ทธ ์žฌํ˜„ ๋ฐฉ๋ฒ•

1. '...'์— ๊ฐ„๋‹ค.
2. '....'๋ฅผ ํด๋ฆญํ•œ๋‹ค.
3. '....'๊นŒ์ง€ ์Šคํฌ๋กค์„ ๋‚ด๋ฆฐ๋‹ค.
4. ์—๋Ÿฌ๋ฅผ ํ™•์ธํ•œ๋‹ค.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature Template
about: ๊ธฐ๋Šฅ ๊ตฌํ˜„ ์ž‘์„ฑ ํ…œํ”Œ๋ฆฟ
title: ''
labels: ''
assignees: ''
---

## ๐Ÿ“ ๊ตฌํ˜„ ๋ชฉ๋ก

- [ ] ์ž‘์—…1
- [ ] ์ž‘์—…2
- [ ] ์ž‘์—… 2-1
- [ ] ์ž‘์—… 2-2

<br>

## ๐Ÿ’ก ์ฐธ๊ณ ์ž๋ฃŒ

- (์—†๋‹ค๋ฉด ์ด ํ•ญ๋ชฉ์„ ์ง€์›Œ์ฃผ์„ธ์š”.)
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/refactor-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Refactor Template
about: ๋ฆฌํŒฉํ† ๋งํ•  ๊ธฐ๋Šฅ ํ…œํ”Œ๋ฆฟ
title: ''
labels: ''
assignees: ''
---

## ๐Ÿค” ์ฝ”๋“œ ๊ฐœ์„  ํ•„์š”์„ฑ

- (์ฝ”๋“œ๋ฅผ ์–ด๋–ค ์ด์œ ์—์„œ ๋ณ€๊ฒฝํ•˜๋Š”์ง€)

<br>

## ๐Ÿ“ ๊ตฌํ˜„ ๋ชฉ๋ก

- [ ] ๊ตฌํ˜„ ๋‚ด์šฉ1
- [ ] ์„ธ๋ถ€ ๊ตฌํ˜„ ๋‚ด์šฉ
- [ ] ๊ตฌํ˜„ ๋‚ด์šฉ2
- [ ] ์„ธ๋ถ€ ๊ตฌํ˜„ ๋‚ด์šฉ

<br>

## ๐Ÿ’ก ์ฐธ๊ณ ์ž๋ฃŒ

- (์—†๋‹ค๋ฉด ์ง€์›Œ๋„ ๋ฉ๋‹ˆ๋‹ค!)
24 changes: 24 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
## ๐ŸŽฏ ๊ด€๋ จ ์ด์Šˆ
close

## ๐Ÿš€ ์–ด๋–ค ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ–ˆ๋‚˜์š”?
-

### ๐Ÿ•ถ๏ธ ์–ด๋–ป๊ฒŒ ํ•ด๊ฒฐํ–ˆ๋‚˜์š”?
-

<!-- optional
### ๐Ÿง ์–ด๋–ค ๋ถ€๋ถ„์— ์ง‘์ค‘ํ•˜์—ฌ ๋ฆฌ๋ทฐํ•ด์•ผ ํ• ๊นŒ์š”?
-

### ๐Ÿงช ํ…Œ์ŠคํŠธ
- [ ] ๋ณธ PR์—์„œ ์ง„ํ–‰ํ•œ ํ…Œ์ŠคํŠธ ์‹œ๋‚˜๋ฆฌ์˜ค ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”(ํ…Œ์ŠคํŠธ์ฝ”๋“œ ํฌํ•จ ์‹œ ์ œ์™ธ ๊ฐ€๋Šฅ)
-

### ๐Ÿ“š ๋ฌธ์„œํ™”
- [ ] (API ๊ฐœ๋ฐœ ์—…๋ฌด๋ผ๋ฉด) API ๋ฌธ์„œ ์—…๋ฐ์ดํŠธ ํ•˜์…จ๋‚˜์š”?

### ๐Ÿ“‘ ์ฐธ๊ณ ์ž๋ฃŒ
-

-->
75 changes: 75 additions & 0 deletions .github/workflows/deploy-lambda.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Deploy to Lambda (ECR)

on:
push:
branches: [ "develop", "main" ]

# OIDC ์ธ์ฆ์„ ์œ„ํ•œ ๊ถŒํ•œ ์„ค์ •
permissions:
id-token: write
contents: read

jobs:
deploy:
name: Build, Push to ECR, and Deploy to Lambda
runs-on: ubuntu-latest

# ๋ธŒ๋žœ์น˜์— ๋”ฐ๋ผ ์‚ฌ์šฉํ•  ํ™˜๊ฒฝ ์„ ํƒ
environment: ${{ github.ref == 'refs/heads/main' && 'PROD' || 'DEV' }}

steps:
- name: Checkout code
uses: actions/checkout@v4

# AWS ์ž๊ฒฉ ์ฆ๋ช… ์„ค์ •
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ vars.AWS_ROLE_ARN }}
aws-region: ${{ vars.AWS_REGION }}

# Amazon ECR ๋กœ๊ทธ์ธ
- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2

# Docker ์ด๋ฏธ์ง€ ๋นŒ๋“œ ๋ฐ ํ‘ธ์‹œ
- name: Build, tag, and push image to Amazon ECR
id: build-image
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
ECR_REPOSITORY: ${{ vars.ECR_REPOSITORY_NAME }}
IMAGE_TAG: ${{ github.sha }}
run: |
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest -f Dockerfile .

docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest

echo "image_uri=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT

# Lambda ํ•จ์ˆ˜ ์—…๋ฐ์ดํŠธ
- name: Deploy new image to AWS Lambda
run: |
aws lambda update-function-code \
--function-name ${{ vars.LAMBDA_FUNCTION_NAME }} \
--image-uri ${{ steps.build-image.outputs.image_uri }}

# ์ฝ”๋“œ ์—…๋ฐ์ดํŠธ๊ฐ€ ์™„๋ฃŒ๋  ๋•Œ๊นŒ์ง€ ๋Œ€๊ธฐ
- name: Wait for Lambda function update to complete
run: |
aws lambda wait function-updated \
--function-name ${{ vars.LAMBDA_FUNCTION_NAME }}

# Lambda ํ™˜๊ฒฝ ๋ณ€์ˆ˜ ์„ค์ •
- name: Update Lambda Environment Variables
run: |
aws lambda update-function-configuration \
--function-name ${{ vars.LAMBDA_FUNCTION_NAME }} \
--environment "Variables={ \
REGION_NAME=${{ vars.AWS_REGION }}, \
LAMBDA_FUNCTION_NAME=${{ vars.LAMBDA_FUNCTION_NAME }}, \
ECR_REPOSITORY_NAME=${{ vars.ECR_REPOSITORY_NAME }}, \
BUCKET_NAME=${{ vars.BUCKET_NAME }}, \
RESIZED_BUCKET=${{ vars.RESIZED_BUCKET }} \
}"
49 changes: 0 additions & 49 deletions .github/workflows/dev-deploy-lambda.yaml

This file was deleted.

9 changes: 5 additions & 4 deletions lambda_compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
import base64
import re
import time
import os
from urllib.parse import quote_plus

REGION_NAME = "ap-northeast-2"
BUCKET_NAME = "snorose-bucket"
REGION_NAME = os.environ.get('REGION_NAME')
BUCKET_NAME = os.environ.get('BUCKET_NAME')
TEST_KEY = "post-attachment/1718321/test_video.mp4"
FUNC_CONSOLE = "CreateOptimizedContentAttachment"
FUNC_IMAGE = "CreateOptimizedContentAttachmentECR"
LAMBDA_FUNCTION_NAME = os.environ.get('LAMBDA_FUNCTION_NAME')
ECR_REPOSITORY_NAME = os.environ.get('ECR_REPOSITORY_NAME')

client = boto3.client('lambda', region_name=REGION_NAME)

Expand Down
2 changes: 1 addition & 1 deletion lambda_function.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from PIL import Image, ImageOps

s3_client = boto3.client('s3')
resized_bucket = 'snorose-bucket-resized'
resized_bucket = os.environ.get('RESIZED_BUCKET')

IMG_EXT_LIST = ("jpg","jpeg","png","jfif","bmp","webp")
VDO_EXT_LIST = ("mp4","mov")
Expand Down