firespring_dev_commands 2.2.6 → 2.2.8.pre.alpha.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56fe86ccb0ca1d53e766dfaf1672413ba8c47090a9e3ec1c507fa8c05137d0e3
-  data.tar.gz: d429d3695666f2a1e910adf4c3f23568ec538007df64c2c74192eee6d1debdea
+  metadata.gz: b5dee68fee762c895021357261186dbf043c9719c2304c3d79893d943f83b10b
+  data.tar.gz: 9df30efd116a01d8688d1cfa5f61a12c3a8b871d797bd028da51f38c05c6e044
 SHA512:
-  metadata.gz: fb92670bc256da6e80cfb26c611dfee20afdf4faf7a17161a4692b1840af550190d33714a63f1bf330d42d0e909cf1a1d98bbf9aa0c71bdf0ab16173c5bb3052
-  data.tar.gz: 382a5c6197a223bed6d96e5500c0b48f04cff564eaf19fc30f985b882b36813e0130ed1d2ebc4dfcfd73eb9d8f8abbd9d7df4aebee379a62957b4a97c8abb9e0
+  metadata.gz: 8140c7df5ccc1b41e74959476d71708687175c5797dcfe4117934e7dbcce55edbaa98c957685209309c5c2582a1a858fe1b0d90e6898d08287b680b12c46b706
+  data.tar.gz: 3003314d63a53c06e6509c45b9e35eb2135a5b7b8a7ea8bc14039c86b062cb9f31a8ee27f22db216c5a117a6c2a39046a381695e821d469bd7b2d9a4090407fc

data/lib/firespring_dev_commands/aws/account.rb

@@ -94,7 +94,7 @@ module Dev
         #       because some projects may be using older versions of the dev_commands library
         # defaultini.delete('mfa_serial')
 
-        session_name_default = defaultini['role_session_name'] || "#{ENV.fetch('USERNAME', nil)}_cli"
+        session_name_default = defaultini['role_session_name'] || "#{ENV.fetch('USERNAME', 'no_username_found')}_cli"
         defaultini['role_session_name'] = Dev::Common.new.ask('Default session name', session_name_default)
 
         duration_default = defaultini['session_duration'] || 36_000

data/lib/firespring_dev_commands/aws/login.rb

@@ -61,7 +61,7 @@ module Dev
         puts "  Logging in to #{account} in #{region} as #{role}".light_yellow
         puts
 
-        code = ENV['AWS_TOKEN_CODE'] || Dev::Common.new.ask("Enter the MFA code for the #{ENV.fetch('USERNAME', '')} user serial #{serial}")
+        code = ENV['AWS_TOKEN_CODE'] || Dev::Common.new.ask("Enter the MFA code for the #{ENV.fetch('USERNAME', 'no_username_found')} user serial #{serial}")
         raise 'MFA is required' unless code.to_s.strip
 
         sts = ::Aws::STS::Client.new(profile: 'default', region:)

data/lib/firespring_dev_commands/aws/route53.rb

@@ -67,18 +67,56 @@ module Dev
         [response.hosted_zone, response.delegation_set]
       end
 
-      def list_zone_details
+      def json_details
+        zone_count = 0
         zones do |zone|
-          puts
           zone_details, delegation_set = details(zone.id)
           dns_resource = Dev::Dns::Resource.new(zone_details.name)
+          zone_count += 1
+          apex_record = dns_resource.recursive_a_lookup
+          nameserver_names = dns_resource.recursive_nameserver_lookup
+          nameserver_ips = nameserver_names.sort.map { |it| dns_resource.recursive_a_lookup(it) }
+          # Check if the site is dead, no a record or any AWS ips in the lists.
+          # if apex_record.empty? && (!zone_details.name.chomp('.').include? 'firespring') && (!nameserver_ips.join(', ').include? '205.251')
+          if !dns_resource.recursive_a_lookup.empty? && (dns_resource.recursive_nameserver_lookup.include? 'ns1.firespring.com')
+            out_data = {
+              'count' => zone_count,
+              'dns_name' => zone_details.name.chomp('.'),
+              'hosted_zone_id' => zone_details.id,
+              'delegation_set_id' => delegation_set.id,
+              # 'registrar_servers' => dns_resource.registrar_lookup.join(','), # This function is fickle, add with care.
+              'reported_nameservers' => nameserver_names.sort.join(', '),
+              'reported_ns_ips' => nameserver_ips.join(', '),
+              'a_record_ip' => apex_record.sort.join(', ')
+            }
+            # Display contents
+            puts JSON.pretty_generate(out_data)
+          end
+        rescue ::Aws::Route53::Errors::Throttling
+          sleep(1)
+          retry
+        end
+        puts
+      end
 
-          puts "#{zone_details.name.chomp('.').light_white} (#{zone_details.id}):"
-          puts format('  %-50s %s', 'Delegation Set:', delegation_set.id)
-          puts format('  %-50s %s', 'Delegation Defined Nameservers:', delegation_set.name_servers.sort.join(', '))
-          puts format('  %-50s %s', 'DNS Reported Nameservers:', dns_resource.recursive_nameserver_lookup.sort.join(', '))
-          puts format('  %-50s %s', 'DNS Reported Nameserver IPs:', dns_resource.recursive_nameserver_lookup.sort.map { |it| dns_resource.recursive_a_lookup(it) }.join(', '))
-          puts format('  %-50s %s', 'Domain Apex IP Resolution:', dns_resource.recursive_a_lookup.sort.join(', '))
+      def command_line_details
+        zone_count = 0
+        zones do |zone|
+          zone_details, delegation_set = details(zone.id)
+          dns_resource = Dev::Dns::Resource.new(zone_details.name)
+          zone_count += 1
+          if !dns_resource.recursive_a_lookup.empty? && (dns_resource.recursive_nameserver_lookup.include? 'ns1.firespring.com')
+            puts
+            puts "#{zone_count} - #{zone_details.name.chomp('.')} (#{zone_details.id}):"
+            puts format('  %-50s %s', 'Delegation Set:', delegation_set.id)
+            puts format('  %-50s %s', 'Delegation Defined Nameservers:', delegation_set.name_servers.sort.join(', '))
+            puts format('  %-50s %s', 'WHOIS Reported server:', dns_resource.registrar_lookup.join(','))
+            puts format('  %-50s %s', 'DNS Reported Nameservers:', dns_resource.recursive_nameserver_lookup.sort.join(', '))
+            puts format('  %-50s %s', 'DNS Reported Nameserver IPs:', dns_resource.recursive_nameserver_lookup.sort.map do |it|
+                                                                        dns_resource.recursive_a_lookup(it)
+                                                                      end.join(', '))
+            puts format('  %-50s %s', 'Domain Apex IP Resolution:', dns_resource.recursive_a_lookup.sort.join(', '))
+          end
         rescue ::Aws::Route53::Errors::Throttling
           sleep(1)
           retry

data/lib/firespring_dev_commands/dns/resource.rb

@@ -1,3 +1,5 @@
+require 'whois'
+
 module Dev
   class Dns
     class Resource
@@ -22,6 +24,14 @@ module Dev
         value.match?(Resolv::IPv6::Regex)
       end
 
+      # Determines the registrar(s) of the given name. Not perfect and can be rate limited.
+      def registrar_lookup(name = domain)
+        Whois.whois(name.chomp('.')).parts.map(&:host)
+      rescue Whois::Error
+        sleep(0.75)
+        retry
+      end
+
       # Recursively determine the correct nameservers for the given domain.
       # If nameservers are not found, strip subdomains off until we've reached the TLD
       def recursive_nameserver_lookup(name = domain)

data/lib/firespring_dev_commands/templates/aws/services/route53.rb

@@ -6,7 +6,7 @@ module Dev
       module Services
         # Class contains rake templates for managing your AWS settings and logging in
         class Route53 < Dev::Template::BaseInterface
-          def create_list_zone_details_task!
+          def create_pretty_list_zone_details_task!
             # Have to set a local variable to be accessible inside of the instance_eval block
             exclude = @exclude
 
@@ -18,7 +18,26 @@ module Dev
                   desc 'print details for all hosted zones'
                   task list_details: %w(ensure_aws_credentials) do
                     route53 = Dev::Aws::Route53.new(ENV['DOMAINS'].to_s.strip.split(','))
-                    route53.list_zone_details
+                    route53.command_line_details
+                  end
+                end
+              end
+            end
+          end
+
+          def create_json_list_zone_details_task!
+            # Have to set a local variable to be accessible inside of the instance_eval block
+            exclude = @exclude
+
+            DEV_COMMANDS_TOP_LEVEL.instance_eval do
+              return if exclude.include?(:json_details)
+
+              namespace :aws do
+                namespace :hosted_zone do
+                  desc 'print details for all hosted zones'
+                  task json_details: %w(ensure_aws_credentials) do
+                    route53 = Dev::Aws::Route53.new(ENV['DOMAINS'].to_s.strip.split(','))
+                    route53.json_details
                   end
                 end
               end

data/lib/firespring_dev_commands/version.rb

@@ -6,6 +6,6 @@ module Dev
     # Use 'v.v.v.pre.alpha.v' for pre-release vesions
     # Use 'v.v.v.beta.v for beta versions
     # Use semantic versioning for any releases (https://semver.org/)
-    VERSION = '2.2.6'.freeze
+    VERSION = '2.2.8.pre.alpha.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.8.pre.alpha.0
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -360,6 +360,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: whois
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: Ruby library for creating/maintaining your development environment
 email: opensource@firespring.com
 executables: []
@@ -475,9 +489,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: