firespring_dev_commands 2.1.12.pre.alpha.1 → 2.1.12.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d45e522585dc1fc678c904d007d74a62e7dcf144ce7740a16d65d74f733f9b3
-  data.tar.gz: 921bf69588ec64e831c6ddff866185cb639d0567dbd046cbd3109c451475d349
+  metadata.gz: 9f601fd4e17457b7e9191634735b25adc99e798d57fba379b389cd996c35af66
+  data.tar.gz: d003e9fb9b514e06c77f2b2a0f16b004dee4aa3748642c7d5bfdd0b1a97bfbe3
 SHA512:
-  metadata.gz: d3b1641933384538aba3ad31a5b7e06bea40a28b1388567ea5d8818488860097b2d465d84fb2259d1c5f1214fece78f3ceb4cb21dba1c5e8c46e266661bd7cbe
-  data.tar.gz: c4e70e99aaf81fbb35c60b07178fcf1fbbfa9a2fe1e7636c6b53541c9920122f382f43787c13fc9a6272784ccb0a3aa4772ac4529c2dbe2437406f90dc4fb167
+  metadata.gz: a27f199d0741ef7d391207bfda5841923ab4d03d6b6a77b5c49f9279ade5e3aefb009ee99d851c69486c1aed28a14de6873357c99969de24988daf4b09f572a2
+  data.tar.gz: a06f8a3bbc6efc62eeba0b3cdb70d361d4b034c1a9456fba12311dcaafea448408b71d3d7ce8df30a42260e092548c3431b55a68e9f273b77553835020bb0f9e

data/lib/firespring_dev_commands/aws/codepipeline.rb

@@ -21,16 +21,10 @@ module Dev
       def pipelines(regex_match = nil)
         raise 'regex_match must be a regexp' if regex_match && !regex_match.is_a?(Regexp)
 
-        params = {}
-        response = client.list_pipelines(params)
-        pipelines = response.pipelines
-
-        next_token = response.next_token
-        while next_token
-          params[:next_token] = next_token
-          response = client.list_pipelines(params)
-          pipelines += response.pipelines
-          next_token = response.next_token
+        pipelines = [].tap do |ary|
+          Dev::Aws.each_page(client, :list_pipelines) do |response|
+            ary.concat(response.pipelines)
+          end
         end
 
         pipelines.select! { |it| it.name.match(regex_match) } if regex_match

data/lib/firespring_dev_commands/aws/parameter.rb

@@ -24,20 +24,12 @@ module Dev
 
       # Retrieve all parameters which start with the given path
       def list(path, recursive: true, with_decryption: true)
-        next_token = nil
-
-        parameters = []
-        loop do
-          response = client.get_parameters_by_path(
-            path:,
-            recursive:,
-            with_decryption:,
-            next_token:
-          )
-          parameters += response.parameters
-          break unless (next_token = response.next_token)
+        [].tap do |ary|
+          params = {path:, recursive:, with_decryption:}
+          Dev::Aws.each_page(client, :get_parameters_by_path, params) do |response|
+            ary.concat(response.parameters)
+          end
         end
-        parameters
       end
 
       # Sets the given parameter name's value to the given value

data/lib/firespring_dev_commands/aws.rb

@@ -9,5 +9,17 @@ module Dev
 
     # The default role name used if none has been configured when logging in
     DEFAULT_LOGIN_ROLE_NAME = 'ReadonlyAccessRole'.freeze
+
+    # Runs the query on the client with the parameters
+    # Yields each response page
+    def self.each_page(client, query, params = {})
+      response = client.send(query, params)
+      yield response
+
+      while response.next_page?
+        response = response.next_page
+        yield response
+      end
+    end
   end
 end

data/lib/firespring_dev_commands/eol/aws.rb

@@ -5,60 +5,112 @@ require 'aws-sdk-opensearchservice'
 
 module Dev
   class EndOfLife
+    # Class which queries several different AWS product types and
+    # returns ProductVersion entities which can be checked for EOL
     class Aws
+      # Queries and returns product versions for the default product types
+      def default_products
+        (elasticache_products + lambda_products + opensearch_products + rds_products).flatten.compact
+      end
+
+      # Queries and returns product versions for elasticache products
       def elasticache_products
         client = ::Aws::ElastiCache::Client.new
-        client.describe_cache_clusters.cache_clusters.filter_map do |cluster|
-          name = cluster.cache_cluster_id
-          product = cluster.engine
-          version = cluster.engine_version.reverse.split('.')[-2..].join('.').reverse
-          Dev::EndOfLife::ProductVersion.new(product, version, name)
+
+        [].tap do |ary|
+          Dev::Aws.each_page(client, :describe_cache_clusters) do |response|
+            response.cache_clusters.each do |cluster|
+              name = cluster.cache_cluster_id
+              product = cluster.engine
+              version = cluster.engine_version.reverse.split('.')[-2..].join('.').reverse
+              ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
+            end
+          end
         end
       end
 
+      # Queries and returns product versions for lambda products
       def lambda_products
         client = ::Aws::Lambda::Client.new
-        client.list_functions.functions.filter_map do |function|
-          # Runtime is empty if using a docker image
-          next unless function.runtime
 
-          name = function.function_name
-          product = function.runtime.split(/[0-9]/, 2).first
-          version = function.runtime.split(/#{product}/, 2).last.chomp('.x')
-          Dev::EndOfLife::ProductVersion.new(product, version, name)
+        [].tap do |ary|
+          Dev::Aws.each_page(client, :list_functions) do |response|
+            response.functions.each do |function|
+              # Runtime is empty if using a docker image
+              next unless function.runtime
+
+              name = function.function_name
+              product = function&.runtime&.split(/[0-9]/, 2)&.first
+              version = function&.runtime&.split(/#{product}/, 2)&.last&.chomp('.x')
+              ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
+            end
+          end
         end
       end
 
+      # Queries and returns product versions for opensearch products
       def opensearch_products
         client = ::Aws::OpenSearchService::Client.new
-        client.list_domain_names.domain_names.filter_map do |domain|
-          name = domain.domain_name
-          product = domain.engine_type
-          version = client.describe_domain(domain_name: name).domain_status.engine_version.split('_').last.split('.').first
-          Dev::EndOfLife::ProductVersion.new(product, version, name)
+
+        [].tap do |ary|
+          Dev::Aws.each_page(client, :list_domain_names) do |response|
+            response.domain_names.each do |domain|
+              name = domain.domain_name
+              product = domain.engine_type
+              version = client.describe_domain(domain_name: name).domain_status.engine_version.split('_').last.split('.').first
+              ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
+            end
+          end
         end
       end
 
+      # Queries and returns product versions for rds products
       def rds_products
-        supported_aws_engines = %w(mysql postgresql)
-        supported_eol_engines = %w(mssqlserver mysql postgresql sqlite)
+        rds_instance_products + rds_cluster_products
+      end
 
+      # Queries and returns product versions for rds instance products
+      def rds_instance_products
+        aws_engines = %w(mysql postgresql)
         client = ::Aws::RDS::Client.new
-        client.describe_db_instances.db_instances.filter_map do |instance|
-          name = instance.db_instance_identifier
-          product = if supported_aws_engines.include?(instance.engine)
-                      "amazon-rds-#{instance.engine}"
-                    elsif supported_eol_engines.include?(instance.engine)
-                      instance.engine
-                    else
-                      puts "WARNING: unsupported engine #{instance.engine} found".light_yellow
-                      next
-                    end
-          version = instance.engine_version.reverse.split('.')[-2..].join('.').reverse
-          Dev::EndOfLife::ProductVersion.new(product, version, name)
+
+        [].tap do |ary|
+          Dev::Aws.each_page(client, :describe_db_instances) do |response|
+            response.db_instances.each do |instance|
+              name = instance.db_instance_identifier
+              engine = instance.engine.tr('aurora-', '')
+              product = if aws_engines.include?(engine)
+                          "amazon-rds-#{engine}"
+                        else
+                          engine
+                        end
+              version = instance.engine_version.reverse.split('.')[-2..].join('.').reverse
+              ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
+            end
+          end
         end
+      end
 
-        # TODO: Add db cluster info too?
+      # Queries and returns product versions for rds cluster products
+      def rds_cluster_products
+        aws_engines = %w(mysql postgresql)
+        client = ::Aws::RDS::Client.new
+
+        [].tap do |ary|
+          Dev::Aws.each_page(client, :describe_db_clusters) do |response|
+            response.db_clusters.each do |cluster|
+              name = cluster.db_cluster_identifier
+              engine = cluster.engine.tr('aurora-', '')
+              product = if aws_engines.include?(engine)
+                          "amazon-rds-#{engine}"
+                        else
+                          engine
+                        end
+              version = cluster.engine_version.reverse.split('.')[-2..].join('.').reverse
+              ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
+            end
+          end
+        end
       end
     end
   end

data/lib/firespring_dev_commands/eol/product_version.rb

@@ -55,9 +55,7 @@ module Dev
         # If EOL info is a boolean or missing from the current details, overwrite with the manual date (if present)
         manual_date = Dev::EndOfLife.config.manual_dates["#{product}_#{cycle.tr('.', '_')}".to_sym]
         detail['eol'] = manual_date if manual_date && (detail['eol'].boolean? || detail['eol'].nil?)
-
-        raise "unable to query eol detail for #{name}, #{cycle}" if detail.empty?
-
+        detail['eol'] = '1979-01-01' if detail.empty?
         detail
       end
 

data/lib/firespring_dev_commands/templates/aws.rb

@@ -108,12 +108,7 @@ module Dev
             account_name = Dev::Aws::Account.new.name_by_account(account_id)
             LOG.info "  Current AWS Account is #{account_name} (#{account_id})".light_yellow
 
-            versions = Dev::EndOfLife::Aws.new.elasticache_products +
-                       Dev::EndOfLife::Aws.new.lambda_products +
-                       Dev::EndOfLife::Aws.new.opensearch_products +
-                       Dev::EndOfLife::Aws.new.rds_products
-
-            Dev::EndOfLife.new(product_versions: versions.compact).check
+            Dev::EndOfLife.new(product_versions: Dev::EndOfLife::Aws.new.default_products).check
           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.12.pre.alpha.1'.freeze
+    VERSION = '2.1.12.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.12.pre.alpha.1
+  version: 2.1.12.pre.alpha.3
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport