dependabot-terraform 0.383.0 → 0.385.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 821a870b44c7716208503cbd6542fa40a25c1d6641d3105c44e635e2b2908553
-  data.tar.gz: f8c88524fdabd49c84d1a3c16eae2c050b5fef3059407585cb33599141a78649
+  metadata.gz: 6d1ca89854c82fa7e3fb30f29c0c54a1349a2a1d0ba8141b74af54e5a24b9a64
+  data.tar.gz: c1f468d483d4802f42417df0fc195cb7ffbfd91397eca765ea0cb9b8d266e64f
 SHA512:
-  metadata.gz: 6f27a93b9ac6294a5274a46040ddd285d43760464c5a6ec5b46738aa9f253141d688cfe5985b488ccd45b9afeb0587c78e9f92e99cc96ae925241f43a9c095ca
-  data.tar.gz: 42467a0cf19ae7361ad92b4c0a8dcf475bbfa0ae888b826d74729bd7eb837d1d12f720bc8f6d132809d91f279fb962b23b003293695779d3405e05a326c08912
+  metadata.gz: ebf5726c0729bef200b83243308b3eb3c17856148f529a919b8bc6cc62f0fe7cbc230aff1575d779b5525ff901b7ef5c4a5c7ba6e4edd68782a67d89d5b5cf79
+  data.tar.gz: d6853847fb38d9066171837d9bda41ea79d2a2db6df5488febc30653f98677c49d57e441bbbc9cca730969693fb6539bacd85ed8d35215e6f86b7eaa2070a1ea

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

@@ -3,7 +3,6 @@
 
 require "json"
 require "time"
-require "cgi"
 require "excon"
 require "sorbet-runtime"
 require "dependabot/swift"

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.rb

@@ -109,13 +109,25 @@ module Dependabot
       def registry_client
         @registry_client ||= T.let(
           begin
-            hostname = dependency_source_details&.fetch(:registry_hostname)
+            hostname = registry_hostname
             RegistryClient.new(hostname: hostname, credentials: credentials)
           end,
           T.nilable(Dependabot::Terraform::RegistryClient)
         )
       end
 
+      sig { returns(String) }
+      def registry_hostname
+        hostname = dependency_source_details&.fetch(:registry_hostname) || RegistryClient::PUBLIC_HOSTNAME
+        return hostname unless hostname == RegistryClient::PUBLIC_HOSTNAME
+
+        base_registry = credentials.find do |cred|
+          cred.fetch("type", nil) == "terraform_registry" && cred.replaces_base?
+        end
+
+        base_registry&.[]("host") || hostname
+      end
+
       sig { returns(T.nilable(Dependabot::Terraform::Version)) }
       def latest_version_for_provider_dependency
         return unless provider_dependency?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.383.0
+  version: 0.385.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.383.0
+        version: 0.385.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.383.0
+        version: 0.385.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.383.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.385.0
 rdoc_options: []
 require_paths:
 - lib
@@ -278,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.0
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Provides Dependabot support for Terraform
 test_files: []