firespring_dev_commands 2.2.8.pre.alpha.1 → 2.2.9.pre.alpha.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 112744c89c38e98a24085c5074065e7ad09e4cd46acf01160f47c96fba987510
-  data.tar.gz: a899f6fcdec41006c1500b2237727579917640f4d909aa23c14621a58c86b5ad
+  metadata.gz: '082cd5a36d24e2f5ad43c9e5cf4e4826c28d204f41d7c473045f6d0f0a81d77e'
+  data.tar.gz: b58035949eccbdbbb45145379c7502d347261370bbb4ba5b739da3a8b605354f
 SHA512:
-  metadata.gz: bf0f1462d0a0f04217189f43b5bf5c07af6054f3ef634c8b7b26743f503e35e105e9557130356bd8a4f64f85c3bb969bb903cef6bed050cba42bddba8ec3394b
-  data.tar.gz: 0ccc1bf68fbb77fef0213c1df948cfd9d1799018a42df1a0ecf646d454cca05f43bd8c79e2dc8f567118df4f4af10189618c937d57e0deec7e26787e8eeea348
+  metadata.gz: c0679cfc6454455ad132eb0f05adba5cd6a9041001a40923673fd9f6e356bd752c5f29a073d47e7980ed0f7f6fa52c4c9854dfb36a8d8e62ae9d31861af5f773
+  data.tar.gz: 7aad107e9bc5b2272de65a7032f94b7dc1686828d04034e029fa619bfd4621ab7a3b0b084a77076dd4c75b8a4da9d45f779dff94dc6753ff23c4c3606acd12a5

data/lib/firespring_dev_commands/aws/login.rb

@@ -61,15 +61,15 @@ 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', 'no_username_found')} user serial #{serial}")
+        code = mfa_code(serial)
         raise 'MFA is required' unless code.to_s.strip
 
         sts = ::Aws::STS::Client.new(profile: 'default', region:)
         creds = sts.assume_role(
-          serial_number: serial,
+          serial_number: mfa_serial || serial,
           role_arn: role,
           role_session_name: session_name,
-          token_code: code,
+          token_code: code.to_s.strip,
           duration_seconds: session_duration
         ).credentials
         puts
@@ -77,6 +77,32 @@ module Dev
         Dev::Aws::Credentials.new.write!(account, creds)
       end
 
+      # The custom local file where target information is stored.
+      CUSTOM_CONFIG_FILE = "#{Dir.home}/.bash_profile.d/config/.main".freeze
+
+      # Targets a custom ini config.
+      def custom_config_ini
+        IniFile.new(filename: CUSTOM_CONFIG_FILE, default: 'default')['default']
+      end
+
+      def mfa_serial
+        return unless !ENV.fetch('OP_LOGIN', nil).nil? && File.exist?(CUSTOM_CONFIG_FILE)
+
+        custom_config_ini['aws_1pass_mfa_serial']
+      end
+
+      # Handles the MFA code logic.
+      def mfa_code(serial)
+        # Note, OP_LOGIN likely not needed. Available as feature flag.
+        # Checks if OnePassword CLI is installed and the custom config file exist.
+        if !ENV.fetch('OP_LOGIN', nil).nil? && system('op --version', out: '/dev/null') && File.exist?(CUSTOM_CONFIG_FILE)
+          cmd = "op item get #{custom_config_ini['aws_uuid']} --otp"
+          `#{cmd}`
+        else
+          ENV['AWS_TOKEN_CODE'] || Dev::Common.new.ask("Enter the MFA code for the #{ENV.fetch('USERNAME', 'no_username_found')} user serial #{serial}")
+        end
+      end
+
       # Returns the config ini file
       # Runs the setup for our current account if it's not already setup
       def setup_cfgini(account)
@@ -88,8 +114,8 @@ module Dev
         cfgini
       end
 
-      # Authroizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
-      # Authroizes the docker ruby library to pull/push images from the Aws container registry
+      # Authorizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
+      # Authorizes the docker ruby library to pull/push images from the Aws container registry
       def registry_logins!(registry_ids: nil, region: nil)
         registry_ids ||= Dev::Aws::Account.new.ecr_registry_ids
         region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
@@ -100,8 +126,8 @@ module Dev
         puts
       end
 
-      # Authroizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
-      # Authroizes the docker ruby library to pull/push images from the Aws container registry
+      # Authorizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
+      # Authorizes the docker ruby library to pull/push images from the Aws container registry
       def registry_login!(registry_id: nil, region: nil)
         registry_id ||= Dev::Aws::Account.new.ecr_registry_ids.first
         region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
@@ -116,7 +142,7 @@ module Dev
         ENV['ECR_REGISTRY'] ||= registry
       end
 
-      # Authroizes the docker cli to pull/push images from the Aws container registry
+      # Authorizes the docker cli to pull/push images from the Aws container registry
       # (e.g. if docker compose needs to pull an image)
       # @deprecated Please use {Dev::Aws::Login#registry_login!} instead
       def docker_login!(registry_id: nil, region: nil)
@@ -127,7 +153,7 @@ module Dev
         puts
       end
 
-      # Authroizes the docker cli to pull/push images from the Aws container registry
+      # Authorizes the docker cli to pull/push images from the Aws container registry
       # (e.g. if docker compose needs to pull an image)
       private def docker_cli_login!(registry:, region:)
         print("  Logging in to #{registry} in docker... ")
@@ -137,7 +163,7 @@ module Dev
         Dev::Common.new.run_command([login_cmd])
       end
 
-      # Authroizes the docker ruby library to pull/push images from the Aws container registry
+      # Authorizes the docker ruby library to pull/push images from the Aws container registry
       # @deprecated Please use {Dev::Aws::Login#registry_login!} instead
       def ecr_login!(registry_id: nil, region: nil)
         registry_id ||= Dev::Aws::Account.new.ecr_registry_ids.first
@@ -146,7 +172,7 @@ module Dev
         docker_lib_login!(registry_id:, region:)
       end
 
-      # Authroizes the docker ruby library to pull/push images from the Aws container registry
+      # Authorizes the docker ruby library to pull/push images from the Aws container registry
       private def docker_lib_login!(registry_id:, region:)
         # Grab your authentication token from AWS ECR
         ecr_client = ::Aws::ECR::Client.new(region:)

data/lib/firespring_dev_commands/aws/route53.rb

@@ -67,56 +67,18 @@ module Dev
         [response.hosted_zone, response.delegation_set]
       end
 
-      def json_details
-        zone_count = 0
+      def list_zone_details
         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
 
-      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
+          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(', '))
         rescue ::Aws::Route53::Errors::Throttling
           sleep(1)
           retry

data/lib/firespring_dev_commands/dns/resource.rb

@@ -1,5 +1,3 @@
-require 'whois'
-
 module Dev
   class Dns
     class Resource
@@ -24,14 +22,6 @@ 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_pretty_list_zone_details_task!
+          def create_list_zone_details_task!
             # Have to set a local variable to be accessible inside of the instance_eval block
             exclude = @exclude
 
@@ -18,26 +18,7 @@ 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.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
+                    route53.list_zone_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.8.pre.alpha.1'.freeze
+    VERSION = '2.2.9.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.8.pre.alpha.1
+  version: 2.2.9.pre.alpha.0
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.157.0
+        version: 1.141.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.157.0
+        version: 1.141.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ssm
   requirement: !ruby/object:Gem::Requirement
@@ -360,20 +360,6 @@ 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: []