belt 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17b4d2d7497d0961b96e4628ee718fae22f5da62e321652cd3ff252351883836
-  data.tar.gz: 155caff17e7ca310097baf72376ed8ad8a1515c2ce397769b2db2d6cb5653a26
+  metadata.gz: 5ad9e95cd921b5bf91ffd28544086a895e49ce04a59e4a6b62d64cb9b1ec7bd1
+  data.tar.gz: 7e8795bcfc4e7941f5bd6b426a509ada6dd8d931c39b2af777e0725e8a78e021
 SHA512:
-  metadata.gz: 491589da65264857a3c6964ec522344b2dd222a3cab655235039bb39c48ad84c23a3ed83bc20aeaa31de2da197ba51d71c37dfed9395eeaf66464cebcbce28cb
-  data.tar.gz: 9d407911c6bec8492f26ece6bda2f592e67056a44a85ae6c09c99cd877992ffa356893d0a955fea0436684278911164916a1d8066490cb0be80e30368a134837
+  metadata.gz: d228ac8ae6a440aa17c56b5ab16e48ebda349666b5b22d08456d5c99df4a66f47461031d48d049f81cd8c9d6253d9aa410e8ffa25a45998296ec5c3af524a651
+  data.tar.gz: 943b4993668f4c3be7ede7ff7dda63f7e4682906af122632fba1fe3ef66b257ee3970d93383dfe7fbd8df1d88a4852f1cbdaca37f2beac8db26ad0c995d75230

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/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)
@@ -443,6 +463,9 @@ module Belt
       def build_gems(build_dir)
         puts '    🐳 Building gems in Docker (Lambda-compatible)...'
 
+        uid = Process.uid
+        gid = Process.gid
+
         docker_cmd = [
           'docker', 'run', '--rm',
           '--platform', 'linux/amd64',
@@ -454,7 +477,8 @@ module Belt
           "bundle config set --local without 'development test' && " \
           'bundle config set silence_root_warning 1 && ' \
           'bundle install --jobs 4 && ' \
-          'bundle clean --force'
+          'bundle clean --force && ' \
+          "chown -R #{uid}:#{gid} vendor/"
         ]
 
         output, status = Open3.capture2e(*docker_cmd)
@@ -484,7 +508,7 @@ module Belt
                   .travis.yml .rubocop.yml Rakefile]
         exts.each do |pattern|
           Dir.glob(File.join(vendor_dir, '**', pattern)).each do |f|
-            File.delete(f) if File.file?(f)
+            FileUtils.rm_f(f) if File.file?(f)
           end
         end
 

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

@@ -6,9 +6,24 @@ module Belt
       def self.resolve_origin(request_origin)
         allowed = allowed_origins
         return nil if allowed.empty?
-        return request_origin if request_origin && allowed.include?(request_origin)
+        return request_origin if request_origin && matches_allowed?(request_origin, allowed)
 
-        allowed.first
+        # Don't return a wildcard pattern as a literal origin — use '*' instead
+        first = allowed.first
+        first.include?('*') ? '*' : first
+      end
+
+      def self.matches_allowed?(origin, allowed)
+        return false unless origin
+
+        allowed.any? do |pattern|
+          if pattern.include?('*')
+            regex = Regexp.new("\\A#{Regexp.escape(pattern).gsub('\*', '[^.]+')}\\z")
+            regex.match?(origin)
+          else
+            pattern == origin
+          end
+        end
       end
 
       def self.origin_from_event(event)

data/lib/belt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belt
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 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