belt 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bc7f1c9dc1e95a012e77ad0b45dd86f387d51d9d84868fc833e64a86875bf32
-  data.tar.gz: 4bdb7b2e6aa73f0dbb327b4639e95bbf0c19edd9200110f61e7cbd099984b6a2
+  metadata.gz: 62b1b84b58bb017a4a127a871136dfc32b02217314bf5fc5f2b1baceb599063b
+  data.tar.gz: 2bd29c90f7380f4efa4014cc079fefacef86ed9407b19f71fb06fc0ead217bff
 SHA512:
-  metadata.gz: 360ffa36c8bd746241454b4298ee0804d192e21b899817e2c31ba348683d00501894615cb5896afd2a49c5e36228de101a72efd566add9ca5ff96ce9c21bb7f5
-  data.tar.gz: 3a0d97d2ead9d8a2c22e074cc0ad10bfdc3727c6de25e7f5eb4ab2efe91ddbd2a402109d3b3bc33d6b7ca3dbe011c34d1579677b132089419aeb1f582ebf8fbb
+  metadata.gz: be2982d7fc1cc0bbac0a61369029801e2c95ccbb3539ca2effaa649f506cbda151d0e1b4f55284534a30d13331e36c7c215236eef5f5417c288bf282757d0afb
+  data.tar.gz: ab198a8c848feb617046b1dbe73d5887252253617da7420ecd5935a56925bd18473430dbf2f54b5f9302e7c9bee777f21416b19ea28ac37d8bdc377aa6730222

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 0.6.0
+
+### Added
+
+- **Ruby 4.0.** New apps and environments now run on the `ruby4.0` Lambda runtime.
+  The generated `infrastructure/<env>/main.tf` sets `ruby_version = "4.0"` on the
+  conveyor-belt provider (one setting for runtime + gem build image), and both
+  generated `main.tf` files now pin conveyor-belt `~> 0.0.16`, the first release that
+  migrates already-deployed functions when `ruby_version` changes. Belt, activeitem,
+  lambda_loadout, belt-pay and belt-messaging all pass their suites on Ruby 4.0. CI now
+  tests 3.3, 3.4 and 4.0. Existing apps: see [UPGRADING.md](UPGRADING.md#ruby-34--40).
+
+### Fixed
+
+- **`belt deploy <env> --rebuild` builds gems for the runtime the function actually
+  runs.** It used to look for `ruby_version` in `terraform state show conveyor_belt.main`,
+  but that's a provider setting and never appears in resource state, so `--rebuild`
+  always compiled in `build-ruby3.4`. On a `ruby4.0` function that ships a
+  `vendor/bundle/ruby/3.4.0` bundle Ruby 4 can't load. Image selection is now: resource
+  `docker_build_image` → the live function's runtime → `ruby_version` in the env's
+  `main.tf` → `build-ruby3.4`.
+- Removed `runtime: ruby3.3` from the `config/lambda/*.yml` examples in the docs.
+  conveyor-belt ignores that key; the runtime comes from the provider's `ruby_version`.
+
+## 0.5.3
+
+### Fixed
+
+- **New apps now package `lambda/config/` into every Lambda.** The generated
+  `infrastructure/modules/app/main.tf` listed `lambda_shared_dirs` without `config`, so
+  `lambda/config/environment.rb` never reached `/var/task`. Handlers generated by
+  belt-pay (`pay_webhooks.rb`) and belt-messaging (`messaging_events.rb`) start with
+  `require_relative 'config/environment'`, so they crashed on init with
+  `cannot load such file -- /var/task/config/environment`. Existing apps: add `"config"`
+  to `lambda_shared_dirs` in `infrastructure/modules/app/main.tf` and redeploy.
+
 ## 0.5.2
 
 ### Added

data/lib/belt/cli/deploy_command.rb

@@ -490,7 +490,7 @@ module Belt
         begin
           puts '  📦 Building Lambda package...'
           assemble_package(lambda_dir, build_dir)
-          build_gems(build_dir)
+          build_gems(build_dir, function_name)
           zip_file = create_zip(build_dir)
 
           puts '  🚀 Deploying to AWS...'
@@ -572,13 +572,13 @@ module Belt
         puts ''
       end
 
-      def build_gems(build_dir)
+      def build_gems(build_dir, function_name)
         puts '    🐳 Building gems in Docker (Lambda-compatible)...'
 
         uid = Process.uid
         gid = Process.gid
 
-        image = detect_docker_build_image
+        image = detect_docker_build_image(function_name)
 
         docker_cmd = [
           'docker', 'run', '--rm',
@@ -606,35 +606,58 @@ module Belt
         puts '    ✅ Gems installed'
       end
 
-      # Reads docker_build_image from the conveyor_belt Terraform resource state.
-      # Falls back to DEFAULT_DOCKER_BUILD_IMAGE if state is unavailable or attribute not set.
-      def detect_docker_build_image
+      # Picks the image gems are compiled in. Native extensions and the
+      # vendor/bundle/ruby/<abi> path must match the function's runtime, so:
+      #   1. docker_build_image on the conveyor_belt resource (fully custom)
+      #   2. the live function's runtime (ruby4.0 → build-ruby4.0)
+      #   3. ruby_version in the env's conveyor-belt provider block
+      #   4. DEFAULT_DOCKER_BUILD_IMAGE
+      def detect_docker_build_image(function_name)
         env_dir = File.join(@infra_dir, @env)
-        return DEFAULT_DOCKER_BUILD_IMAGE unless Dir.exist?(File.join(env_dir, '.terraform'))
+
+        image = docker_build_image_from_state(env_dir)
+        if image
+          puts "    📦 Using custom build image: #{image}"
+          return image
+        end
+
+        version = ruby_version_from_lambda(function_name) || ruby_version_from_provider(env_dir)
+        return DEFAULT_DOCKER_BUILD_IMAGE unless version
+
+        image = "public.ecr.aws/sam/build-ruby#{version}:latest-x86_64"
+        puts "    📦 Using build image for Ruby #{version}: #{image}"
+        image
+      end
+
+      def docker_build_image_from_state(env_dir)
+        return nil unless Dir.exist?(File.join(env_dir, '.terraform'))
 
         Dir.chdir(env_dir) do
           output, status = Open3.capture2('terraform', 'state', 'show', 'conveyor_belt.main')
-          if status.success?
-            # Prefer explicit docker_build_image if set
-            image_match = output.match(/docker_build_image\s*=\s*"([^"]+)"/)
-            if image_match
-              image = image_match[1]
-              puts "    📦 Using custom build image: #{image}"
-              return image
-            end
+          return nil unless status.success?
 
-            # Otherwise derive from ruby_version
-            version_match = output.match(/ruby_version\s*=\s*"([^"]+)"/)
-            if version_match
-              version = version_match[1]
-              image = "public.ecr.aws/sam/build-ruby#{version}:latest-x86_64"
-              puts "    📦 Using build image for Ruby #{version}: #{image}"
-              return image
-            end
-          end
+          output[/docker_build_image\s*=\s*"([^"]+)"/, 1]
         end
+      end
+
+      # "ruby4.0" → "4.0"
+      def ruby_version_from_lambda(function_name)
+        output, status = Open3.capture2(
+          'aws', 'lambda', 'get-function-configuration',
+          '--function-name', function_name,
+          '--query', 'Runtime',
+          '--output', 'text'
+        )
+        return nil unless status.success?
+
+        output.strip[/\Aruby(\d+\.\d+)\z/, 1]
+      end
+
+      def ruby_version_from_provider(env_dir)
+        main_tf = File.join(env_dir, 'main.tf')
+        return nil unless File.exist?(main_tf)
 
-        DEFAULT_DOCKER_BUILD_IMAGE
+        File.read(main_tf)[/^\s*ruby_version\s*=\s*"([^"]+)"/, 1]
       end
 
       def strip_vendor_fat(build_dir)

data/lib/belt/cli/environment_command.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'erb'
 require_relative 'app_detection'
 require_relative 'environment_config'
+require_relative '../version'
 require_relative 'frontend_registry'
 require_relative 'frontend_setup_command'
 

data/lib/belt/cli/new_command.rb

@@ -5,6 +5,7 @@ require 'erb'
 require 'json'
 require 'open3'
 require_relative 'setup_command'
+require_relative '../version'
 
 module Belt
   module CLI

data/lib/belt/docs/deployment.md

@@ -67,13 +67,26 @@ The Lambda entry point is specified in `config/lambda/<name>.yml`:
 
 ```yaml
 handler: lambda/<name>.lambda_handler
-runtime: ruby3.3
 timeout: 30
 memory: 256
 environment:
   ENVIRONMENT: ${var.environment}
 ```
 
+The Ruby version is set once per environment, on the conveyor-belt provider in
+`infrastructure/<env>/main.tf` — it drives both the Lambda runtime and the image
+gems are compiled in:
+
+```hcl
+provider "conveyor-belt" {
+  environment  = var.environment
+  aws_region   = var.aws_region
+  ruby_version = "4.0" # → runtime ruby4.0, build image build-ruby4.0
+}
+```
+
+See [UPGRADING.md](../../../UPGRADING.md#ruby-34--40) to move an existing app.
+
 ## Route Manifests
 
 Before deploying, generate the route manifest used at runtime:

data/lib/belt/docs/lambda_handler.md

@@ -67,7 +67,6 @@ Configure via `config/lambda/<name>.yml`:
 
 ```yaml
 handler: lambda/api.lambda_handler
-runtime: ruby3.3
 timeout: 30
 memory: 256
 layers:

data/lib/belt/version.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
 module Belt
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
+
+  # Ruby version new apps run on in Lambda. Rendered into the conveyor-belt
+  # provider block (`ruby_version`) by `belt new` / `belt generate environment`.
+  LAMBDA_RUBY_VERSION = '4.0'
 end

data/lib/templates/environment/main.tf.erb

@@ -10,7 +10,7 @@ terraform {
     }
     conveyor-belt = {
       source  = "stowzilla/conveyor-belt"
-      version = "~> 0.0.1"
+      version = "~> 0.0.16"
     }
   }
 }
@@ -30,6 +30,10 @@ provider "aws" {
 provider "conveyor-belt" {
   environment = var.environment
   aws_region  = var.aws_region
+
+  # Lambda runtime (ruby<version>) and the Docker image gems are compiled in.
+  # Changing it on a deployed environment migrates every function on the next apply.
+  ruby_version = "<%= Belt::LAMBDA_RUBY_VERSION %>"
 }
 
 module "app" {

data/lib/templates/module/main.tf.erb

@@ -13,7 +13,7 @@ terraform {
     }
     conveyor-belt = {
       source  = "stowzilla/conveyor-belt"
-      version = "~> 0.0.2"
+      version = "~> 0.0.16"
     }
   }
 }
@@ -25,7 +25,9 @@ resource "conveyor_belt" "main" {
   source            = "${path.module}/../../../config/routes.rb"
   app_name          = var.app_name
   lambda_source_dir = "${path.module}/../../../lambda"
-  lambda_shared_dirs = ["controllers", "helpers", "lib", "models", "views"]
+  # "config" ships lambda/config/environment.rb, which the belt-pay and belt-messaging
+  # handlers require_relative at boot.
+  lambda_shared_dirs = ["config", "controllers", "helpers", "lib", "models", "views"]
 <% if @frontend -%>
   # CloudFront first so SPA→API CORS works out of the box (tutorial footgun fixed).
   # localhost stays via env frontend_urls for local `belt server` dev.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belt
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Stowzilla