dependabot-terraform 0.148.9 → 0.149.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7ec549a6b6283f3ab90166318138d130e95ee433a8b17ec48157c376b322bfe
-  data.tar.gz: fe1e3b9b7e348e614c5da531da53ef226b4be07db71a0744e382a5d863cbbad5
+  metadata.gz: c3d1b1f161ca1de8f1f6f728cc4d28f700ea12f4407870609729fd235ad029d5
+  data.tar.gz: 2ca0a7c87535de7b22604571e9e48a1e2e51e2027a4becab2ae65a73e29603a0
 SHA512:
-  metadata.gz: 11878a5dff8b23bf22568e1dc44734578175012b41eff9b5d0d7e8e774e1040d1720150d135e570f0814234d3c663bd04ed79c0339a5188ab8cc19729167e8f9
-  data.tar.gz: ac36440f83d0e54ee77e7aab101790bd58cce625dd8bbe4bbad4a2a90f599cc9356a452b63ecc6784c938619afc87f7c97ec33a3e07a3d136ea6c0dd59703634
+  metadata.gz: c26e03c55858649e5ae2f9f7d881b7ce5ff6ee23e8bf9f66892641273cad9558af0493c45f37a9f63d74d92d50036ab6345e3bc6e5b8474d8d3257b175f73e15
+  data.tar.gz: 359f7ac0b27e267b395352b390379713db6caa45067a452c674318e678884fab25227693dc22153a2a867747f4b7d5e00fa94d32237f6e11b2dd90e8c3088a59

data/lib/dependabot/terraform/metadata_finder.rb

@@ -4,6 +4,7 @@ require "excon"
 require "json"
 require "dependabot/metadata_finders"
 require "dependabot/metadata_finders/base"
+require "dependabot/terraform/registry_client"
 require "dependabot/shared_helpers"
 
 module Dependabot
@@ -40,7 +41,9 @@ module Dependabot
         info = dependency.requirements.map { |r| r[:source] }.compact.first
         hostname = info[:registry_hostname] || info["registry_hostname"]
 
-        RegistryClient.new(hostname: hostname).source(dependency: dependency)
+        RegistryClient.
+          new(hostname: hostname, credentials: credentials).
+          source(dependency: dependency)
       end
     end
   end

data/lib/dependabot/terraform/registry_client.rb

@@ -11,8 +11,11 @@ module Dependabot
     class RegistryClient
       PUBLIC_HOSTNAME = "registry.terraform.io"
 
-      def initialize(hostname:)
+      def initialize(hostname: PUBLIC_HOSTNAME, credentials: [])
         @hostname = hostname
+        @tokens = credentials.each_with_object({}) do |item, memo|
+          memo[item["host"]] = item["token"] if item["type"] == "terraform_registry"
+        end
       end
 
       # Fetch all the versions of a provider, and return a Version
@@ -23,9 +26,6 @@ module Dependabot
       # @return [Array<Dependabot::Terraform::Version>]
       # @raise [RuntimeError] when the versions cannot be retrieved
       def all_provider_versions(identifier:)
-        # TODO: Implement service discovery for custom registries
-        return [] unless hostname == PUBLIC_HOSTNAME
-
         response = get(endpoint: "providers/#{identifier}/versions")
 
         JSON.parse(response).
@@ -41,9 +41,6 @@ module Dependabot
       # @return [Array<Dependabot::Terraform::Version>]
       # @raise [RuntimeError] when the versions cannot be retrieved
       def all_module_versions(identifier:)
-        # TODO: Implement service discovery for custom registries
-        return [] unless hostname == PUBLIC_HOSTNAME
-
         response = get(endpoint: "modules/#{identifier}/versions")
 
         JSON.parse(response).
@@ -61,9 +58,6 @@ module Dependabot
       # @return Dependabot::Source
       # @raise [RuntimeError] when the source cannot be retrieved
       def source(dependency:)
-        # TODO: Implement service discovery for custom registries
-        return unless hostname == PUBLIC_HOSTNAME
-
         type = dependency.requirements.first[:source][:type]
         endpoint = if type == "registry"
                      "modules/#{dependency.name}/#{dependency.version}"
@@ -80,7 +74,7 @@ module Dependabot
 
       private
 
-      attr_reader :hostname
+      attr_reader :hostname, :tokens
 
       def get(endpoint:)
         url = "https://#{hostname}/v1/#{endpoint}"
@@ -88,7 +82,7 @@ module Dependabot
         response = Excon.get(
           url,
           idempotent: true,
-          **SharedHelpers.excon_defaults
+          **SharedHelpers.excon_defaults(headers: headers_for(hostname))
         )
 
         raise "Response from registry was #{response.status}" unless response.status == 200
@@ -99,6 +93,11 @@ module Dependabot
       def version_class
         Version
       end
+
+      def headers_for(hostname)
+        token = tokens[hostname]
+        token ? { "Authorization" => "Bearer #{token}" } : {}
+      end
     end
   end
 end

data/lib/dependabot/terraform/update_checker.rb

@@ -87,7 +87,7 @@ module Dependabot
       def registry_client
         @registry_client ||= begin
           hostname = dependency_source_details.fetch(:registry_hostname)
-          RegistryClient.new(hostname: hostname)
+          RegistryClient.new(hostname: hostname, credentials: credentials)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.148.9
+  version: 0.149.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-05-28 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.148.9
+        version: 0.149.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.148.9
+        version: 0.149.3
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement