firespring_dev_commands 2.1.32.pre.alpha.1 → 2.1.32.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69a50b275c7679e4e84cb4a89fc37b1ab5c99c33ba7c53bef46fa507804e9389
-  data.tar.gz: be434b186af195f448e2f4e4d6506151c489d223aaac71dead335a96f8debfe0
+  metadata.gz: 87dcece3099e1aec9bfb5f6572371479e6c5cd2dae608d126fc1f5a124a84f7e
+  data.tar.gz: b1204325e48a239995de507fc320331aa6a4dd353338085e9512aefd46f82dcb
 SHA512:
-  metadata.gz: ec623e8b07e6f6266c8c5d163d0a95070ad8acf1f3239d7f14ded6c4dba38d205aaf1266e1d3959fa8eb5dae054e904abfae3365a4aeda3d17ee6389d48da3c2
-  data.tar.gz: e8572a4144e5fdd0be44fbd01b914c6e78e1b9bd9b8d708dca73fd5bb479d8d068f785c2d6be6526181bd0635d608adf8217378e978854181b09b497081bb277
+  metadata.gz: 4331459a1711d98a385e3babbaac972f72c01010fb41e5fe535934427a0a804690ae24ebfd4f33c1f59818a3ac520fd0aa3afe369739a5d86d5b80fd0e8676b1
+  data.tar.gz: bdfb0873f8ad0da53076a979fd60010af02d97894edf538dc3e72ffd97379fadc93a0623f3040d15a820005acd93232df11641b9f12b9a6957a5f8b43cba63e8

data/lib/firespring_dev_commands/aws/route53.rb

@@ -8,31 +8,35 @@ module Dev
 
       def initialize
         @client = ::Aws::Route53::Client.new
-        @zones = []
       end
 
-      def get_hosted_zones(domains)
+      def hosted_zones(domains)
+        @zones = []
         if domains.empty?
-          response = client.list_hosted_zones
-          response.hosted_zones.each do |hosted_zone|
-            @zones << hosted_zone.id
+          @zones = [].tap do |ary|
+            Dev::Aws.each_page(client, :list_hosted_zones, {max_items: 2}) do |response|
+              response.hosted_zones.each do |hosted_zone|
+                ary << hosted_zone.id unless hosted_zone.config.private_zone
+              end
+            end
           end
         else
           domains.each do |domain_name|
             zone = client.list_hosted_zones_by_name({dns_name: domain_name, max_items: 1})
-            target_name = zone.hosted_zones[0].name.chomp!('.') if zone.hosted_zones[0].name.end_with?('.')
-            @zones << zone.hosted_zones[0].id unless target_name != domain_name
+            target_name = zone.hosted_zones.first.name.chomp!('.')
+            raise "The #{domain_name} hosted zone not found." if target_name != domain_name
+
+            @zones << zone.hosted_zones.first.id
           end
         end
         raise 'Hosted zone(s) not found.' if @zones.empty?
       end
 
       def get_target_config_id(zone_id)
-        config = client.list_query_logging_configs(
+        client.list_query_logging_configs(
           hosted_zone_id: zone_id,
           max_results: '1'
-        )
-        config.query_logging_configs[0].id unless config.query_logging_configs.empty? || config.query_logging_configs[0].hosted_zone_id == zone_id
+        ).query_logging_configs.first.id
       end
 
       def activate_query_logging(log_group)

data/lib/firespring_dev_commands/templates/aws.rb

@@ -121,56 +121,60 @@ module Dev
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
       # Create the rake task for the hosted zone method
-      def create_hosted_zone_task!
+      def create_dns_logging_activate_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
           namespace :aws do
-            return if exclude.include?(:hosted_zone)
+            return if exclude.include?(:dns_logging)
 
             namespace :hosted_zone do
               namespace :dns_logging do
-                task :init do
-                  @route53 = Dev::Aws::Route53.new
-
-                  domains = ENV['DOMAINS'].to_s.strip.split(',')
-                  domain = ENV['DOMAIN'].to_s.strip
-                  domains << domain unless domain.empty?
-
-                  # Set global zone id array
-                  @route53.get_hosted_zones(domains)
-                end
-
                 desc 'Activates query logging for all hosted zones by default.' \
                      'This command should be run from the account the hosted zone(s) reside.' \
                      "\n\toptionally specify HOSTED_ZONE_GROUP='arn:aws:logs:REGION:ACCOUNT_ID:' to specify the ARN of the target log group." \
-                     "\n\toptionally specify DOMAIN='foo.com' to specify the hosted zone to activate." \
                      "\n\toptionally specify DOMAINS='foo.com,foobar.com' to specify the hosted zones to activate." \
                      "\n\t\tComma delimited list."
-                task activate: %w(init) do
+                task :activate do
+                  route53 = Dev::Aws::Route53.new
+                  route53.hosted_zones(ENV['DOMAINS'].to_s.strip.split(','))
                   # Use user defined log group. Otherwise, go get the default.
                   log_group = (ENV['HOSTED_ZONE_GROUP'] || Dev::Aws::Parameter.new.get_value('/Firespring/Internal/Route53/hosted-zone/log-group-arn'))
-
-                  @route53.activate_query_logging(log_group)
+                  route53.activate_query_logging(log_group)
                 end
+              end
+            end
+          end
+        end
+      end
 
+      # Create the rake task for the hosted zone method
+      def create_dns_logging_deactivate_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
+          namespace :aws do
+            return if exclude.include?(:dns_logging_de)
+
+            namespace :hosted_zone do
+              namespace :dns_logging do
                 desc 'Deactivates query logging for all hosted zones by default. ' \
                      'This command should be run from the account the hosted zone(s) reside.' \
-                     "\n\toptionally specify DOMAIN='foo.com' to specify the hosted zone to activate." \
                      "\n\toptionally specify DOMAINS='foo.com,foobar.com' to specify the hosted zones to activate." \
                      "\n\t\tComma delimited list."
-                task deactivate: %w(init) do
-                  @route53.deactivate_query_logging
+                task :deactivate do
+                  route53 = Dev::Aws::Route53.new
+                  route53.hosted_zones(ENV['DOMAINS'].to_s.strip.split(','))
+                  route53.deactivate_query_logging
                 end
               end
             end
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength
     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.1.32.pre.alpha.1'.freeze
+    VERSION = '2.1.32.pre.alpha.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.32.pre.alpha.1
+  version: 2.1.32.pre.alpha.3
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport