dependabot-terraform 0.326.0 → 0.326.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176c9f2e99634c51d913f9e3b6f8403159b2e29e68f70bc9f7fbf7e6e9348d8c
-  data.tar.gz: ccc7b7a45bca539f2128a8d399cb9716194fec8eb3a38ed884a9a66a3f74554d
+  metadata.gz: 07e7c6efc73e0df79d7c47ec72b1bda4e977f3cc46d4158cc2633cd1bf0dd746
+  data.tar.gz: 37eb78b5a8daa171d6752716b6c7f28a6793b30d29b105859780e4589c594cd4
 SHA512:
-  metadata.gz: f5823950f6543b4f37902670612faffba9b8be782ab1d472f2eccfc7e267ed8a18c32c5434dc7c05d04a98ecf8f2f9431255e4226a41703bb0abb1fd23f7eb9e
-  data.tar.gz: b9b8a79a3e79175309826575bc92abe65419d1525b26533378d7586f5c284f8c09c5ef41397675aea0b79e7aabbf7c07cbb184b737be27b04524bd0b5454ca90
+  metadata.gz: 1d222b89b3c8be3be5668fa51e7644944ae7291772bb44edfd626ee61e7ac0a03e1445ebb0e2aa5b651f9c4ed906efd5b1e76f439f21920a2bb3168541cd1390
+  data.tar.gz: 96bb9f9ae88e6804ab796d5eb549d980b96bcf8f4ec34459556dd03466f53c35622324c43c8fd696bbec3e57729be3828c0dec233799e991131d1fea9b59aa62

data/lib/dependabot/terraform/update_checker/latest_version_resolver.rb

@@ -43,11 +43,13 @@ module Dependabot
           # step one fetch allowed version tags and
           allowed_version_tags = git_commit_checker.allowed_version_tags
           begin
-            # sort the allowed version tags by name in descending order
-            select_version_tags_in_cooldown_period&.each do |tag_name|
-              # filter out if name is not in cooldown period
-              allowed_version_tags.reject! do |gitref_filtered|
-                true if gitref_filtered.name == tag_name
+            if cooldown_enabled?
+              # sort the allowed version tags by name in descending order
+              select_version_tags_in_cooldown_period&.each do |tag_name|
+                # filter out if name is not in cooldown period
+                allowed_version_tags.reject! do |gitref_filtered|
+                  true if gitref_filtered.name == tag_name
+                end
               end
             end
             Dependabot.logger.info("Allowed version tags after filtering versions in cooldown:
@@ -60,7 +62,10 @@ module Dependabot
         end
 
         # To filter versions in cooldown period based on version tags from registry call
-        sig { params(versions: T::Array[Dependabot::Version]).returns(T::Array[Dependabot::Version]) }
+        sig do
+          params(versions: T::Array[Dependabot::Terraform::Version])
+            .returns(T::Array[Dependabot::Terraform::Version])
+        end
         def filter_versions_in_cooldown_period_from_provider(versions)
           # to make call for registry to get the versions
           # step one fetch allowed version tags and
@@ -81,7 +86,10 @@ module Dependabot
         end
 
         # To filter versions in cooldown period based on version tags from registry call
-        sig { params(versions: T::Array[Dependabot::Version]).returns(T::Array[Dependabot::Version]) }
+        sig do
+          params(versions: T::Array[Dependabot::Terraform::Version])
+            .returns(T::Array[Dependabot::Terraform::Version])
+        end
         def filter_versions_in_cooldown_period_from_module(versions)
           # to make call for registry to get the versions
           # step one fetch allowed version tags and
@@ -125,14 +133,10 @@ module Dependabot
 
           return false if cooldown.nil?
 
-          # Get maximum cooldown days based on semver parts
-          days = [cooldown.default_days, cooldown.semver_major_days].max
-          days = cooldown.semver_minor_days unless days > cooldown.semver_minor_days
-          days = cooldown.semver_patch_days unless days > cooldown.semver_patch_days
           # Calculate the number of seconds passed since the release
           passed_seconds = Time.now.to_i - release_date_to_seconds(release_date)
           # Check if the release is within the cooldown period
-          passed_seconds < days * DAY_IN_SECONDS
+          passed_seconds < cooldown.default_days * DAY_IN_SECONDS
         end
 
         sig { params(release_date: String).returns(Integer) }
@@ -184,10 +188,15 @@ module Dependabot
           )
         end
 
-        # Since base class is returning false, we need to override it.
         sig { returns(T::Boolean) }
         def cooldown_enabled?
-          true
+          # This is a simple check to see if user has put cooldown days.
+          # If not set, then we aassume user does not want cooldown.
+          # Since Terraform does not support Semver versioning, So option left
+          # for the user is to set cooldown default days.
+          return false if @cooldown_options.nil?
+
+          @cooldown_options.default_days.positive?
         end
 
         sig { returns(Dependabot::GitCommitChecker) }

data/lib/dependabot/terraform/update_checker.rb

@@ -82,7 +82,9 @@ module Dependabot
 
         versions = all_module_versions
         # Filter versions which are in cooldown period
-        latest_version_resolver.filter_versions_in_cooldown_period_from_module(versions)
+        if cooldown_enabled? # rubocop:disable Style/IfUnlessModifier
+          versions = latest_version_resolver.filter_versions_in_cooldown_period_from_module(versions)
+        end
         versions.reject!(&:prerelease?) unless wants_prerelease?
         versions.reject! { |v| ignore_requirements.any? { |r| r.satisfied_by?(v) } }
         @latest_version_for_registry_dependency = T.let(
@@ -122,7 +124,9 @@ module Dependabot
 
         versions = all_provider_versions
         # Filter versions which are in cooldown period
-        latest_version_resolver.filter_versions_in_cooldown_period_from_provider(versions)
+        if cooldown_enabled?
+          versions = latest_version_resolver.filter_versions_in_cooldown_period_from_provider(versions)
+        end
         versions.reject!(&:prerelease?) unless wants_prerelease?
         versions.reject! { |v| ignore_requirements.any? { |r| r.satisfied_by?(v) } }
 
@@ -241,6 +245,17 @@ module Dependabot
           T.nilable(Dependabot::GitCommitChecker)
         )
       end
+
+      sig { returns(T::Boolean) }
+      def cooldown_enabled?
+        # This is a simple check to see if user has put cooldown days.
+        # If not set, then we aassume user does not want cooldown.
+        # Since Terraform does not support Semver versioning, So option left
+        # for the user is to set cooldown default days.
+        return false if update_cooldown.nil?
+
+        T.must(update_cooldown&.default_days).positive?
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.326.0
+  version: 0.326.1
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.326.0
+        version: 0.326.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.326.0
+        version: 0.326.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +262,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.326.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.326.1
 rdoc_options: []
 require_paths:
 - lib