Skip to content

FrameworkVersion3ダウングレード差分 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yusaku-KASAI wants to merge 4 commits into
base: main
Choose a base branch
from
Open

FrameworkVersion3ダウングレード差分 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87bbea3
【プロジェクト構築】Lambda@Edge 追加 & 削除コマンド追加
Yusaku-KASAI May 31, 2025
bb167f0
version3対応
Yusaku-KASAI May 31, 2025
c3f144c
main取り込み
Yusaku-KASAI May 31, 2025
1e07fa4
Merge pull request #2 from Yusaku-KASAI/main
Yusaku-KASAI Jul 7, 2025
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
2 changes: 1 addition & 1 deletion infra/docker/development/sls-create/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
# Node.jsのインストール（Serverless Framework用）
RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
apt-get install -y nodejs && \
npm install -g serverless@4
npm install -g serverless@3

# AWS CLIのインストール
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
Expand Down
2 changes: 1 addition & 1 deletion infra/docker/development/sls-deploy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
# Node.jsのインストール（Serverless Framework用）
RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
apt-get install -y nodejs && \
npm install -g serverless@4
npm install -g serverless@3

# AWS CLIのインストール
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
Expand Down
21 changes: 19 additions & 2 deletions serverless/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions serverless/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"devDependencies": {
"serverless-better-credentials": "^2.0.1",
"serverless-domain-manager": "^8.0.0",
"serverless-iam-roles-per-function": "^3.2.0",
"serverless-lambda-edge-pre-existing-cloudfront": "^1.2.0",
Expand Down
12 changes: 5 additions & 7 deletions serverless/serverless-global.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,10 @@ custom:
includeLayers: true
number: 3

stages:
default:
params: ${file(./.env.${sls:stage}.yml)}
stg:
params: ${file(./.env.stg.yml)}
prd:
params: ${file(./.env.prd.yml)}
params:
default: ${file(./.env.${sls:stage}.yml)}
stg: ${file(./.env.stg.yml)}
prd: ${file(./.env.prd.yml)}

resources:
Resources:
Expand Down Expand Up @@ -111,6 +108,7 @@ resources:
Name: ${self:service}-${sls:stage}-lambda-edge-function-arn

plugins:
- serverless-better-credentials
# - serverless-iam-roles-per-function # roleごと置き換えるので使用せず
- serverless-prune-plugin
# - serverless-lambda-edge-pre-existing-cloudfront # Cloudformation管理ではなさそうなので自分で制御する
17 changes: 8 additions & 9 deletions serverless/serverless.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
# "service" is the name of this project. This will also be added to your AWS resource names.
service: pj-name-serverless

frameworkVersion: "3"

provider:
name: aws
stage: stg
region: ap-northeast-1
# 以下はlambdaのデフォルト設定(置き換えのものもマージのものもある)
runtime: python3.12
runtime: python3.11
# memorySize: 128
# timeout: 10
# environment:
Expand Down Expand Up @@ -453,14 +455,10 @@ custom:
securityPolicy: tls_1_2
apiType: http
autoDomain: false

stages:
default:
params: ${file(./.env.${sls:stage}.yml)}
stg:
params: ${file(./.env.stg.yml)}
prd:
params: ${file(./.env.prd.yml)}
params:
default: ${file(./.env.${sls:stage}.yml)}
stg: ${file(./.env.stg.yml)}
prd: ${file(./.env.prd.yml)}

resources:
Resources:
Expand Down Expand Up @@ -935,6 +933,7 @@ resources:
Value: !Ref S3Bucket2

plugins:
- serverless-better-credentials
- serverless-iam-roles-per-function
- serverless-python-requirements
- serverless-prune-plugin
Expand Down