belt 0.3.22 → 0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a3951e549645f3fca57660c1e883dee7ae4077e20b77b9b404b1dfa6e9539ab
-  data.tar.gz: cf18d81cdd06c595ac152d7a85b76f8818dedfb6791b902aef09a7bfe8c1cbbb
+  metadata.gz: 9e5f26e4b71c7d784ea8e6a2596952a21d9357f65a9284b9358c5c79a34e50a8
+  data.tar.gz: f98d7e78c1620e38700eb53151cbf21daaace261f0b2802dc36633665bc50d1d
 SHA512:
-  metadata.gz: 8d42fe40574244f042988650b83f6ec28e7bd37013674b4f5ca8fd95d33c90bdb6ed6fc8ad6828caa5c5531bb35f3c0064764222bef0ebbf6ddcd009597bef24
-  data.tar.gz: 1a8a6b73f9f72f80dbbba96c09d9345a85c2246367c76caa97693be5710388929f3b4468d92822d8d9e6b185798a9a1faf4f48f4f38165cbabd2433e318701b3
+  metadata.gz: d6d165f29d693cbc4cd19b693a74867ad578c70bcc255ffc25672ae616694a7604870e090800df16a73d6534e772d95fd417bdad888c07674f15998f838cdaa7
+  data.tar.gz: 835dfd43f148de3966d7cba26784922b2c6f952ab24d1c9fb61abf4f51f596d29107526c91a6cdba5be191f061f91acd6504298bd6067ccc756ac7b556b09a88

data/lib/belt/cli/dns_command.rb

@@ -5,6 +5,7 @@ require 'erb'
 require 'json'
 require_relative 'app_detection'
 require_relative 'environment_config'
+require_relative 'setup_command'
 
 module Belt
   module CLI
@@ -21,7 +22,7 @@ module Belt
         when 'deploy', nil
           new.deploy(args)
         when 'generate', 'init'
-          new.generate
+          new.generate(args)
         when 'add'
           new.add_environment(args)
         when '--help', '-h', 'help'
@@ -42,9 +43,14 @@ module Belt
             add <env>           Add an environment's NS records to dns/terraform.tfvars
             help                Show this help
 
+          Options for generate:
+            --aws-profile NAME  AWS profile to use for DNS infrastructure
+                               Sets belt.rb config and derives state bucket from account ID
+
           Examples:
             belt dns deploy                 # Deploy the root zone
-            belt dns generate               # Scaffold infrastructure/dns
+            belt dns generate               # Scaffold infrastructure/dns (prompts for profile)
+            belt dns generate --aws-profile fpshared  # Non-interactive with profile
             belt dns add staging            # Add staging's NS records to tfvars
 
           The dns directory manages your root domain and delegates subdomains to
@@ -60,14 +66,23 @@ module Belt
         HELP
       end
 
-      def initialize(quiet: false)
+      def initialize(quiet: false, aws_profile: nil)
         @app_name = detect_app_name
         @quiet = quiet
-        @state_bucket = resolve_state_bucket
+        @aws_profile = aws_profile
+        @state_bucket = nil # Resolved during generate with profile context
       end
 
       # --- Generate ---
-      def generate
+      def generate(args = [])
+        # Parse --aws-profile flag
+        profile_index = args.index('--aws-profile')
+        if profile_index
+          @aws_profile = args[profile_index + 1]
+          args.delete_at(profile_index + 1)
+          args.delete_at(profile_index)
+        end
+
         if Dir.exist?(DNS_DIR)
           puts "dns infrastructure already exists at #{DNS_DIR}/"
           puts "\nTo configure it:"
@@ -76,7 +91,24 @@ module Belt
           exit 1
         end
 
+        # Prompt for AWS profile if not provided and not quiet mode
+        if @aws_profile.nil? && !@quiet && $stdin.tty?
+          print 'AWS profile for DNS infrastructure (leave blank to use current credentials): '
+          input = $stdin.gets&.strip
+          @aws_profile = input unless input.nil? || input.empty?
+        end
+
+        # Resolve state bucket using the specified profile (or current credentials)
+        @state_bucket = resolve_state_bucket_for_profile(@aws_profile)
+
+        # Ensure the state bucket exists (convention over configuration)
+        ensure_state_bucket_exists(@state_bucket)
+
         puts 'Creating dns infrastructure...' unless @quiet
+        if @aws_profile && !@quiet
+          puts "  Using AWS profile: #{@aws_profile}"
+          puts "  State bucket: #{@state_bucket}"
+        end
         FileUtils.mkdir_p(DNS_DIR)
 
         templates.each do |template_name, dest_file|
@@ -281,6 +313,13 @@ module Belt
         bucket_from_sibling || bucket_from_aws || 'belt-terraform-state'
       end
 
+      # Resolve state bucket for a specific AWS profile.
+      # If profile is provided, uses that profile's account ID.
+      # Otherwise falls back to existing sibling backend.tf or current credentials.
+      def resolve_state_bucket_for_profile(profile)
+        bucket_from_sibling || bucket_from_aws_profile(profile) || 'belt-terraform-state'
+      end
+
       def bucket_from_sibling
         Dir.glob('infrastructure/*/backend.tf').each do |f|
           match = File.read(f).match(/bucket\s*=\s*"([^"]+)"/)
@@ -292,8 +331,14 @@ module Belt
       end
 
       def bucket_from_aws
+        bucket_from_aws_profile(nil)
+      end
+
+      def bucket_from_aws_profile(profile)
         require 'open3'
-        output, status = Open3.capture2e('aws', 'sts', 'get-caller-identity')
+        cmd = %w[aws sts get-caller-identity]
+        cmd += ['--profile', profile] if profile
+        output, status = Open3.capture2e(*cmd)
         return nil unless status.success?
 
         data = begin
@@ -305,6 +350,26 @@ module Belt
 
         "belt-terraform-state-#{data['Account']}"
       end
+
+      # Ensure the state bucket exists, creating it if necessary.
+      # Uses belt setup state --aws-profile for convention over configuration.
+      def ensure_state_bucket_exists(bucket)
+        return if bucket == 'belt-terraform-state' # Placeholder means no credentials
+        return if bucket_exists?(bucket)
+
+        puts "State bucket #{bucket} not found. Creating it..." unless @quiet
+        args = []
+        args += ['--aws-profile', @aws_profile] if @aws_profile
+        SetupCommand.new(args, quiet: @quiet, aws_profile: @aws_profile).run_state_setup
+      end
+
+      def bucket_exists?(bucket)
+        require 'open3'
+        cmd = ['aws', 's3api', 'head-bucket', '--bucket', bucket]
+        cmd += ['--profile', @aws_profile] if @aws_profile
+        _, status = Open3.capture2e(*cmd)
+        status.success?
+      end
     end
   end
 end

data/lib/belt/cli/setup_command.rb

@@ -29,26 +29,48 @@ module Belt
         when 'frontend'
           Belt::CLI::FrontendSetupCommand.run(args)
         else
-          puts 'Usage: belt setup <state|tables|frontend> [options]'
-          puts "\nSubcommands:"
-          puts '  state     Set up S3 bucket for Terraform state'
-          puts '  tables    Generate DynamoDB table definitions from contracts.rb'
-          puts '  frontend  Generate S3 + CloudFront infrastructure for frontend hosting'
+          print_usage
           exit 1
         end
       end
 
-      def initialize(args = [], quiet: false)
+      def self.print_usage
+        puts <<~USAGE
+          Usage: belt setup <state|tables|frontend> [options]
+
+          Subcommands:
+            state       Set up S3 bucket for Terraform state
+            tables      Generate DynamoDB table definitions from contracts.rb
+            frontend    Generate S3 + CloudFront infrastructure for frontend hosting
+
+          Options for state:
+            --aws-profile NAME  Use a specific AWS profile (for multi-account setups)
+            --bucket NAME       Use a custom bucket name instead of belt-terraform-state-<account>
+            --select            Interactively select from existing buckets
+
+          Examples:
+            belt setup state                        # Create/verify bucket using current credentials
+            belt setup state --aws-profile fpshared # Create bucket in a specific AWS account
+            belt setup state --select               # Choose from existing buckets
+            belt setup state --bucket my-bucket     # Use a custom bucket name
+
+          The state bucket stores Terraform state for all Belt applications in an AWS account.
+          By default, Belt uses `belt-terraform-state-<account_id>` as the bucket name.
+        USAGE
+      end
+
+      def initialize(args = [], quiet: false, aws_profile: nil)
         @app_name = detect_app_name
         @env_name = nil
         @custom_bucket = nil
         @select_mode = false
         @quiet = quiet
+        @aws_profile = aws_profile
 
         parse_args(args)
 
         @region = detect_region
-        @bucket_name = resolve_bucket_name
+        @bucket_name = nil # Resolved after credentials check
       end
 
       def run_state_setup
@@ -62,8 +84,11 @@ module Belt
           exit 1
         end
 
+        # Show which profile we're using
+        puts "Using AWS profile: #{@aws_profile}" if @aws_profile && !@quiet
+
         # Resolve final bucket name now that we have credentials
-        @bucket_name = resolve_bucket_name unless @custom_bucket
+        @bucket_name = @custom_bucket || resolve_bucket_name
 
         @bucket_name = interactive_bucket_selection if @select_mode
         setup_or_verify_bucket
@@ -140,10 +165,14 @@ module Belt
           when '--bucket'
             @custom_bucket = args.shift
             abort '✗ --bucket requires a value' unless @custom_bucket
+          when '--aws-profile'
+            @aws_profile = args.shift
+            abort '✗ --aws-profile requires a value' unless @aws_profile
           when '--select'
             @select_mode = true
           when '--help', '-h'
-            self.class.run([])
+            self.class.print_usage
+            exit 0
           else
             @env_name = arg unless arg.start_with?('-')
           end
@@ -194,7 +223,9 @@ module Belt
       end
 
       def list_buckets
-        output = safe_capture('aws', 's3api', 'list-buckets', '--query', 'Buckets[].Name', '--output', 'json')
+        cmd = ['aws', 's3api', 'list-buckets', '--query', 'Buckets[].Name', '--output', 'json']
+        cmd += ['--profile', @aws_profile] if @aws_profile
+        output = safe_capture(*cmd)
         return [] unless output
 
         JSON.parse(output)
@@ -205,7 +236,9 @@ module Belt
       # --- AWS operations ---
 
       def aws_configured?
-        output, status = Open3.capture2e('aws', 'sts', 'get-caller-identity')
+        cmd = %w[aws sts get-caller-identity]
+        cmd += ['--profile', @aws_profile] if @aws_profile
+        output, status = Open3.capture2e(*cmd)
         if status.success?
           data = begin
             JSON.parse(output)
@@ -223,7 +256,9 @@ module Belt
       attr_reader :aws_account_id
 
       def bucket_exists?(bucket)
-        output, status = Open3.capture2e('aws', 's3api', 'head-bucket', '--bucket', bucket)
+        cmd = ['aws', 's3api', 'head-bucket', '--bucket', bucket]
+        cmd += ['--profile', @aws_profile] if @aws_profile
+        output, status = Open3.capture2e(*cmd)
         return true if status.success?
 
         # 403 = bucket exists but owned by someone else; 404 = doesn't exist
@@ -239,6 +274,7 @@ module Belt
       def create_bucket(bucket)
         args = ['aws', 's3api', 'create-bucket', '--bucket', bucket, '--region', @region]
         args.push('--create-bucket-configuration', "LocationConstraint=#{@region}") unless @region == 'us-east-1'
+        args += ['--profile', @aws_profile] if @aws_profile
         run!(*args)
       end
 
@@ -252,11 +288,14 @@ module Belt
             AbortIncompleteMultipartUpload: { DaysAfterInitiation: 7 }
           }]
         }
-        run!('aws', 's3api', 'put-bucket-lifecycle-configuration', '--bucket', bucket,
-             '--lifecycle-configuration', JSON.generate(lifecycle))
+        cmd = ['aws', 's3api', 'put-bucket-lifecycle-configuration', '--bucket', bucket,
+               '--lifecycle-configuration', JSON.generate(lifecycle)]
+        cmd += ['--profile', @aws_profile] if @aws_profile
+        run!(*cmd)
       end
 
       def run!(*args)
+        args = inject_profile(args)
         output, status = Open3.capture2e(*args)
         return if status.success?
 
@@ -265,11 +304,23 @@ module Belt
         exit 1
       end
 
-      def safe_capture(*)
-        output, status = Open3.capture2(*, err: File::NULL)
+      def safe_capture(*args)
+        args = inject_profile(args)
+        output, status = Open3.capture2(*args, err: File::NULL)
         status.success? ? output : nil
       end
 
+      # Inject --profile flag for AWS CLI commands if @aws_profile is set
+      def inject_profile(args)
+        return args unless @aws_profile
+        return args unless args.first == 'aws'
+
+        # Already has a profile flag
+        return args if args.include?('--profile')
+
+        args + ['--profile', @aws_profile]
+      end
+
       def say(message)
         puts message unless @quiet
       end

data/lib/belt/version.rb

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

data/lib/templates/dns/belt.rb.erb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 Belt.configure do |config|
+<% if @aws_profile -%>
+  # AWS profile for DNS infrastructure
+  config.aws_profile = "<%= @aws_profile %>"
+<% else -%>
   # Set the AWS profile to use for DNS infrastructure.
   # This can be a shared account for cross-environment DNS management,
   # or the same profile as your environments for single-account setups.
@@ -12,4 +16,5 @@ Belt.configure do |config|
   #   config.aws_profile = "myapp-dev"
   #
   # config.aws_profile = ""
+<% end -%>
 end

metadata

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