diff --git a/.claude/rules/infra/development.md b/.claude/rules/infra/development.md index decd155a301..9de9c346542 100644 --- a/.claude/rules/infra/development.md +++ b/.claude/rules/infra/development.md @@ -192,7 +192,7 @@ account ID は CDK の `cdk.context.json` コミット方針で既にリポジ | リージョン | 既定 `ap-northeast-1` | | CDK バージョン | `aws-cdk-lib` は全プロジェクトで**同一バージョンにピン留め**(現在 `2.232.1`)。1 つだけ上げない | | タグ | スタック全体に `Project` / `Stage` / `Service` / `ManagedBy=CDK` | -| Node Lambda ランタイム | **`NODEJS_22_X` に統一**(例外: mesh-v2 の Ruby Lambda は `RUBY_3_4`)。新しい Lambda も 22 に合わせる | +| Node Lambda ランタイム | **`NODEJS_22_X` に統一**(例外: mesh-v2 の Ruby Lambda は Ruby 4.0 = `ruby4.0`)。新しい Lambda も 22 に合わせる | | Lambda bundling | esbuild: `minify: true`, `sourceMap: stage !== 'prod'`, `externalModules: []`(全同梱) | | CloudWatch LogGroup | 明示生成し retention = prod `ONE_MONTH` / 他 `ONE_WEEK`、`removalPolicy: DESTROY` | | HTTP API スロットリング | stage-level のスロットリングを必ず設定(値はプロジェクトごと。WAF は使わない) | diff --git a/.claude/rules/infra/smalruby-mesh-v2.md b/.claude/rules/infra/smalruby-mesh-v2.md index ebc6e5019d3..73e2921980e 100644 --- a/.claude/rules/infra/smalruby-mesh-v2.md +++ b/.claude/rules/infra/smalruby-mesh-v2.md @@ -88,7 +88,7 @@ AppSync JavaScript resolvers (`js/resolvers/`, `js/functions/`) handle most oper スタック削除・差し替えでデータが消える前提。 - **認証は API_KEY のみ**(キー有効期限 365 日。期限切れは redeploy でローテート)。 ID Token / IAM 認証は使っていない。 -- **Ruby Lambda** `MeshV2-GraphQL{suffix}` は `RUBY_3_4`。マルチバイト対策で +- **Ruby Lambda** `MeshV2-GraphQL{suffix}` は Ruby 4.0(`ruby4.0`)。マルチバイト対策で `LANG` / `LC_ALL=en_US.UTF-8` を注入している(外さない)。担当フィールドは `createDomain` / `createGroup` / `dissolveGroup` / `leaveGroup` / `recordEventsByNode` (handler の fieldName case 分岐。エラーは rescue せず AppSync に伝播させる方針)。 diff --git a/.vscode/cargo.env.example b/.vscode/cargo.env.example index 2a7d8d573df..8e2a2ddf707 100644 --- a/.vscode/cargo.env.example +++ b/.vscode/cargo.env.example @@ -8,12 +8,12 @@ # システム Ruby ではなく rbenv 配下の Ruby を使うために必要。 # # 設定例: -# RUBY=/Users//.anyenv/envs/rbenv/versions/3.4.12/bin/ruby -# PATH=/Users//.anyenv/envs/rbenv/versions/3.4.12/bin:/usr/bin:/bin +# RUBY=/Users//.anyenv/envs/rbenv/versions/4.0.9/bin/ruby +# PATH=/Users//.anyenv/envs/rbenv/versions/4.0.9/bin:/usr/bin:/bin # # Linux + rbenv の場合: -# RUBY=/home//.rbenv/versions/3.4.12/bin/ruby -# PATH=/home//.rbenv/versions/3.4.12/bin:/usr/bin:/bin +# RUBY=/home//.rbenv/versions/4.0.9/bin/ruby +# PATH=/home//.rbenv/versions/4.0.9/bin:/usr/bin:/bin RUBY=/path/to/your/ruby PATH=/path/to/your/ruby/bin:/usr/bin:/bin diff --git a/infra/Dockerfile b/infra/Dockerfile index 5ef5e5f87cd..84b02cd434c 100644 --- a/infra/Dockerfile +++ b/infra/Dockerfile @@ -51,8 +51,8 @@ RUN \ && git clone --depth=1 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build ENV PATH="${RBENV_ROOT}/bin:${RBENV_ROOT}/shims:${PATH}" -# Install Ruby 3.4.12 -ARG RUBY_VERSION=3.4.12 +# Install Ruby 4.0.9 (same as the mesh-v2 Lambda runtime) +ARG RUBY_VERSION=4.0.9 RUN rbenv install ${RUBY_VERSION} && rbenv global ${RUBY_VERSION} RUN gem install bundler --no-document diff --git a/infra/smalruby-mesh-v2/.ruby-version b/infra/smalruby-mesh-v2/.ruby-version index 25e863282b5..7919852fe10 100644 --- a/infra/smalruby-mesh-v2/.ruby-version +++ b/infra/smalruby-mesh-v2/.ruby-version @@ -1 +1 @@ -3.4.12 +4.0.9 diff --git a/infra/smalruby-mesh-v2/.standard.yml b/infra/smalruby-mesh-v2/.standard.yml index b515330f53d..63c88788d5b 100644 --- a/infra/smalruby-mesh-v2/.standard.yml +++ b/infra/smalruby-mesh-v2/.standard.yml @@ -1,7 +1,7 @@ # StandardRB configuration for Mesh v2 # See: https://github.com/standardrb/standard -ruby_version: 3.4 +ruby_version: 4.0 ignore: - 'node_modules/**/*' diff --git a/infra/smalruby-mesh-v2/docs/architecture.md b/infra/smalruby-mesh-v2/docs/architecture.md index cd0d076c1d1..840ebddcc21 100644 --- a/infra/smalruby-mesh-v2/docs/architecture.md +++ b/infra/smalruby-mesh-v2/docs/architecture.md @@ -17,7 +17,7 @@ graph TB subgraph "Compute Layer" JSResolver[AppSync JS Resolvers
APPSYNC_JS 1.0.0] - Lambda[Lambda Functions
Ruby 3.4] + Lambda[Lambda Functions
Ruby 4.0] end subgraph "Monitoring" @@ -55,8 +55,8 @@ graph TB - `Mutation.joinGroup` - Pipeline Functions (checkGroupExists, updateNodeTTL) -#### Lambda Functions (Ruby 3.4) -- **言語**: Ruby 3.4 +#### Lambda Functions (Ruby 4.0) +- **言語**: Ruby 4.0 - **アーキテクチャ**: Hexagonal Architecture(Ports & Adapters) - **役割**: 複雑なビジネスロジック - **例**: diff --git a/infra/smalruby-mesh-v2/docs/development.md b/infra/smalruby-mesh-v2/docs/development.md index ce36c9a44bd..173b8051305 100644 --- a/infra/smalruby-mesh-v2/docs/development.md +++ b/infra/smalruby-mesh-v2/docs/development.md @@ -11,7 +11,7 @@ Mesh v2 は Smalruby 3.0 の Mesh 拡張のバックエンドインフラスト - **Infrastructure**: AWS CDK (TypeScript) - **API**: AWS AppSync (GraphQL) - **Database**: DynamoDB (Single Table Design) -- **Compute**: AWS Lambda (Ruby 3.4) + AppSync JavaScript Resolvers (APPSYNC_JS 1.0.0) +- **Compute**: AWS Lambda (Ruby 4.0) + AppSync JavaScript Resolvers (APPSYNC_JS 1.0.0) - **Testing**: RSpec (Ruby), Jest (TypeScript) - **Architecture**: Hexagonal Architecture (Ports & Adapters) diff --git a/infra/smalruby-mesh-v2/lib/mesh-v2-stack.ts b/infra/smalruby-mesh-v2/lib/mesh-v2-stack.ts index 2e1e34beaf2..924fab4848c 100644 --- a/infra/smalruby-mesh-v2/lib/mesh-v2-stack.ts +++ b/infra/smalruby-mesh-v2/lib/mesh-v2-stack.ts @@ -185,7 +185,9 @@ export class MeshV2Stack extends cdk.Stack { // Lambda function for complex operations (Dissolve, Leave, RecordEvents, etc.) const meshV2Lambda = new lambda.Function(this, 'MeshV2LambdaFunction', { functionName: `MeshV2-GraphQL${stageSuffix}`, - runtime: lambda.Runtime.RUBY_3_4, + // aws-cdk-lib 2.232.1 has no RUBY_4_0 constant yet (it arrives with the CDK + // update tracked in #1264); spell out the ruby4.0 managed runtime until then. + runtime: new lambda.Runtime('ruby4.0', lambda.RuntimeFamily.RUBY), handler: 'handlers/appsync_handler.lambda_handler', code: lambda.Code.fromAsset(path.join(__dirname, '../lambda')), environment: { diff --git a/ruby/smalruby3/Dockerfile b/ruby/smalruby3/Dockerfile index 1d532a15819..0bd364cc682 100644 --- a/ruby/smalruby3/Dockerfile +++ b/ruby/smalruby3/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.3-slim-bookworm +FROM ruby:4.0-slim-bookworm LABEL maintainer="Kouji Takao"