belt 0.3.23 → 0.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e5abc1ab2820331aaad684f79c2b43cd5f5d99d0c38abbbd38e4dcd1efe0aad
-  data.tar.gz: 315d3cf0a8209683598ba624e5a5017b26d764b0e1e88ab654cdaa7eedfe7ab9
+  metadata.gz: 5f40dfd0e0c761eeecce4896ee9c8f55ac9a97e98dd734d3c12e713a110d65a1
+  data.tar.gz: 88ef3eea4944d9edac97929f83e892fb4e204fcab15c7cdbace48356e4cb0cab
 SHA512:
-  metadata.gz: 2a0254ea0e2b6de26b6cf3e65caee76db2df44a714a492edfeef0490e2644fa6bdf2a38c6150e09c71d94d389f699d60fcfd0235be8a44f4da25bc28a0cfba17
-  data.tar.gz: 7310bc92ea3749017da52f6be928288b3970c5e52a828d948796f44e75a2ff628652db767227622f4e371889c37a7387d2aca02a844fae32c108b95448a4a603
+  metadata.gz: c84e237feafd376b1064d624d0d6bf89bd2409363eb660e2f3c03c1d35a5023b98fcee81b1d826dc8ebcb7e5a0a3fe18c1635006ec771be7d514c5d6e051a546
+  data.tar.gz: 9d342d91da2029541c4f238e36f055bcbf4118c6d8087c00be5defa5b6e0d9b66e8c5f24b73e69e52a983acc7363f020ed6b6b538499e2bbe4c19e903da9ac72

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
@@ -100,6 +101,9 @@ module Belt
         # 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}"
@@ -346,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,14 +84,21 @@ 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
         apply_lifecycle(@bucket_name)
         say '  ensure  lifecycle rules (90-day noncurrent expiration)'
-        update_backend_config
+
+        # Only update backend configs when we know the target scope.
+        # If --aws-profile is set but no env_name, we're creating a bucket for a specific
+        # account (e.g., DNS infrastructure) — don't touch other environments' backends.
+        update_backend_config unless @aws_profile && @env_name.nil?
         print_success_message
       end
 
@@ -140,10 +169,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 +227,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 +240,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 +260,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 +278,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 +292,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 +308,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.23'
+  VERSION = '0.3.25'
 end

metadata

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