belt 0.3.21 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e913248aec69e4989d916f23eca445762abbdd0f3e1aa46b71bda1de8accbb68
-  data.tar.gz: 9865a153a7f77ffbdedccf3e0250d205fab538f57a853723d043f51d9eacd162
+  metadata.gz: 1e5abc1ab2820331aaad684f79c2b43cd5f5d99d0c38abbbd38e4dcd1efe0aad
+  data.tar.gz: 315d3cf0a8209683598ba624e5a5017b26d764b0e1e88ab654cdaa7eedfe7ab9
 SHA512:
-  metadata.gz: 8bab207b1d5c59d7ededcfe54a106b971cfe9d2ce8538b339bc68206aeeb241893369c62664d92f675c6717476e747740c4b69103e5f84ec32332efa717f139b
-  data.tar.gz: f6ec883e69585c5e5f2ac8bbea321b1e33f751a43f5d615c638066a9c330f98ba9a03ef29c624714eae619f3ac3e7472b33d6add7850e43a2c1dea6084035fd9
+  metadata.gz: 2a0254ea0e2b6de26b6cf3e65caee76db2df44a714a492edfeef0490e2644fa6bdf2a38c6150e09c71d94d389f699d60fcfd0235be8a44f4da25bc28a0cfba17
+  data.tar.gz: 7310bc92ea3749017da52f6be928288b3970c5e52a828d948796f44e75a2ff628652db767227622f4e371889c37a7387d2aca02a844fae32c108b95448a4a603

data/lib/belt/cli/dns_command.rb

@@ -21,7 +21,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 +42,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 +65,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 +90,21 @@ 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)
+
         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|
@@ -192,19 +220,19 @@ module Belt
       end
 
       def load_dns_config
-        belt_rb = File.join(DNS_DIR, 'belt.rb')
-        return {} unless File.exist?(belt_rb)
-
-        EnvironmentConfig.load(belt_rb)
+        # Load config from infrastructure/dns/belt.rb
+        # EnvironmentConfig.load expects (env_name, infra_dir:) where the path
+        # is infra_dir/env_name/belt.rb. We pass 'dns' as env_name.
+        EnvironmentConfig.load('dns')
       end
 
       def run_terraform(action, env_config, *extra_args)
         cmd = ['terraform', action] + extra_args
         env = {}
 
-        if env_config[:aws_profile]
-          env['AWS_PROFILE'] = env_config[:aws_profile]
-          puts "Using AWS profile: #{env_config[:aws_profile]}" if action == 'init'
+        if env_config.aws_profile?
+          env['AWS_PROFILE'] = env_config.aws_profile
+          puts "Using AWS profile: #{env_config.aws_profile}" if action == 'init'
         end
 
         system(env, *cmd) || begin
@@ -281,6 +309,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 +327,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

data/lib/belt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Belt
-  VERSION = '0.3.21'
+  VERSION = '0.3.23'
 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.21
+  version: 0.3.23
 platform: ruby
 authors:
 - Stowzilla