belt 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4b3470dab325ae0dcace82544700b3098a3a631da486bf470747e09113511f0
-  data.tar.gz: 723dd93296867be2ca2f0894f83d94540ea4178c4018091a91920783b913d4cf
+  metadata.gz: 37cf283dc30b43f875f8600eb4b00e46b5782f374d3be306d0c5adaec7e9024a
+  data.tar.gz: 1153f552cef87426f91afcf28647065017b77a09bdd9347241366ed9cc455b76
 SHA512:
-  metadata.gz: 25c94edb4be8e75db564b59e8cf608f0bdb139cae1fa2d33a53c68c4b845f70e34f4a9269953fca98bdfa85fdc0d9d9f09dfbb3e3e0514892b093a81668447b9
-  data.tar.gz: 04c1b7c25414c0ae2e942ed27e8f73e5de358c76db8d830a7578dd54ee15312472a21a136f50860b11c7587386600ad8483abb2d4bb0149d6fbb2727db5ffdfa
+  metadata.gz: 4cafc0f29e0148e74950e9fe0898e74632f2563980f60ffece7bfbb58ec7187ec30f928a0958dff9d9832fe79b21e8a87e512f26c4cddfa58c1f243776cea5eb
+  data.tar.gz: 7850fc8e4c5921646c25f77f67fdfcae663e148ec597b514b095b637733b0e55f34182e8c64ea52f2294ed687b3a24f7b6a56462b30df07811a01ffae23da952

data/lib/belt/cli/backup_config.rb

@@ -7,17 +7,11 @@ module Belt
 
       # Load backup config from infrastructure/<env>/belt.rb
       # Returns nil if no config file exists or backups aren't configured
+      # NOTE: Prefer EnvironmentConfig.load which loads the full config including backups.
+      #       This method is kept for backward compatibility.
       def self.load(env, infra_dir: nil)
-        infra_dir ||= 'infrastructure'
-        config_file = File.join(infra_dir, env, 'belt.rb')
-        return nil unless File.exist?(config_file)
-
-        config = new
-        evaluator = ConfigEvaluator.new(config)
-        evaluator.evaluate(File.read(config_file), config_file)
-
-        # Return nil if no backups were configured
-        config.any? ? config : nil
+        env_config = EnvironmentConfig.load(env, infra_dir: infra_dir)
+        env_config.backups? ? env_config.backup_config : nil
       end
 
       def initialize
@@ -38,85 +32,6 @@ module Belt
       def any?
         dynamodb? || cognito? || @s3_buckets.any?
       end
-
-      # Evaluates the belt.rb config file in an isolated context
-      # that intercepts Belt.configure calls
-      class ConfigEvaluator
-        def initialize(config)
-          @config = config
-        end
-
-        def evaluate(content, filename)
-          # The config file calls Belt.configure { |config| ... }
-          # We wrap the content to intercept the Belt constant lookup
-          # by evaluating in a module where Belt is redefined
-          config = @config
-          sandbox = Module.new
-          # Define a Belt module inside the sandbox that has .configure
-          belt_proxy = Module.new do
-            define_singleton_method(:configure) do |&block|
-              block.call(ConfigDSL.new(config))
-            end
-          end
-          sandbox.const_set(:Belt, belt_proxy)
-
-          # Evaluate the file content within the sandbox module
-          sandbox.module_eval(content, filename)
-        end
-      end
-
-      # DSL yielded to the block inside Belt.configure { |config| ... }
-      class ConfigDSL
-        def initialize(config)
-          @config = config
-        end
-
-        def backups(enabled = nil, &block)
-          if enabled == true
-            # Simple mode: config.backups = true → just DynamoDB for all tables
-            @config.instance_variable_set(:@dynamodb_tables, :all)
-          elsif block
-            backup_dsl = BackupDSL.new(@config)
-            backup_dsl.instance_eval(&block)
-          end
-        end
-      end
-
-      # DSL for the backups block
-      class BackupDSL
-        def initialize(config)
-          @config = config
-        end
-
-        def dynamodb(scope = :all)
-          if scope == :all
-            @config.instance_variable_set(:@dynamodb_tables, :all)
-          else
-            tables = Array(scope)
-            @config.instance_variable_set(:@dynamodb_tables, tables.map(&:to_s))
-          end
-        end
-
-        def cognito(*exports)
-          @config.instance_variable_set(:@cognito_exports, exports.flatten.map(&:to_sym))
-        end
-
-        def s3(*buckets)
-          @config.instance_variable_set(:@s3_buckets, buckets.flatten.map(&:to_sym))
-        end
-
-        def retention(opts = {})
-          current = @config.instance_variable_get(:@retention)
-          merged = current.merge(opts.transform_keys(&:to_sym))
-
-          # Convert duration objects (90.days) to integer days
-          merged.transform_values! do |v|
-            v.respond_to?(:to_i) ? v.to_i : v
-          end
-
-          @config.instance_variable_set(:@retention, merged)
-        end
-      end
     end
   end
 end

data/lib/belt/cli/backup_runner.rb

@@ -14,7 +14,7 @@ module Belt
         @infra_dir = infra_dir
         @app_name = app_name
         @timestamp = Time.now.strftime('%Y%m%d-%H%M%S')
-        @backup_bucket = "#{@app_name}-backups-#{@env}"
+        @backup_bucket = sanitize_bucket_name("#{@app_name}-backups-#{@env}")
         @errors = []
         @summary = []
       end
@@ -41,6 +41,8 @@ module Belt
 
         puts "  📦 Creating backup bucket: #{@backup_bucket}"
 
+        errors_before = @errors.size
+
         run_aws('s3', 'mb', "s3://#{@backup_bucket}", '--region', detect_region)
 
         # Enable versioning
@@ -54,7 +56,11 @@ module Belt
                 '--public-access-block-configuration',
                 'BlockPublicAcls=true,IgnorePublicAcls=true,BlockPublicPolicy=true,RestrictPublicBuckets=true')
 
-        puts '  ✅ Backup bucket created and secured'
+        if @errors.size > errors_before
+          puts '  ⚠️  Backup bucket creation failed (see warnings below)'
+        else
+          puts '  ✅ Backup bucket created and secured'
+        end
       end
 
       # ─── DynamoDB ────────────────────────────────────────────────────
@@ -153,11 +159,11 @@ module Belt
 
       def export_cognito_users(pool_id)
         all_users = []
-        pagination_token = nil
+        next_token = nil
 
         loop do
-          args = ['aws', 'cognito-idp', 'list-users', '--user-pool-id', pool_id, '--max-results', '60']
-          args += ['--pagination-token', pagination_token] if pagination_token
+          args = ['aws', 'cognito-idp', 'list-users', '--user-pool-id', pool_id, '--max-items', '60']
+          args += ['--starting-token', next_token] if next_token
 
           output, status = Open3.capture2(*args)
           break unless status.success?
@@ -165,8 +171,8 @@ module Belt
           data = JSON.parse(output)
           all_users.concat(data['Users'] || [])
 
-          pagination_token = data['PaginationToken']
-          break if pagination_token.nil? || pagination_token.empty?
+          next_token = data['NextToken']
+          break if next_token.nil? || next_token.empty?
 
           puts '    Fetching next page of users...'
         end
@@ -327,69 +333,41 @@ module Belt
         end
       end
 
-      # ─── Terraform Output Resolution ─────────────────────────────────
+      # ─── Table Discovery ──────────────────────────────────────────────
 
       def resolve_table_names
-        @resolve_table_names ||= fetch_table_names_from_terraform
+        @resolve_table_names ||= discover_tables_from_aws
       end
 
-      def fetch_table_names_from_terraform
-        env_dir = File.join(@infra_dir, @env)
-        return [] unless Dir.exist?(env_dir)
-
-        Dir.chdir(env_dir) do
-          names = try_terraform_table_output
-          return names if names
+      def discover_tables_from_aws
+        # List all DynamoDB tables matching the app-env prefix directly from AWS.
+        # This is the source of truth — no Terraform output maintenance required.
+        prefix = "#{@app_name}-#{@env}-"
+        sanitized_prefix = sanitize_bucket_name(prefix)
 
-          fetch_table_names_from_all_outputs
-        end
-      end
-
-      def try_terraform_table_output
-        output, status = Open3.capture2('terraform', 'output', '-json', 'dynamodb_table_names')
-        return nil unless status.success?
-
-        names = begin
-          JSON.parse(output)
-        rescue StandardError
-          nil
+        output, status = Open3.capture2('aws', 'dynamodb', 'list-tables', '--output', 'json')
+        unless status.success?
+          @errors << 'Failed to list DynamoDB tables from AWS'
+          return []
         end
-        names.is_a?(Array) && names.any? ? Array(names) : nil
-      end
-
-      def fetch_table_names_from_all_outputs
-        output, status = Open3.capture2('terraform', 'output', '-json')
-        return [] unless status.success?
 
-        all_outputs = begin
-          JSON.parse(output)
+        all_tables = begin
+          JSON.parse(output)['TableNames'] || []
         rescue StandardError
-          {}
-        end
-
-        # Look for dynamodb_table_names in output
-        if all_outputs['dynamodb_table_names']
-          val = all_outputs['dynamodb_table_names']['value']
-          return Array(val) if val
+          []
         end
 
-        # Try to find any output that looks like table names
-        all_outputs.each do |key, data|
-          next unless key.include?('table')
-
-          val = data['value']
-          return Array(val) if val.is_a?(Array) && val.any?
-        end
-
-        []
+        all_tables.select { |t| t.start_with?(prefix) || t.start_with?(sanitized_prefix) }
       end
 
+      # ─── Terraform Output Resolution ─────────────────────────────────
+
       def resolve_cognito_pool_id
         env_dir = File.join(@infra_dir, @env)
         return nil unless Dir.exist?(env_dir)
 
         Dir.chdir(env_dir) do
-          output, status = Open3.capture2('terraform', 'output', '-json', 'user_pool_id')
+          output, status = Open3.capture2('terraform', 'output', '-json', 'user_pool_id', err: File::NULL)
           if status.success?
             val = begin
               JSON.parse(output)
@@ -400,7 +378,7 @@ module Belt
           end
 
           # Fallback: search all outputs
-          output, status = Open3.capture2('terraform', 'output', '-json')
+          output, status = Open3.capture2('terraform', 'output', '-json', err: File::NULL)
           if status.success?
             all_outputs = begin
               JSON.parse(output)
@@ -477,6 +455,11 @@ module Belt
 
       # ─── Helpers ─────────────────────────────────────────────────────
 
+      def sanitize_bucket_name(name)
+        # S3 bucket names must be DNS-compliant: lowercase, hyphens, no underscores
+        name.tr('_', '-').downcase.gsub(/[^a-z0-9\-.]/, '-').gsub(/-{2,}/, '-')
+      end
+
       def short_table_name(table_name)
         table_name.sub(/\A#{Regexp.escape(@app_name)}-#{Regexp.escape(@env)}-/, '')
       end

data/lib/belt/cli/console_command.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require_relative 'environment_config'
 
 module Belt
   module CLI
@@ -25,6 +26,8 @@ module Belt
         @environment = @args.first || ENV['BELT_ENV'] || 'dev'
         ENV['ENVIRONMENT'] = @environment
 
+        apply_env_config!
+
         if @options[:run]
           exec_runner(@options[:run])
         else
@@ -45,6 +48,12 @@ module Belt
         end.parse!(@args)
       end
 
+      def apply_env_config!
+        env_config = EnvironmentConfig.load(@environment)
+        env_config.apply!
+        puts "  🔑 Using AWS profile: #{env_config.aws_profile}" if env_config.aws_profile?
+      end
+
       def exec_console
         production_guard!
         boot_app

data/lib/belt/cli/deploy_command.rb

@@ -8,6 +8,7 @@ require_relative 'env_resolver'
 require_relative 'terraform_command'
 require_relative 'backup_config'
 require_relative 'backup_runner'
+require_relative 'environment_config'
 
 module Belt
   module CLI
@@ -144,6 +145,8 @@ module Belt
         validate!
         env_dir = File.join(@infra_dir, @env)
 
+        load_and_apply_env_config!
+
         puts "belt → deploying #{@env} (in #{env_dir}/)\n\n"
 
         ensure_lockfile_consistent!
@@ -168,6 +171,7 @@ module Belt
 
       def run_backup_only
         validate!
+        load_and_apply_env_config!
 
         puts "belt → running backups for #{@env}\n\n"
 
@@ -190,6 +194,7 @@ module Belt
 
       def run_rebuild
         validate!
+        load_and_apply_env_config!
         validate_aws!
 
         puts "belt → rebuilding Lambda for #{@env}\n\n"
@@ -207,6 +212,21 @@ module Belt
 
       private
 
+      def load_and_apply_env_config!
+        @env_config = EnvironmentConfig.load(@env, infra_dir: @infra_dir)
+        @env_config.apply!
+        print_env_config_info
+      end
+
+      def print_env_config_info
+        puts "  🔑 Using AWS profile: #{@env_config.aws_profile}" if @env_config.aws_profile?
+        return unless @env_config.env_vars?
+
+        @env_config.env_vars.each_key do |key|
+          puts "  📌 Setting #{key}"
+        end
+      end
+
       def find_project_root
         # Walk up from infra dir to find project root (where Gemfile lives)
         dir = @infra_dir ? File.dirname(@infra_dir) : Dir.pwd
@@ -264,7 +284,7 @@ module Belt
       end
 
       def load_backup_config
-        BackupConfig.load(@env, infra_dir: @infra_dir)
+        @env_config.backups? ? @env_config.backup_config : nil
       end
 
       def run_backup_phase(backup_config)

data/lib/belt/cli/environment_config.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+module Belt
+  module CLI
+    class EnvironmentConfig
+      attr_reader :aws_profile, :env_vars, :backup_config
+
+      # Load environment config from infrastructure/<env>/belt.rb
+      # Returns an EnvironmentConfig instance (never nil — unconfigured is valid)
+      def self.load(env, infra_dir: nil)
+        infra_dir ||= 'infrastructure'
+        config_file = File.join(infra_dir, env, 'belt.rb')
+
+        config = new
+        return config unless File.exist?(config_file)
+
+        evaluator = ConfigEvaluator.new(config)
+        evaluator.evaluate(File.read(config_file), config_file)
+        config
+      end
+
+      def initialize
+        @aws_profile = nil
+        @env_vars = {}
+        @backup_config = BackupConfig.new
+      end
+
+      def aws_profile?
+        !@aws_profile.nil? && !@aws_profile.empty?
+      end
+
+      def env_vars?
+        @env_vars.any?
+      end
+
+      def backups?
+        @backup_config.any?
+      end
+
+      # Apply the configured aws_profile and env vars to the current process.
+      # Call this before running terraform, aws cli, etc.
+      def apply!
+        ENV['AWS_PROFILE'] = @aws_profile if aws_profile?
+        @env_vars.each { |key, value| ENV[key] = value }
+      end
+
+      class ConfigEvaluator
+        def initialize(config)
+          @config = config
+        end
+
+        def evaluate(content, filename)
+          config = @config
+          sandbox = Module.new
+          belt_proxy = Module.new do
+            define_singleton_method(:configure) do |&block|
+              block.call(ConfigDSL.new(config))
+            end
+          end
+          sandbox.const_set(:Belt, belt_proxy)
+          sandbox.module_eval(content, filename)
+        end
+      end
+
+      class ConfigDSL
+        def initialize(config)
+          @config = config
+        end
+
+        def aws_profile=(profile)
+          @config.instance_variable_set(:@aws_profile, profile.to_s)
+        end
+
+        def env(&)
+          env_dsl = EnvDSL.new(@config)
+          env_dsl.instance_eval(&)
+        end
+
+        def backups(enabled = nil, &block)
+          if enabled == true
+            @config.backup_config.instance_variable_set(:@dynamodb_tables, :all)
+          elsif block
+            backup_dsl = BackupDSL.new(@config.backup_config)
+            backup_dsl.instance_eval(&block)
+          end
+        end
+      end
+
+      class EnvDSL
+        def initialize(config)
+          @config = config
+        end
+
+        def set(key, value)
+          @config.instance_variable_get(:@env_vars)[key.to_s] = value.to_s
+        end
+      end
+
+      # DSL for the backups block
+      class BackupDSL
+        def initialize(backup_config)
+          @backup_config = backup_config
+        end
+
+        def dynamodb(scope = :all)
+          if scope == :all
+            @backup_config.instance_variable_set(:@dynamodb_tables, :all)
+          else
+            tables = Array(scope)
+            @backup_config.instance_variable_set(:@dynamodb_tables, tables.map(&:to_s))
+          end
+        end
+
+        def cognito(*exports)
+          @backup_config.instance_variable_set(:@cognito_exports, exports.flatten.map(&:to_sym))
+        end
+
+        def s3(*buckets)
+          @backup_config.instance_variable_set(:@s3_buckets, buckets.flatten.map(&:to_sym))
+        end
+
+        def retention(opts = {})
+          current = @backup_config.instance_variable_get(:@retention)
+          merged = current.merge(opts.transform_keys(&:to_sym))
+          merged.transform_values! { |v| v.respond_to?(:to_i) ? v.to_i : v }
+          @backup_config.instance_variable_set(:@retention, merged)
+        end
+      end
+    end
+  end
+end

data/lib/belt/cli/tables_command.rb

@@ -61,9 +61,9 @@ module Belt
 
       def parse_models
         model_files = Dir.glob(File.join(MODELS_DIR, '*.rb'))
-                        .reject { |f| File.basename(f) == 'application_record.rb' }
-                        .reject { |f| File.basename(f).start_with?('concerns') }
-                        .sort
+                         .reject { |f| File.basename(f) == 'application_record.rb' }
+                         .reject { |f| File.basename(f).start_with?('concerns') }
+                         .sort
 
         model_files.filter_map { |f| parse_model_file(f) }
       end

data/lib/belt/cli/terraform_command.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'env_resolver'
+require_relative 'environment_config'
 
 module Belt
   module CLI
@@ -53,6 +54,7 @@ module Belt
 
       def run
         validate!
+        apply_env_config!
         env_dir = File.join(@infra_dir, @env)
         args = ['terraform', @action, *@extra_args]
         puts "belt → #{args.join(' ')}  (in #{env_dir}/)"
@@ -61,6 +63,12 @@ module Belt
 
       private
 
+      def apply_env_config!
+        env_config = EnvironmentConfig.load(@env, infra_dir: @infra_dir)
+        env_config.apply!
+        puts "  🔑 Using AWS profile: #{env_config.aws_profile}" if env_config.aws_profile?
+      end
+
       def validate!
         unless @infra_dir
           abort "Error: No infrastructure/ directory found. Run `belt generate environment #{@env}` first."

data/lib/belt/helpers/cors_origin.rb

@@ -18,7 +18,7 @@ module Belt
 
         allowed.any? do |pattern|
           if pattern.include?('*')
-            regex = Regexp.new('\A' + Regexp.escape(pattern).gsub('\*', '[^.]+') + '\z')
+            regex = Regexp.new("\\A#{Regexp.escape(pattern).gsub('\*', '[^.]+')}\\z")
             regex.match?(origin)
           else
             pattern == origin

data/lib/belt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Belt
-  VERSION = '0.2.7'
+  VERSION = '0.2.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belt
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Stowzilla
@@ -78,6 +78,7 @@ files:
 - lib/belt/cli/destroy_command.rb
 - lib/belt/cli/env_resolver.rb
 - lib/belt/cli/environment_command.rb
+- lib/belt/cli/environment_config.rb
 - lib/belt/cli/frontend_command.rb
 - lib/belt/cli/frontend_deploy_command.rb
 - lib/belt/cli/frontend_env_command.rb