dependabot-terraform 0.149.3 → 0.149.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3d1b1f161ca1de8f1f6f728cc4d28f700ea12f4407870609729fd235ad029d5
-  data.tar.gz: 2ca0a7c87535de7b22604571e9e48a1e2e51e2027a4becab2ae65a73e29603a0
+  metadata.gz: e9de51bfa366e94b80943405b7083988d76080444dc177b57d9a8fd425e9292f
+  data.tar.gz: 1d4794c8175cac535813c12a8e017e3b8e3c4f96068a91e5db3c75db5945ceba
 SHA512:
-  metadata.gz: c26e03c55858649e5ae2f9f7d881b7ce5ff6ee23e8bf9f66892641273cad9558af0493c45f37a9f63d74d92d50036ab6345e3bc6e5b8474d8d3257b175f73e15
-  data.tar.gz: 359f7ac0b27e267b395352b390379713db6caa45067a452c674318e678884fab25227693dc22153a2a867747f4b7d5e00fa94d32237f6e11b2dd90e8c3088a59
+  metadata.gz: 74431e13c158375f439e50127078fd7db31b56387cf3a2ff5d013ebff91427642c2b67874dd94a22e83d336f58efddcb6ec9edeb4181d7cadc25fe759fe12fcc
+  data.tar.gz: 384487d5ad087fee58324485f1c288ae7803f550e6b763128efadc883999931dd233182f56afc8c26ec2030d20179b234d32b0c96b535722c72fedf4cfa0e49e

data/lib/dependabot/terraform/file_updater.rb

@@ -99,19 +99,19 @@ module Dependabot
 
       def provider_declaration_regex
         name = Regexp.escape(dependency.name)
-        /
-          ((source\s*=\s*["']#{name}["']|\s*#{name}\s*=\s*\{.*)
+        %r{
+          ((source\s*=\s*["'](#{Regexp.escape(registry_host_for(dependency))}/)?#{name}["']|\s*#{name}\s*=\s*\{.*)
           (?:(?!^\}).)+)
-        /mx
+        }mx
       end
 
       def registry_declaration_regex
-        /
+        %r{
           (?<=\{)
           (?:(?!^\}).)*
-          source\s*=\s*["']#{Regexp.escape(dependency.name)}["']
+          source\s*=\s*["'](#{Regexp.escape(registry_host_for(dependency))}/)?#{Regexp.escape(dependency.name)}["']
           (?:(?!^\}).)*
-        /mx
+        }mx
       end
 
       def git_declaration_regex(filename)
@@ -126,6 +126,11 @@ module Dependabot
           (?:(?!^\}).)*
         /mx
       end
+
+      def registry_host_for(dependency)
+        source = dependency.requirements.map { |r| r[:source] }.compact.first
+        source[:registry_hostname] || source["registry_hostname"] || "registry.terraform.io"
+      end
     end
   end
 end

data/lib/dependabot/terraform/registry_client.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "dependabot/dependency"
+require "dependabot/errors"
 require "dependabot/source"
 require "dependabot/terraform/version"
 
@@ -24,11 +25,12 @@ module Dependabot
       # @param identifier [String] the identifier for the dependency, i.e:
       # "hashicorp/aws"
       # @return [Array<Dependabot::Terraform::Version>]
-      # @raise [RuntimeError] when the versions cannot be retrieved
+      # @raise [Dependabot::DependabotError] when the versions cannot be retrieved
       def all_provider_versions(identifier:)
-        response = get(endpoint: "providers/#{identifier}/versions")
+        base_url = service_url_for("providers.v1")
+        response = http_get!(URI.join(base_url, "#{identifier}/versions"))
 
-        JSON.parse(response).
+        JSON.parse(response.body).
           fetch("versions").
           map { |release| version_class.new(release.fetch("version")) }
       end
@@ -39,11 +41,12 @@ module Dependabot
       # @param identifier [String] the identifier for the dependency, i.e:
       # "hashicorp/consul/aws"
       # @return [Array<Dependabot::Terraform::Version>]
-      # @raise [RuntimeError] when the versions cannot be retrieved
+      # @raise [Dependabot::DependabotError] when the versions cannot be retrieved
       def all_module_versions(identifier:)
-        response = get(endpoint: "modules/#{identifier}/versions")
+        base_url = service_url_for("modules.v1")
+        response = http_get!(URI.join(base_url, "#{identifier}/versions"))
 
-        JSON.parse(response).
+        JSON.parse(response.body).
           fetch("modules").first.fetch("versions").
           map { |release| version_class.new(release.fetch("version")) }
       end
@@ -56,40 +59,33 @@ module Dependabot
       # @param dependency [Dependabot::Dependency] the dependency who's source
       # we're attempting to find
       # @return Dependabot::Source
-      # @raise [RuntimeError] when the source cannot be retrieved
+      # @raise [Dependabot::DependabotError] when the source cannot be retrieved
       def source(dependency:)
         type = dependency.requirements.first[:source][:type]
-        endpoint = if type == "registry"
-                     "modules/#{dependency.name}/#{dependency.version}"
-                   elsif type == "provider"
-                     "providers/#{dependency.name}/#{dependency.version}"
-                   else
-                     raise "Invalid source type"
-                   end
-        response = get(endpoint: endpoint)
-
-        source_url = JSON.parse(response).fetch("source")
+        base_url = service_url_for(service_key_for(type))
+        response = http_get!(URI.join(base_url, "#{dependency.name}/#{dependency.version}"))
+
+        source_url = JSON.parse(response.body).fetch("source")
         Source.from_url(source_url) if source_url
       end
 
+      # Perform service discovery and return the absolute URL for
+      # the requested service.
+      # https://www.terraform.io/docs/internals/remote-service-discovery.html
+      #
+      # @param service_key [String] the service type described in https://www.terraform.io/docs/internals/remote-service-discovery.html#supported-services
+      # @param return String
+      # @raise [Dependabot::DependabotError] when the service is not available
+      def service_url_for(service_key)
+        url_for(services.fetch(service_key))
+      rescue KeyError
+        raise error("Host does not support required Terraform-native service")
+      end
+
       private
 
       attr_reader :hostname, :tokens
 
-      def get(endpoint:)
-        url = "https://#{hostname}/v1/#{endpoint}"
-
-        response = Excon.get(
-          url,
-          idempotent: true,
-          **SharedHelpers.excon_defaults(headers: headers_for(hostname))
-        )
-
-        raise "Response from registry was #{response.status}" unless response.status == 200
-
-        response.body
-      end
-
       def version_class
         Version
       end
@@ -98,6 +94,51 @@ module Dependabot
         token = tokens[hostname]
         token ? { "Authorization" => "Bearer #{token}" } : {}
       end
+
+      def services
+        @services ||=
+          begin
+            response = http_get(url_for("/.well-known/terraform.json"))
+            response.status == 200 ? JSON.parse(response.body) : {}
+          end
+      end
+
+      def service_key_for(type)
+        case type
+        when "module", "modules", "registry"
+          "modules.v1"
+        when "provider", "providers"
+          "providers.v1"
+        else
+          raise error("Invalid source type")
+        end
+      end
+
+      def http_get(url)
+        Excon.get(url.to_s, idempotent: true, **SharedHelpers.excon_defaults(headers: headers_for(hostname)))
+      end
+
+      def http_get!(url)
+        response = http_get(url)
+
+        raise error("Response from registry was #{response.status}") unless response.status == 200
+
+        response
+      end
+
+      def url_for(path)
+        uri = URI.parse(path)
+        return uri.to_s if uri.scheme == "https"
+        raise error("Unsupported scheme provided") if uri.host && uri.scheme
+
+        uri.host = hostname
+        uri.scheme = "https"
+        uri.to_s
+      end
+
+      def error(message)
+        Dependabot::DependabotError.new(message)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.149.3
+  version: 0.149.4
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.149.3
+        version: 0.149.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.149.3
+        version: 0.149.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement