belt 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ad9e95cd921b5bf91ffd28544086a895e49ce04a59e4a6b62d64cb9b1ec7bd1
-  data.tar.gz: 7e8795bcfc4e7941f5bd6b426a509ada6dd8d931c39b2af777e0725e8a78e021
+  metadata.gz: 37cf283dc30b43f875f8600eb4b00e46b5782f374d3be306d0c5adaec7e9024a
+  data.tar.gz: 1153f552cef87426f91afcf28647065017b77a09bdd9347241366ed9cc455b76
 SHA512:
-  metadata.gz: d228ac8ae6a440aa17c56b5ab16e48ebda349666b5b22d08456d5c99df4a66f47461031d48d049f81cd8c9d6253d9aa410e8ffa25a45998296ec5c3af524a651
-  data.tar.gz: 943b4993668f4c3be7ede7ff7dda63f7e4682906af122632fba1fe3ef66b257ee3970d93383dfe7fbd8df1d88a4852f1cbdaca37f2beac8db26ad0c995d75230
+  metadata.gz: 4cafc0f29e0148e74950e9fe0898e74632f2563980f60ffece7bfbb58ec7187ec30f928a0958dff9d9832fe79b21e8a87e512f26c4cddfa58c1f243776cea5eb
+  data.tar.gz: 7850fc8e4c5921646c25f77f67fdfcae663e148ec597b514b095b637733b0e55f34182e8c64ea52f2294ed687b3a24f7b6a56462b30df07811a01ffae23da952

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/version.rb

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

metadata

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