belt 0.3.27 → 0.3.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b006b12335ff6d66a4834d47b1a2d69e29b1f6d82c81d17cb842cf8cd3b929
-  data.tar.gz: b0c23c9f91bfac292603928ad63bdc28ac75fc0d9f306a5c32d2a57abaa0cf0a
+  metadata.gz: d392dbd28d642a7f18a3087e8640ef1382b5da70199804a77232b99f365a6822
+  data.tar.gz: 791f51d17d764ada25f3ce6395a141d02f3b1474556df4299067b78726b1db3c
 SHA512:
-  metadata.gz: 30db85ef7c77debdc5ec7bc66977afb4dc2f5f72c0b61e43e3d3ad17d579fd3e7af7591e885be419e55819c0c8fc05ba5970095827c5b51bf889f9c3553372ec
-  data.tar.gz: e46501282fc782535992b185f87014e6b27c6f5e5a5eb5572cb91e713a362cedd5209674436f535af03834d7fe3b8feafd47e5a533b6eb3d36c23c5bfa31ce6b
+  metadata.gz: bc6051c477ad262a13029781cb3a12a8df262a8d3a94d9a5f8a98b3adcb379d8c4f0d761244144cac8c69a37abbf7d3a5eba88fb3b7a7f2ba21a1cc41e77e196
+  data.tar.gz: b6470146bd1920c26462f8b37279eda6c35a92f5a184e37e2171d1015e2d694ac7e5b6b07b2a34cc7bd40f1af8464d891ae4f75d9808c8ee0af956e618aa494e

data/lib/belt/cli/dns_command.rb

@@ -241,18 +241,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 +255,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 '======================'
@@ -456,6 +469,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.28'
 end

metadata

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