firespring_dev_commands 2.1.32.pre.alpha.4 → 2.1.32.pre.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdc619a8748de80444363d7bf216ffc4c4ffcb706b2ca9478e4a156203529bb8
-  data.tar.gz: 1195bb833ab7fae4d713bf1c8f6401e83bd3dde8146f7a75fe6ac999be40ad29
+  metadata.gz: 79a1a2ae3dec85f284124b6b7148ada390d1b1761d051470a5c05157c22873ae
+  data.tar.gz: d0754a57c361e5532e48ecf5025f38c7ee3e63f1ee67b8ed33cc80f542562d2d
 SHA512:
-  metadata.gz: b3d96c11b5828232f415a9f36731ac2e649c07f2be927e24f64b973834db3d2db8d1a5ad80a96fc1ae9485848b964601a435d9208d85f154afabc6ce45355e50
-  data.tar.gz: 709779690537ec9e1a292599c9050f81f8364bcc98d2547f9b13dec3486fcae295a92d504b19a3ca513242731bc514c9a46a8a38677f77db0e0522e92dec4a4e
+  metadata.gz: 90133369d6cb5eb63925f4b9e3223a7ca51cd8235ef8d945d9a12223fc5594ccb91faf4dcdf15d77e849e4b662a97e02a831e9bc338745c536c1d41110f7af17
+  data.tar.gz: c4ee82f9c701470b1f2624b30c6d906155f269d9900a5742dc63fb1f33dec1c91b117e6cd1c48cbd9618e0dc74827741c0db19473942bd6134c52c62bdbbf500

data/lib/firespring_dev_commands/aws/route53.rb

@@ -2,22 +2,22 @@ module Dev
   class Aws
     # Class for performing Route53 functions
     class Route53
-      attr_reader :client, :zones
+      attr_reader :client, :zones, :domains
 
-      def initialize
+      def initialize(domains)
         @client = ::Aws::Route53::Client.new
-        @zones = nil
+        @domains = domains
       end
 
-      def zones(domains = [])
-        @zones ||= if domains.empty?
-                     all_zones
-                   else
-                     zones_by_domain_names(domains)
-                   end
+      private def zones
+        if @domains.empty?
+          all_zones
+        else
+          zones_by_domain_names(@domains)
+        end
       end
 
-      def all_zones
+      private def all_zones
         [].tap do |ary|
           Dev::Aws.each_page(client, :list_hosted_zones) do |response|
             response.hosted_zones&.each do |hosted_zone|
@@ -27,7 +27,7 @@ module Dev
         end
       end
 
-      def zones_by_domain_names(domains)
+      private def zones_by_domain_names(domains)
         [].tap do |ary|
           domains.each do |domain_name|
             response = client.list_hosted_zones_by_name({dns_name: domain_name})
@@ -39,14 +39,14 @@ module Dev
         end
       end
 
-      def target_config_id(zone_id)
+      private def target_config_id(zone_id)
         client.list_query_logging_configs(
           hosted_zone_id: zone_id,
           max_results: '1'
         ).query_logging_configs&.first&.id
       end
 
-      def pretty_puts(output)
+      private def pretty_puts(output)
         # Find the maximum length of the keys
         max_key_length = output.keys.map(&:to_s).max_by(&:length).length
 
@@ -57,7 +57,7 @@ module Dev
 
       def list_query_configs
         output = {}
-        @zones.each do |zone|
+        zones.each do |zone|
           target_config_id = target_config_id(zone.id)
 
           output[zone.name] = if target_config_id
@@ -73,7 +73,7 @@ module Dev
       def activate_query_logging(log_group)
         output = {}
 
-        @zones.each do |zone|
+        zones.each do |zone|
           response = client.create_query_logging_config(
             hosted_zone_id: zone.id,
             cloud_watch_logs_log_group_arn: log_group
@@ -89,7 +89,7 @@ module Dev
 
       def deactivate_query_logging
         output = {}
-        @zones.each do |zone|
+        zones.each do |zone|
           target_config_id = target_config_id(zone.id)
           if target_config_id
             client.delete_query_logging_config(

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

@@ -33,15 +33,14 @@ module Dev
                   namespace :dns_logging do
                     desc 'Activates query logging for all hosted zones by default.' \
                          'This command should be run from the account the hosted zone(s) reside.' \
-                         "\n\t(Required) Specify HOSTED_ZONE_GROUP='arn:aws:logs:REGION:ACCOUNT_ID:' to specify the ARN of the target log group." \
+                         "\n\t(Required) Specify LOG_GROUP_ARN='arn:aws:logs:REGION:ACCOUNT_ID:' to specify the ARN of the target log group." \
                          "\n\toptionally specify DOMAINS='foo.com,foobar.com' to specify the hosted zones to activate." \
                          "\n\t\tComma delimited list."
                     task activate: %w(ensure_aws_credentials) do
-                      route53 = Dev::Aws::Route53.new
-                      route53.zones(ENV['DOMAINS'].to_s.strip.split(','))
+                      route53 = Dev::Aws::Route53.new(ENV['DOMAINS'].to_s.strip.split(','))
                       # Use user defined log group.
-                      log_group = ENV.fetch('HOSTED_ZONE_GROUP', nil)
-                      raise 'The Hosted Zone Log Group ARN, HOSTED_ZONE_GROUP, is required' unless log_group
+                      log_group = ENV.fetch('LOG_GROUP_ARN', nil)
+                      raise 'The Hosted Zone Log Group ARN, LOG_GROUP_ARN, is required' unless log_group
 
                       route53.activate_query_logging(log_group)
                     end
@@ -67,8 +66,7 @@ module Dev
                          "\n\toptionally specify DOMAINS='foo.com,foobar.com' to specify the hosted zones to activate." \
                          "\n\t\tComma delimited list."
                     task deactivate: %w(ensure_aws_credentials) do
-                      route53 = Dev::Aws::Route53.new
-                      route53.zones(ENV['DOMAINS'].to_s.strip.split(','))
+                      route53 = Dev::Aws::Route53.new(ENV['DOMAINS'].to_s.strip.split(','))
                       route53.deactivate_query_logging
                     end
                   end
@@ -93,8 +91,7 @@ module Dev
                          "\n\toptionally specify DOMAINS='foo.com,foobar.com' to specify the hosted zones to activate." \
                          "\n\t\tComma delimited list."
                     task list_query_configs: %w(ensure_aws_credentials) do
-                      route53 = Dev::Aws::Route53.new
-                      route53.zones(ENV['DOMAINS'].to_s.strip.split(','))
+                      route53 = Dev::Aws::Route53.new(ENV['DOMAINS'].to_s.strip.split(','))
                       route53.list_query_configs
                     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.4'.freeze
+    VERSION = '2.1.32.pre.alpha.5'.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.4
+  version: 2.1.32.pre.alpha.5
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport