firespring_dev_commands 2.1.24.pre.alpha.1 → 2.1.24.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da85ac4ab338cfd8abae1f8418d90917d6ac6128862a0ee05d0bd98ce99d490d
-  data.tar.gz: bb3e8442372b2a372c4f0c471eafaf3b0450870a2ed298d99b147716272781a7
+  metadata.gz: eb2cf1870dd2e6e30d0dbd360bee8827c3bf8f748051a1692411e1a3d3324e71
+  data.tar.gz: d71152d34719d590445f2265d955faecfc502cb4864411a54fa4c26d2038b666
 SHA512:
-  metadata.gz: ec110b18d1ad21e6cfadd34f4c6bac4f277db7d8dd28b073b42df40ad376b69a5c231129890f1eb03562dac1f1045568e1d8f32493d297d7818ab73448ae4cf7
-  data.tar.gz: 8e8f5dfcc4dcb0ebbb321d4d09643c986abdd674b930db7e8bb55563775e268b62a548d4d7e540ea74941cdfcd6b6dbbaedd6d109c3eff1a777f1e503ceceb8c
+  metadata.gz: 5040fae63fb2071356d149f22128aedd0fc4bed611431e1254d0eeff1f3b59b4d7656a1be78d502c5bd0a329c095cff050878f42722aac15d1d376b005313096
+  data.tar.gz: ed7695707e6d7fd6dfb7e8962a7001500fd2e62dc8844761ec2cc267e5fedcc023a20d61805fbf650dbd9bdeaed10578d5eb8b43f7a7c04d46c0086430d31b9d

data/lib/firespring_dev_commands/eol.rb

@@ -5,8 +5,9 @@ module Dev
     END_OF_LIFE_API_URL = 'https://endoflife.date/api'.freeze
 
     # Config object for setting top level git config options
-    Config = Struct.new(:product_versions, :manual_dates) do
+    Config = Struct.new(:check_aws_resources, :product_versions, :manual_dates) do
       def initialize
+        self.check_aws_resources = false
         self.product_versions = []
         self.manual_dates = {}
       end
@@ -26,9 +27,10 @@ module Dev
       alias_method :configure, :config
     end
 
-    attr_accessor :url, :products, :product_versions
+    attr_accessor :url, :products, :check_aws_resources, :product_versions
 
-    def initialize(product_versions: self.class.config.product_versions)
+    def initialize(check_aws_resources: self.class.config.check_aws_resources, product_versions: self.class.config.product_versions)
+      @check_aws_resources = check_aws_resources
       @product_versions = Array(product_versions)
       raise 'product version must be of type Dev::EndOfLife::ProductVersions' unless @product_versions.all?(Dev::EndOfLife::ProductVersion)
     end
@@ -50,7 +52,14 @@ module Dev
     # Raises an error if any products are EOL
     def check
       puts
-      product_versions.sort_by(&:name).each(&:print_status)
+      checks_to_perform = product_versions.clone
+      if check_aws_resources
+        account_id = Dev::Aws::Profile.new.current
+        account_name = Dev::Aws::Account.new.name_by_account(account_id)
+        LOG.info "  Current AWS Account is #{account_name} (#{account_id})".light_yellow
+        checks_to_perform.concat(Dev::EndOfLife::Aws.new.default_products)
+      end
+      checks_to_perform.sort_by(&:name).each(&:print_status)
       puts
       raise 'found EOL versions' if product_versions.any?(&:eol)
     end

data/lib/firespring_dev_commands/templates/aws.rb

@@ -94,23 +94,11 @@ module Dev
       end
       # rubocop:enable Metrics/MethodLength
 
-      # Create the rake task for the eol method
+      # Set the EOL library to also check AWS resources
       def create_eol_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?(:eol)
+        return if exclude.include?(:eol)
 
-          desc 'Compares the current date to the EOL date for supported resources'
-          task eol: %w(init ensure_aws_credentials) do
-            account_id = Dev::Aws::Profile.new.current
-            account_name = Dev::Aws::Account.new.name_by_account(account_id)
-            LOG.info "  Current AWS Account is #{account_name} (#{account_id})".light_yellow
-
-            Dev::EndOfLife.new(product_versions: Dev::EndOfLife::Aws.new.default_products).check
-          end
-        end
+        Dev::EndOfLife.config { |c| c.check_aws_resources = true }
       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.24.pre.alpha.1'.freeze
+    VERSION = '2.1.24.pre.alpha.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.24.pre.alpha.1
+  version: 2.1.24.pre.alpha.2
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport