dependabot-docker 0.368.0 → 0.369.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7952bdc0d8a8258c1afa8042656d72fbc48e3becfe4850e449e5f86c7f170a1a
-  data.tar.gz: a600410ab9c7b7d121c639898654f8a134033da58b6f98118c3da7bca9d75a4f
+  metadata.gz: cde08982fe9953b55ba0e4c54ccab6c7de53577313703f8320b4a54c4f2b5397
+  data.tar.gz: 63b1fcfbe7c53feb41add6476b7cd4976207a9f3d340e81d2eeaf92f66b16afe
 SHA512:
-  metadata.gz: 549b91244b443a37aef1bd27eb26b5de9bf121a3b89ac498a4bc07ad2a6e186b41c9f8857b8e2e8c9f3a3aec02d5427ce297cab622e41af778e21b1adbcd265e
-  data.tar.gz: 8f22ab97605010d3a7ea626cedcd838b1245c2e73a4412ff0829daa9c1c1a256275a49eb07020fc1b45e498ac62d3fbfd04e13d5ae4fb1f2df321080ee54dfde
+  metadata.gz: a7710d10586d0cfcb57b81056b56f41d45def9692b48bc4ee9e782efe8b2f6c2868d403fbfa6700f45f1620bedf3dfccd696ec63912e2d9b13dc34125804705e
+  data.tar.gz: '079e53c368372617361184e05c525320a7d6cbbb9455d4e2db951544c78f2684344f9ee2b24156db578f51f2728f8e83a86761eb01d927e8f060acaccbda9dde'

data/lib/dependabot/docker/update_checker.rb

@@ -6,6 +6,7 @@ require "sorbet-runtime"
 
 require "dependabot/update_checkers"
 require "dependabot/update_checkers/base"
+require "dependabot/update_checkers/cooldown_calculation"
 require "dependabot/errors"
 require "dependabot/docker/tag"
 require "dependabot/docker/file_parser"
@@ -346,7 +347,7 @@ module Dependabot
 
           next if !details || !details.released_at
 
-          return [tag] unless cooldown_period?(details.released_at)
+          return [tag] unless cooldown_period?(T.must(details.released_at), tag)
 
           Dependabot.logger.info("Skipping tag #{tag.name} due to cooldown period")
         end
@@ -812,7 +813,9 @@ module Dependabot
 
       sig { returns(T::Boolean) }
       def should_skip_cooldown?
-        @update_cooldown.nil? || !cooldown_enabled? || !@update_cooldown.included?(dependency.name)
+        Dependabot::UpdateCheckers::CooldownCalculation.skip_cooldown?(
+          @update_cooldown, dependency.name, cooldown_enabled: cooldown_enabled?
+        )
       end
 
       sig { returns(T::Boolean) }
@@ -825,19 +828,17 @@ module Dependabot
         Dependabot::Experiments.enabled?(:docker_pin_digests)
       end
 
-      sig do
-        returns(Integer)
-      end
-      def cooldown_days_for
+      sig { params(release_date: Time, candidate_tag: Dependabot::Docker::Tag).returns(T::Boolean) }
+      def cooldown_period?(release_date, candidate_tag)
         cooldown = @update_cooldown
+        return false unless cooldown
 
-        T.must(cooldown).default_days
-      end
-
-      sig { params(release_date: T.untyped).returns(T::Boolean) }
-      def cooldown_period?(release_date)
-        days = cooldown_days_for
-        (Time.now.to_i - release_date.to_i) < (days * 24 * 60 * 60)
+        current_version = dependency.version ? comparable_version_from(version_tag) : nil
+        new_version = comparable_version_from(candidate_tag)
+        days = Dependabot::UpdateCheckers::CooldownCalculation.cooldown_days_for(
+          cooldown, current_version, new_version
+        )
+        Dependabot::UpdateCheckers::CooldownCalculation.within_cooldown_window?(release_date, days)
       end
 
       # Fetches the "created" timestamp from the image config blob for a given tag.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-docker
 version: !ruby/object:Gem::Version
-  version: 0.368.0
+  version: 0.369.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.368.0
+        version: 0.369.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.368.0
+        version: 0.369.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +261,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.368.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.369.0
 rdoc_options: []
 require_paths:
 - lib