belt 0.3.27 → 0.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b006b12335ff6d66a4834d47b1a2d69e29b1f6d82c81d17cb842cf8cd3b929
-  data.tar.gz: b0c23c9f91bfac292603928ad63bdc28ac75fc0d9f306a5c32d2a57abaa0cf0a
+  metadata.gz: 84353c2ac395a3d2855e5df323c6d90305eda791b58906c41c89571e842325bb
+  data.tar.gz: d1364d5d4a87087431b67782f2919ffcc2ab37779d30ff779c2a7c9a8ced58ce
 SHA512:
-  metadata.gz: 30db85ef7c77debdc5ec7bc66977afb4dc2f5f72c0b61e43e3d3ad17d579fd3e7af7591e885be419e55819c0c8fc05ba5970095827c5b51bf889f9c3553372ec
-  data.tar.gz: e46501282fc782535992b185f87014e6b27c6f5e5a5eb5572cb91e713a362cedd5209674436f535af03834d7fe3b8feafd47e5a533b6eb3d36c23c5bfa31ce6b
+  metadata.gz: bcea273ea44bfd7410ad5bc249fd21206ee050bf78a7e31ad841e51196a3930e7646e5dd237fb80ecd49253b8fdd9a1982cc5972e46cee43ddfbef4441a8baaa
+  data.tar.gz: 7cf36fd36c683e8ca9694f27943401a909793a8f64757f03bb44a7f985bd6229670a9876446d4f8ba9b60ee021e700fa2e70d08f120ae72bcec4f4bd2bc512db

data/lib/belt/cli/destroy_command.rb

@@ -236,6 +236,9 @@ module Belt
         @removed << dir
         puts "  remove  #{dir}/"
         puts "\n✓ Environment '#{@name}' destroyed!"
+
+        # Check if DNS delegation exists and warn about cleanup
+        warn_about_dns_delegation(@name)
       end
 
       def terraform_state_exists?(dir)
@@ -258,6 +261,24 @@ module Belt
         true
       end
 
+      def warn_about_dns_delegation(env_name)
+        dns_tfvars = 'infrastructure/dns/terraform.tfvars'
+        return unless File.exist?(dns_tfvars)
+
+        content = File.read(dns_tfvars)
+        # Only match a real HCL entry (e.g. "  dev = [") at the start of a line,
+        # not the commented-out examples in the tfvars template (e.g. "#   dev = [").
+        # This mirrors the anchored patterns DNSCommand uses when writing entries.
+        return unless content =~ /^\s*#{Regexp.escape(env_name)}\s*=/
+
+        puts ''
+        puts '⚠  DNS delegation still exists for this environment.'
+        puts '   To clean up the root zone delegation:'
+        puts ''
+        puts "     belt dns remove #{env_name}"
+        puts '     belt dns deploy'
+      end
+
       def run_terraform_destroy(dir)
         puts "\n━━━ terraform destroy (#{@name}) ━━━"
 

data/lib/belt/cli/dns_command.rb

@@ -25,6 +25,8 @@ module Belt
           new.generate(args)
         when 'add'
           new.add_environment(args)
+        when 'remove', 'rm'
+          new.remove_environment(args)
         when 'show', 'list'
           new.show(args)
         when '--help', '-h', 'help'
@@ -43,6 +45,7 @@ module Belt
             deploy              Deploy the dns infrastructure (init → plan → apply)
             generate            Create the infrastructure/dns directory (same as belt generate dns)
             add <env>           Add an environment's NS records to dns/terraform.tfvars
+            remove <env>        Remove an environment's NS records from dns/terraform.tfvars
             show                Show root zone name servers (for registrar configuration)
             help                Show this help
 
@@ -55,6 +58,7 @@ module Belt
             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
+            belt dns remove staging         # Remove staging's NS delegation
             belt dns show                   # Show root name servers to configure at registrar
 
           The dns directory manages your root domain and delegates subdomains to
@@ -67,6 +71,11 @@ module Belt
             3. belt dns add dev             # Add dev's NS records
             4. belt dns deploy              # Deploy root zone
             5. Update registrar NS records to output values
+
+          When destroying an environment:
+            1. belt destroy environment dev # Destroy the environment
+            2. belt dns remove dev          # Remove DNS delegation
+            3. belt dns deploy              # Apply the change
         HELP
       end
 
@@ -208,6 +217,37 @@ module Belt
         puts "\nRun 'belt dns deploy' to apply the changes."
       end
 
+      # --- Remove Environment ---
+      def remove_environment(args)
+        env_name = args.shift
+
+        if env_name.nil? || env_name.start_with?('-')
+          puts 'Usage: belt dns remove <env>'
+          puts "\nExample: belt dns remove staging"
+          exit 1
+        end
+
+        tfvars_path = "#{DNS_DIR}/terraform.tfvars"
+        unless File.exist?(tfvars_path)
+          puts "#{tfvars_path} not found."
+          puts "\nNo DNS infrastructure to modify."
+          exit 1
+        end
+
+        content = File.read(tfvars_path)
+
+        # Check if the environment exists in the tfvars
+        unless content.include?("#{env_name} =")
+          puts "Environment '#{env_name}' not found in #{tfvars_path}."
+          puts "\nNothing to remove."
+          exit 0
+        end
+
+        remove_env_from_tfvars(tfvars_path, env_name)
+        puts "✓ Removed #{env_name} NS records from #{tfvars_path}"
+        puts "\nRun 'belt dns deploy' to apply the changes."
+      end
+
       # --- Show ---
       def show(_args)
         require 'open3'
@@ -241,18 +281,11 @@ module Belt
           end
         end
 
-        # Extract values
+        # Extract values from terraform state
         name_servers = outputs.dig('root_name_servers', 'value') || []
         zone_id = outputs.dig('root_zone_id', 'value')
         environments = outputs.dig('delegated_environments', 'value') || []
 
-        if name_servers.empty?
-          puts 'No name servers found. Is the DNS zone deployed?'
-          puts "\nRun:"
-          puts '  belt dns deploy'
-          exit 1
-        end
-
         # Read domain from tfvars
         tfvars_path = "#{DNS_DIR}/terraform.tfvars"
         domain = nil
@@ -262,6 +295,26 @@ module Belt
           domain = match[1] if match
         end
 
+        # Verify the zone actually exists in AWS (terraform state can be stale)
+        if zone_id && !zone_exists_in_aws?(zone_id, env)
+          puts 'Root Zone Not Found'
+          puts '==================='
+          puts ''
+          puts "Terraform state references zone #{zone_id}, but it doesn't exist in AWS."
+          puts 'The zone may have been deleted or the state is stale.'
+          puts ''
+          puts 'To create the root zone:'
+          puts '  belt dns deploy'
+          exit 1
+        end
+
+        if name_servers.empty?
+          puts 'No name servers found. Is the DNS zone deployed?'
+          puts "\nRun:"
+          puts '  belt dns deploy'
+          exit 1
+        end
+
         # Display
         puts 'Root Zone Name Servers'
         puts '======================'
@@ -386,6 +439,31 @@ module Belt
         File.write(path, content)
       end
 
+      def remove_env_from_tfvars(path, env_name)
+        content = File.read(path)
+
+        # Match the environment entry: "  env_name = [\n    ...\n  ]" with optional trailing comma
+        # The entry can be followed by another entry, a closing brace, or whitespace
+        #
+        # Pattern breakdown:
+        # - ^(\s*)#{env_name}\s*= matches "  env_name =" at start of line
+        # - \s*\[\s* matches " [" with optional whitespace
+        # - [^\]]* matches everything inside brackets (the NS records)
+        # - \]\s*,?\s* matches "]" with optional trailing comma and whitespace
+        # - (?=\n|\s*[}\w]) lookahead for newline or closing brace/next entry
+        entry_pattern = /^\s*#{Regexp.escape(env_name)}\s*=\s*\[[^\]]*\]\s*,?\s*\n?/m
+
+        content.gsub!(entry_pattern, '')
+
+        # Clean up any double newlines that may have been created
+        content.gsub!(/\n{3,}/, "\n\n")
+
+        # If the environment_zones block is now empty (just whitespace), clean it up
+        content.gsub!(/^environment_zones\s*=\s*\{\s*\n\s*\}/, 'environment_zones = {}')
+
+        File.write(path, content)
+      end
+
       # Resolve the state bucket name to use in backend.tf.
       # Priority: existing sibling backend.tf → AWS account ID → bare placeholder.
       def resolve_state_bucket
@@ -456,6 +534,16 @@ module Belt
         _, status = Open3.capture2e(*cmd)
         status.success?
       end
+
+      # Verify a Route 53 hosted zone exists in AWS.
+      # env is a hash with optional AWS_PROFILE for the aws CLI.
+      def zone_exists_in_aws?(zone_id, env = {})
+        require 'open3'
+        cmd = ['aws', 'route53', 'get-hosted-zone', '--id', zone_id]
+        cmd += ['--profile', env['AWS_PROFILE']] if env['AWS_PROFILE']
+        _, status = Open3.capture2e(*cmd)
+        status.success?
+      end
     end
   end
 end

data/lib/belt/version.rb

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

metadata

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