dependabot-terraform 0.384.0 → 0.386.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 944f7903f964d04884411a22df62c6c43cecc59ca7aee25aec5b485233508673
-  data.tar.gz: 04b289cdec33e181389f2bab015916dcf3013c0c2dbdf47c1b85efbd27bbe8a2
+  metadata.gz: a2db17b06544fab18770f449bd5dfc6868569050c79af1aa5e475a1ea806777f
+  data.tar.gz: 8513583d339fcdf8835510fb77d44543f20435c95c60f3591a7b37bedb80639c
 SHA512:
-  metadata.gz: 47b7fa7b5351cfdd55c7e24914d2fb490c327f39a7c45b53ef55c4d1c4b4fdbd0457a9cb6aa6c2d71134e1c7c74afc4788afe255644e62ce632b703b8ef648a9
-  data.tar.gz: d7ee6f7793d2955387e4a6df20be291acdf4c8ef5fdf9ef79d9f100934fba8d1adea8079890af1c4e0820caea0dbae36d253ce42b0770310312f36ee9b6a1a8c
+  metadata.gz: f68f3accb451bfd3e1364a314a2928b652f973ce908a74a8aa2675d0e6a40f87907d97de4db935f1703262622c104702d5d66529abb7b91c943cabde2f99e8aa
+  data.tar.gz: 27dc678b5075b3a4914e24cf99cfd4f401a3b73db283979eaafff83b22120d82dfa5fef1acbcf85876cb0b4727c52982d110a7e2c7c0ab580bb538e5bc0e145e

data/lib/dependabot/terraform/package/package_details_fetcher.rb

@@ -13,7 +13,6 @@ module Dependabot
       class PackageDetailsFetcher
         extend T::Sig
 
-        RELEASES_URL_GIT = "https://api.github.com/repos/"
         RELEASE_URL_FOR_PROVIDER = "https://registry.terraform.io/v2/providers/"
         RELEASE_URL_FOR_MODULE = "https://registry.terraform.io/v2/modules/"
         APPLICATION_JSON = "JSON"
@@ -46,34 +45,6 @@ module Dependabot
         sig { returns(T::Array[Dependabot::Credential]) }
         attr_reader :credentials
 
-        sig { returns(T::Array[GitTagWithDetail]) }
-        def fetch_tag_and_release_date
-          truncate_github_url = @dependency.name.gsub("github.com/", "")
-          url = RELEASES_URL_GIT + "#{truncate_github_url}/releases"
-          result_lines = T.let([], T::Array[GitTagWithDetail])
-          # Fetch the releases from the GitHub API
-          response = Excon.get(url, headers: { "Accept" => "application/vnd.github.v3+json" })
-          Dependabot.logger.error("Failed call details: #{response.body}") unless response.status == 200
-          return result_lines unless response.status == 200
-
-          # Parse the JSON response
-          releases = JSON.parse(response.body)
-
-          # Extract version names and release dates into a hash
-          releases.map do |release|
-            result_lines << GitTagWithDetail.new(
-              tag: release["tag_name"],
-              release_date: release["published_at"]
-            )
-          end
-
-          # sort the result lines by tag in descending order
-          result_lines = result_lines.sort_by(&:tag).reverse
-          # Log the extracted details for debugging
-          Dependabot.logger.info("Extracted release details: #{result_lines}")
-          result_lines
-        end
-
         sig { returns(T::Array[GitTagWithDetail]) }
         def fetch_tag_and_release_date_from_provider # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity
           return [] unless dependency_source_details

data/lib/dependabot/terraform/registry_client.rb

@@ -127,7 +127,7 @@ module Dependabot
           return nil unless response.status == 204
 
           source_url = response.headers.fetch("X-Terraform-Get")
-          source_url = URI.join(download_url, source_url) if
+          source_url = URI.join(download_url, source_url).to_s if
             source_url.start_with?("/", "./", "../")
           source_url = RegistryClient.get_proxied_source(source_url) if source_url
         when "provider", "providers"

data/lib/dependabot/terraform/requirements_updater.rb

@@ -98,7 +98,7 @@ module Dependabot
       sig { returns(T::Array[Dependabot::DependencyRequirement]) }
       attr_reader :requirements
 
-      sig { returns(Dependabot::Terraform::Version) }
+      sig { returns(T.nilable(Dependabot::Terraform::Version)) }
       attr_reader :latest_version
 
       sig { returns(T.nilable(String)) }
@@ -116,12 +116,15 @@ module Dependabot
       def update_registry_requirement(req)
         return req if req.fetch(:requirement).nil?
 
+        latest = latest_version
+        return req if latest.nil?
+
         string_req = req.fetch(:requirement).strip
         ruby_req = requirement_class.new(string_req)
-        return req if ruby_req.satisfied_by?(latest_version)
+        return req if ruby_req.satisfied_by?(latest)
 
         new_req =
-          if ruby_req.exact? then latest_version.to_s
+          if ruby_req.exact? then latest.to_s
           elsif string_req.start_with?("~>")
             update_twiddle_version(string_req).to_s
           else
@@ -136,18 +139,19 @@ module Dependabot
       def update_twiddle_version(req_string)
         old_version = requirement_class.new(req_string)
                                        .requirements.first.last
-        updated_version = at_same_precision(latest_version, old_version)
+        updated_version = at_same_precision(T.must(latest_version), old_version)
         req_string.sub(old_version.to_s, updated_version)
       end
 
       sig { params(req_string: String).returns(T::Array[Dependabot::Terraform::Requirement]) }
       def update_range(req_string)
+        latest = T.must(latest_version)
         requirement_class.new(req_string).requirements.flat_map do |r|
           ruby_req = requirement_class.new(r.join(" "))
-          next ruby_req if ruby_req.satisfied_by?(latest_version)
+          next ruby_req if ruby_req.satisfied_by?(latest)
 
           case op = ruby_req.requirements.first.first
-          when "<", "<=" then [update_greatest_version(ruby_req, latest_version)]
+          when "<", "<=" then [update_greatest_version(ruby_req, latest)]
           when "!=" then []
           else raise "Unexpected operation for unsatisfied req: #{op}"
           end

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

@@ -35,34 +35,6 @@ module Dependabot
         sig { returns(Dependabot::Dependency) }
         attr_reader :dependency
 
-        # Return latest version tag for the dependency, it removes tags that are in cooldown period
-        # and returns the latest version tag that is not in cooldown period. If exception occurs
-        # it will return the latest version tag from the git_commit_checker. as it was before
-        sig { returns(T.nilable(T::Hash[Symbol, T.untyped])) }
-        def latest_version_tag
-          # step one fetch allowed version tags and
-          allowed_version_tags = git_commit_checker.allowed_version_tags
-          begin
-            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:
-              #{allowed_version_tags.map(&:name).join(', ')}"
-            )
-            git_commit_checker.max_local_tag(allowed_version_tags)
-          rescue StandardError => e
-            Dependabot.logger.error("Error fetching latest version tag: #{e.message}")
-            git_commit_checker.local_tag_for_latest_version
-          end
-        end
-
         # To filter versions in cooldown period based on version tags from registry call
         sig do
           params(versions: T::Array[Dependabot::Terraform::Version])
@@ -115,21 +87,6 @@ module Dependabot
           versions
         end
 
-        sig { returns(T.nilable(T::Array[String])) }
-        def select_version_tags_in_cooldown_period
-          version_tags_in_cooldown_period = T.let([], T::Array[String])
-
-          package_details_fetcher.fetch_tag_and_release_date.each do |git_tag_with_detail|
-            if check_if_version_in_cooldown_period?(T.must(git_tag_with_detail.release_date))
-              version_tags_in_cooldown_period << git_tag_with_detail.tag
-            end
-          end
-          version_tags_in_cooldown_period
-        rescue StandardError => e
-          Dependabot.logger.error("Error checking if version is in cooldown: #{e.message}")
-          version_tags_in_cooldown_period
-        end
-
         sig { params(release_date: String).returns(T::Boolean) }
         def check_if_version_in_cooldown_period?(release_date)
           return false unless release_date.length.positive?
@@ -195,17 +152,6 @@ module Dependabot
           )
         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 @cooldown_options.nil?
-
-          @cooldown_options.default_days.positive?
-        end
-
         sig { returns(Dependabot::GitCommitChecker) }
         attr_reader :git_commit_checker
 

data/lib/dependabot/terraform/update_checker.rb

@@ -172,31 +172,26 @@ module Dependabot
 
         # If the dependency is pinned to a tag that looks like a version then
         # we want to update that tag. Because we don't have a lockfile, the
-        # latest version is the tag itself.
-        if git_commit_checker.pinned_ref_looks_like_version?
-          # Filter version tags that are in cooldown period
-          latest_tag =  latest_version_resolver.latest_version_tag&.fetch(:tag)
-          version_rgx = GitCommitChecker::VERSION_REGEX
-          return unless latest_tag.match(version_rgx)
-
-          version = latest_tag.match(version_rgx)
-                              .named_captures.fetch("version")
-          return version_class.new(version)
-        end
+        # latest version is the tag itself. Tags within their cooldown window
+        # are filtered out by the shared GitCommitChecker.
+        latest_tag = git_commit_checker.local_tag_for_pinned_version_ref(update_cooldown)&.fetch(:tag)
+        return unless latest_tag
 
-        # If the dependency is pinned to a tag that doesn't look like a
-        # version then there's nothing we can do.
-        nil
+        version_rgx = GitCommitChecker::VERSION_REGEX
+        return unless latest_tag.match(version_rgx)
+
+        version = latest_tag.match(version_rgx)
+                            .named_captures.fetch("version")
+        version_class.new(version)
       end
 
       sig { returns(T.nilable(String)) }
       def tag_for_latest_version
         return unless git_commit_checker.git_dependency?
-        return unless git_commit_checker.pinned?
-        return unless git_commit_checker.pinned_ref_looks_like_version?
 
-        latest_tag = git_commit_checker.local_tag_for_latest_version
+        latest_tag = git_commit_checker.local_tag_for_pinned_version_ref(update_cooldown)
                                        &.fetch(:tag)
+        return unless latest_tag
 
         version_rgx = GitCommitChecker::VERSION_REGEX
         return unless latest_tag.match(version_rgx)

metadata

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