belt 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd4b86a1b7dc7acf4f88189a24b5d39c5cfcf71f512aafb5f04fb0af6d558a65
-  data.tar.gz: cdc8752352bca6b2ff3cce8a9abcf249c6975c0949d3a95b745be7fc2096544c
+  metadata.gz: 5c8fdcdc85f77c9538860db16ba868045f1a4482487ce7cfbf6b3e1921e9c793
+  data.tar.gz: 996b9b570963202a4b9acde7fdaa4e83550606a7e6ba9ba89cf20dabff1c5cf7
 SHA512:
-  metadata.gz: 380937f0579d856a0f34407d5d1496306d5c9be64fb192d409e0bb78d2f6faea1d2016ae7db773312d92ff3f71876681b8e0d0384f2fc9127abd7eca386f5fbc
-  data.tar.gz: 927a7c107926e787be5fe8ade9a0df86429b75ece20468176d4afa8de6ef15ccd10b3d99471c3cc52f3f7870dc6e5c18486a1578d0c6a8a58565a0d06c93023d
+  metadata.gz: 3dbbf13ab635583594d630355888e2197f8a07052348eee39f47a1c328fba39392df21c88f12a8ab34252de920ecf711ba1915785de606a527afc79299ed69e8
+  data.tar.gz: e2f3a01545969526003d72e5c0b486e412c852ef8f6cdd6220ad92be5c6771dba8e0e3f5a1880ed691c72ad9e27a5e0caf11a2916717fcdf74c6e81fe05e871b

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 0.6.8
+
+### Added
+
+- **`ttl_attribute` model macro.** `ttl_attribute :expires_at` on a model makes
+  `belt setup tables` emit `ttl { attribute_name = "expiresAt", enabled = true }`
+  for its table. A string is used verbatim. `belt explain models`. (Fizzy #1796)
+
+### Fixed
+
+- **`belt setup tables` no longer silently drops `ttl` blocks.** A hand-added `ttl`,
+  or any other table block or setting the models don't produce (`stream_enabled`,
+  `server_side_encryption`, …), now counts as dropped infrastructure like a
+  hand-added GSI. Interactive runs prompt, and generator auto-syncs (`belt g policies`
+  and friends) skip the file. Hand-written comments the regen removes are now
+  reported instead of vanishing quietly. (Fizzy #1796)
+
+## 0.6.7
+
+### Changed
+
+- **Non-prod deploys auto-approve by default.** `belt deploy <env>` no longer
+  prompts for confirmation when the environment isn't `prod`/`production` — the
+  Terraform plan is applied straight away. `prod` still prompts unless you pass
+  `--auto`. Pass `--confirm` (alias `--no-auto`) to force the prompt on any
+  environment. No more typing `--auto` on every dev deploy.
+
 ## 0.6.6
 
 ### Added

data/lib/belt/cli/deploy_command.rb

@@ -32,6 +32,7 @@ module Belt
         end
 
         auto_approve = false
+        force_confirm = false
         rebuild = false
         skip_backup = false
         backup_only = false
@@ -42,6 +43,8 @@ module Belt
           case arg
           when '--auto', '--yes', '-y'
             auto_approve = true
+          when '--confirm', '--no-auto'
+            force_confirm = true
           when '--rebuild'
             rebuild = true
           when '--skip-backup', '--no-backup'
@@ -69,13 +72,14 @@ module Belt
             puts 'Usage: belt deploy [environment] [options]'
             puts "\nDefaults to BELT_ENV or the first available environment."
             puts "\nOptions:"
-            puts '  --auto, --yes, -y    Skip confirmation prompt (auto-approve)'
+            puts '  --auto, --yes, -y    Skip confirmation prompt (prod only; non-prod auto-approves)'
+            puts '  --confirm, --no-auto Force the confirmation prompt even for non-prod envs'
             puts '  --rebuild            Rebuild and push Lambda code directly (bypasses Terraform)'
             puts '  -h, --help           Show this help'
             puts "\nExamples:"
-            puts '  belt deploy                # Deploy dev (or BELT_ENV)'
-            puts '  belt deploy prod           # Deploy to prod'
-            puts '  belt deploy dev --auto     # Deploy without confirmation'
+            puts '  belt deploy                # Deploy dev (or BELT_ENV), no prompt'
+            puts '  belt deploy prod           # Deploy to prod (prompts)'
+            puts '  belt deploy prod --auto    # Deploy prod without confirmation'
             puts '  belt deploy --rebuild      # Fast code push (no infra changes)'
             puts '  belt deploy frontend dev              # Deploy frontend(s)'
             puts '  belt deploy frontend dev --frontend ops'
@@ -84,6 +88,10 @@ module Belt
           end
         end
 
+        # Non-prod environments auto-approve by default — prod always prompts
+        # unless --auto is explicit. Pass --confirm to force the prompt anywhere.
+        auto_approve = true if !force_confirm && !%w[prod production].include?(env)
+
         options = { auto_approve: auto_approve, skip_migrations: skip_migrations, extra_args: filtered_args }
         if backup_only
           new(env, **options, skip_backup: false).run_backup_only
@@ -108,13 +116,16 @@ module Belt
             4. Build sidecar Lambda zips Terraform needs at plan time
             5. terraform init    (initialize providers/modules)
             6. terraform plan    (preview changes)
-            7. Prompt for confirmation (unless --auto)
+            7. Prompt for confirmation (prod only; non-prod auto-approves)
             8. terraform apply   (deploy changes)
             9. Nested envs: share parent Cognito + copy DynamoDB if empty
            10. Run pending data migrations in db/migrate (see `belt db:migrate`)
 
           Options:
-            --auto, --yes, -y    Skip confirmation prompt (auto-approve)
+            --auto, --yes, -y    Skip confirmation prompt (auto-approve). Non-prod
+                                 environments auto-approve by default, so this is only
+                                 needed for prod.
+            --confirm, --no-auto Force the confirmation prompt even for non-prod envs
             --rebuild            Rebuild and push Lambda code directly (bypasses Terraform).
                                  Much faster for code-only changes — packages gems via Docker,
                                  zips, and pushes with `aws lambda update-function-code`.
@@ -140,9 +151,10 @@ module Belt
               end
 
           Examples:
-            belt deploy                # Deploy dev (or BELT_ENV)
-            belt deploy prod           # Deploy to prod
-            belt deploy dev --auto     # Deploy without confirmation (CI mode)
+            belt deploy                # Deploy dev (or BELT_ENV), no prompt
+            belt deploy prod           # Deploy to prod (prompts for confirmation)
+            belt deploy prod --auto    # Deploy to prod without confirmation (CI mode)
+            belt deploy dev --confirm  # Force the confirmation prompt on dev
             belt deploy --rebuild      # Fast code push to dev (no infra changes)
             belt deploy prod --rebuild # Fast code push to prod
             belt deploy prod --skip-backup  # Skip backups for this deploy

data/lib/belt/cli/tables_command.rb

@@ -9,6 +9,8 @@ module Belt
     class TablesCommand
       MODULE_DIR = 'infrastructure/modules/app'
       MODELS_DIR = 'lambda/models'
+      # Table blocks the drop check compares some other way (see #table_settings).
+      DERIVED_BLOCKS = %w[attribute global_secondary_index].freeze
 
       def self.run(args)
         # Environment argument accepted for backwards compatibility but unused —
@@ -99,7 +101,16 @@ module Belt
         # Deduplicate by index name
         indexes.uniq! { |idx| idx[:name] }
 
-        { name: model_name, indexes: indexes }
+        { name: model_name, indexes: indexes, ttl: extract_ttl_attribute(content) }
+      end
+
+      # `ttl_attribute :expires_at` (Belt::Models::TtlMacro). A symbol is camelCased the
+      # way ActiveItem writes it; a string is the DynamoDB attribute name verbatim.
+      def extract_ttl_attribute(content)
+        match = uncommented(content).match(/^\s*ttl_attribute[\s(]+(?::(\w+)|['"]([^'"]+)['"])/)
+        return nil unless match
+
+        match[1] ? Belt::Inflector.camelize_lower(match[1]) : match[2]
       end
 
       def extract_indexes(content)
@@ -180,6 +191,8 @@ module Belt
         if existing_content
           dropped = detect_dropped_infrastructure(existing_content, new_content)
           return if dropped.any? && !safe_to_overwrite?(dest, dropped)
+
+          warn_dropped_comments(dest, dropped_comments(existing_content, new_content))
         end
 
         File.write(dest, new_content)
@@ -215,11 +228,63 @@ module Belt
           old_gsis = gsi_names(existing_content, label)
           new_gsis = gsi_names(new_content, label)
           dropped.concat((old_gsis - new_gsis).map { |gsi| "GSI \"#{gsi}\" on table \"#{label}\"" })
+          dropped.concat(dropped_table_settings(existing_content, new_content, label))
         end
 
         dropped
       end
 
+      # Nested blocks (`ttl`, `server_side_encryption`, …) and settings (`stream_enabled`,
+      # …) a table has today that the regenerated table wouldn't. A hand-added ttl block
+      # is the usual one — dropping it turns expiry off and rows quietly pile up.
+      def dropped_table_settings(existing_content, new_content, label)
+        old_settings = table_settings(table_block(existing_content, label))
+        new_settings = table_settings(table_block(new_content, label))
+
+        (old_settings.keys - new_settings.keys).map do |key|
+          "#{old_settings[key]} on table \"#{label}\""
+        end
+      end
+
+      # Map of identity → description for every top-level setting in a table body.
+      # `attribute` and `global_secondary_index` are compared separately (GSIs) or are
+      # derived from them (attributes), so they're left out here.
+      def table_settings(block)
+        return {} unless block
+
+        settings = {}
+        depth = 0
+        block.each_line do |line|
+          code = line.sub(/#.*/, '').strip
+          if depth.zero?
+            if (name = code[/\A(\w+)\s*\{/, 1])
+              settings.merge!(block_setting(name, block, line)) unless DERIVED_BLOCKS.include?(name)
+            elsif (name = code[/\A(\w+)\s*=/, 1])
+              settings[name] = "setting \"#{name}\""
+            end
+          end
+          depth += code.count('{') - code.count('}')
+        end
+        settings
+      end
+
+      def block_setting(name, block, line)
+        return { name => "block \"#{name}\"" } unless name == 'ttl'
+
+        body = block[block.index(line)..][/\{(.*?)\}/m, 1].to_s
+        attr = body[/attribute_name\s*=\s*"([^"]+)"/, 1]
+        { "ttl:#{attr}" => "ttl on \"#{attr}\"" }
+      end
+
+      # Hand-written comments can't be re-derived either. They're not infrastructure,
+      # so losing them doesn't block the write, but it shouldn't happen silently.
+      def dropped_comments(existing_content, new_content)
+        # The leading banner is Belt's own and changes between versions — skip it.
+        body = existing_content.lines.drop_while { |l| l.strip.empty? || l.lstrip.start_with?('#') }
+        body.map(&:strip).select { |l| l.start_with?('#', '//') } -
+          new_content.lines.map(&:strip)
+      end
+
       # Resource labels for every aws_dynamodb_table block in the content.
       def table_labels(content)
         content.scan(/resource\s+"aws_dynamodb_table"\s+"([^"]+)"/).flatten
@@ -280,19 +345,28 @@ module Belt
       def warn_dropped(dest, dropped)
         puts "\n⚠ Regenerating #{dest} would DROP infrastructure not derived from your models:"
         dropped.each { |d| puts "    • #{d}" }
-        puts "\n  This usually means a table or GSI was added to dynamodb.tf by hand."
-        puts '  Belt only tracks tables and indexes it can read from lambda/models/*.rb,'
+        puts "\n  This usually means a table, GSI, or setting (e.g. ttl) was added to dynamodb.tf by hand."
+        puts '  Belt only tracks what it can read from lambda/models/*.rb (indexes, belongs_to,'
+        puts '  cognito_authenticatable, ttl_attribute),'
         puts '  so a hand-added definition is invisible to the generator and gets overwritten.'
       end
 
+      def warn_dropped_comments(dest, comments)
+        return if comments.empty?
+
+        puts "  ⚠ #{dest}: removed #{comments.size} hand-written comment line(s) " \
+             '(the file is regenerated — put notes on the model instead)'
+      end
+
       def render_dynamodb(models)
         blocks = models.map { |m| render_table(m) }
         "# Auto-generated by Belt from model definitions in lambda/models/*.rb\n" \
           "#\n" \
           "# Do NOT edit manually. `belt setup tables` overwrites this whole file from\n" \
           "# your models. Any table or GSI added here by hand (that a model doesn't\n" \
-          "# declare) will be DROPPED on the next regeneration. Define indexes on the\n" \
-          "# model via indexes(), belongs_to, or cognito_authenticatable instead.\n\n#{blocks.join("\n\n")}\n"
+          "# declare) will be DROPPED on the next regeneration, as will ttl blocks and\n" \
+          "# comments. Define indexes on the model via indexes(), belongs_to, or\n" \
+          "# cognito_authenticatable, and TTL via ttl_attribute, instead.\n\n#{blocks.join("\n\n")}\n"
       end
 
       def render_table(model)
@@ -360,6 +434,14 @@ module Belt
           lines << '  }'
         end
 
+        if model[:ttl]
+          lines << ''
+          lines << '  ttl {'
+          lines << "    attribute_name = \"#{model[:ttl]}\""
+          lines << '    enabled        = true'
+          lines << '  }'
+        end
+
         lines << ''
         lines << '  point_in_time_recovery {'
         lines << '    enabled = var.enable_pitr'

data/lib/belt/docs/deployment.md

@@ -7,13 +7,21 @@ Lambda packaging, and pre-deploy backups.
 ## Quick Deploy
 
 ```bash
-belt deploy <env>              # init → plan → apply (interactive)
-belt deploy prod --auto        # skip confirmation prompt
+belt deploy <env>              # init → plan → apply
+belt deploy prod               # prod prompts for confirmation
+belt deploy prod --auto        # skip prod's confirmation prompt (CI)
+belt deploy dev                # non-prod auto-approves — no prompt
+belt deploy dev --confirm      # force the prompt on a non-prod env
 belt deploy prod --skip-backup # skip pre-deploy backup
 belt deploy --backup-only      # create recovery point without deploying
 belt deploy dev --skip-migrations # don't run pending db/migrate migrations
 ```
 
+Non-prod environments auto-approve the Terraform plan by default — only `prod`
+(and `production`) prompt. Pass `--confirm` (alias `--no-auto`) to force the
+prompt anywhere; `--auto` still works everywhere and is what you want in CI for
+prod.
+
 ## First-Time Setup
 
 ```bash

data/lib/belt/docs/models.md

@@ -144,6 +144,26 @@ ActiveItem::Transaction.write do |tx|
 end
 ```
 
+## Time To Live (TTL)
+
+Let DynamoDB expire rows by declaring the TTL attribute on the model:
+
+```ruby
+class Session < ApplicationRecord
+  ttl_attribute :expires_at   # stored as expiresAt; must hold epoch seconds
+end
+```
+
+`belt setup tables` emits the matching `ttl { attribute_name = "expiresAt" }` block in
+`dynamodb.tf`. A symbol is camelCased the way ActiveItem writes it; pass a string
+(`ttl_attribute 'expires_at_epoch'`) to use the DynamoDB attribute name as-is.
+
+Don't add `ttl` (or any other block) to `dynamodb.tf` by hand. The generator overwrites
+the whole file from your models. If a regeneration would drop a hand-added table, GSI,
+`ttl` or other table setting, `belt setup tables` asks before overwriting, and a
+generator's auto-sync skips the file. Comments in the file are lost too (Belt prints a
+warning), so put notes on the model.
+
 ## Generating Models
 
 ```bash

data/lib/belt/models/ttl_macro.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'activeitem'
+require_relative '../inflector'
+
+module Belt
+  module Models
+    # Declares the DynamoDB Time To Live attribute for a model's table:
+    #
+    #   class Session < ApplicationRecord
+    #     ttl_attribute :expires_at   # → ttl { attribute_name = "expiresAt" }
+    #   end
+    #
+    # DynamoDB does the expiring, so at runtime this only records the name. The point
+    # is that `belt setup tables` reads it and emits the `ttl { }` block — a block
+    # added straight into dynamodb.tf would be dropped by the next regeneration.
+    #
+    # A symbol is camelCased the way ActiveItem stores it (`:expires_at` → `expiresAt`).
+    # Pass a string to use the DynamoDB attribute name verbatim (e.g. when the model
+    # remaps it with dynamo_attribute_map).
+    module TtlMacro
+      def ttl_attribute(name = nil)
+        return @ttl_attribute if name.nil?
+
+        @ttl_attribute = name.is_a?(Symbol) ? Belt::Inflector.camelize_lower(name.to_s) : name.to_s
+      end
+    end
+  end
+end
+
+ActiveItem::Base.extend(Belt::Models::TtlMacro)

data/lib/belt/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Belt
-  VERSION = '0.6.6'
+  VERSION = '0.6.8'
 
   # Ruby version new apps run on in Lambda. Rendered into the conveyor-belt
   # provider block (`ruby_version`) by `belt new` / `belt generate environment`.

data/lib/belt.rb

@@ -55,5 +55,6 @@ module Belt
 end
 
 require_relative 'belt/authentication'
+require_relative 'belt/models/ttl_macro'
 require_relative 'belt_controller/base'
 require_relative 'belt/controllers/welcome_controller'

data/lib/templates/new_app/AGENTS.md.erb

@@ -57,6 +57,11 @@ belt apply <env>
 
 This creates: model, controller (with all CRUD actions), route entry, and DynamoDB schema.
 
+`infrastructure/modules/app/dynamodb.tf` is generated. Declare everything on the model:
+GSIs via `indexes(...)` / `belongs_to`, TTL via `ttl_attribute :expires_at`. Anything
+you add to the `.tf` by hand (a `ttl` block, a comment) gets dropped the next time it's
+regenerated.
+
 ### Add a model only (no API endpoint)
 
 ```bash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belt
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 platform: ruby
 authors:
 - Stowzilla
@@ -186,6 +186,7 @@ files:
 - lib/belt/inflector.rb
 - lib/belt/lambda_handler.rb
 - lib/belt/migration.rb
+- lib/belt/models/ttl_macro.rb
 - lib/belt/observability.rb
 - lib/belt/parameters.rb
 - lib/belt/rendering.rb