dependabot-terraform 0.148.5 → 0.148.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ec608a474ca6e97494d0e18ec3c0b6463d5b95793519eee2bcd624f1ad252dd
-  data.tar.gz: a8aed805dc5f16adbe6323785293fe0e3e3e7e5a4017f3cd0e41d76c2a406ede
+  metadata.gz: 6ed478756c01d88049afd53fc85a20ad7ed9063791ab30058d0f917e26dc47e5
+  data.tar.gz: 72510b0297858ce6b4d417542100a6697d546a4e0e4d0d405e55a1e51796fb43
 SHA512:
-  metadata.gz: fc4a3cd31273d65e463f0adf47fdea2f01e4af563e14a94466e8bff87f16fd1ca384bae8aefcaf5f709e12295ba3e613f90323a5f847491bab794aeb58d9370d
-  data.tar.gz: 386f1c035c64e6e1680b1b8c6e7adde3805b11ae8aa6b07b822b21d3ff982b21cdbccf52e33571e368297aa848be5e051935703756f53bf5e652143a1de2b3de
+  metadata.gz: 8c2c0a8a731d1ff0baf8ce05af819e819702be48302173d12e6973b84af8e304fe75cdb323198f28d4a20358c836a8edb699659bf5db3232944334cd76f7e735
+  data.tar.gz: 4a651ed95e4d097100595c457146faba5e097ea12b1f7ebecbd38156bd55c7f51ec07fdb84c0a07ff8defdcd4546c92376571ffc5b3e322bfd68402e33ddeec0

data/lib/dependabot/terraform/file_parser.rb

@@ -20,6 +20,10 @@ module Dependabot
       include FileSelector
 
       ARCHIVE_EXTENSIONS = %w(.zip .tbz2 .tgz .txz).freeze
+      DEFAULT_REGISTRY = "registry.terraform.io"
+      DEFAULT_NAMESPACE = "hashicorp"
+      # https://www.terraform.io/docs/language/providers/requirements.html#source-addresses
+      PROVIDER_SOURCE_ADDRESS = %r{\A((?<hostname>.+)/)?(?<namespace>.+)/(?<name>.+)\z}.freeze
 
       def parse
         dependency_set = DependencySet.new
@@ -27,14 +31,14 @@ module Dependabot
         terraform_files.each do |file|
           modules = parsed_file(file).fetch("module", {})
           modules.each do |name, details|
-            dependency_set << build_terraform_dependency(file, name, details, false)
+            dependency_set << build_terraform_dependency(file, name, details)
           end
 
           parsed_file(file).fetch("terraform", []).each do |terraform|
             required_providers = terraform.fetch("required_providers", {})
             required_providers.each do |provider|
               provider.each do |name, details|
-                dependency_set << build_terraform_dependency(file, name, details, true)
+                dependency_set << build_provider_dependency(file, name, details)
               end
             end
           end
@@ -54,10 +58,10 @@ module Dependabot
 
       private
 
-      def build_terraform_dependency(file, name, details, provider)
-        details = details.is_a?(Array) ? details.first : details
+      def build_terraform_dependency(file, name, details)
+        details = details.first
 
-        source = source_from(details, provider)
+        source = source_from(details)
         dep_name = case source[:type]
                    when "registry" then source[:module_identifier]
                    when "provider" then details["source"]
@@ -82,8 +86,31 @@ module Dependabot
         )
       end
 
+      def build_provider_dependency(file, name, details = {})
+        source_address = details.fetch("source", nil)
+        version_req = details["version"]&.strip
+        hostname, namespace, name = provider_source_from(source_address, name)
+        dependency_name = source_address ? "#{namespace}/#{name}" : name
+
+        Dependency.new(
+          name: dependency_name,
+          version: determine_version_for(hostname, namespace, name, version_req),
+          package_manager: "terraform",
+          requirements: [
+            requirement: version_req,
+            groups: [],
+            file: file.name,
+            source: {
+              type: "provider",
+              registry_hostname: hostname,
+              module_identifier: "#{namespace}/#{name}"
+            }
+          ]
+        )
+      end
+
       def build_terragrunt_dependency(file, details)
-        source = source_from(details, false)
+        source = source_from(details)
         dep_name =
           if Source.from_url(source[:url])
             Source.from_url(source[:url]).repo
@@ -107,7 +134,7 @@ module Dependabot
       end
 
       # Full docs at https://www.terraform.io/docs/modules/sources.html
-      def source_from(details_hash, provider)
+      def source_from(details_hash)
         raw_source = details_hash.fetch("source")
         bare_source = get_proxied_source(raw_source)
 
@@ -118,23 +145,28 @@ module Dependabot
           when :github, :bitbucket, :git
             git_source_details_from(bare_source)
           when :registry
-            registry_source_details_from(bare_source, provider)
+            registry_source_details_from(bare_source)
           end
 
         source_details[:proxy_url] = raw_source if raw_source != bare_source
         source_details
       end
 
-      def registry_source_details_from(source_string, provider)
+      def provider_source_from(source_address, name)
+        return [DEFAULT_REGISTRY, DEFAULT_NAMESPACE, name] unless source_address
+
+        matches = source_address.match(PROVIDER_SOURCE_ADDRESS)
+        [
+          matches[:hostname] || DEFAULT_REGISTRY,
+          matches[:namespace],
+          matches[:name] || name
+        ]
+      end
+
+      def registry_source_details_from(source_string)
         parts = source_string.split("//").first.split("/")
 
-        if provider && parts.count == 2
-          {
-            "type": "provider",
-            "registry_hostname": "registry.terraform.io",
-            "module_identifier": source_string
-          }
-        elsif parts.count == 3
+        if parts.count == 3
           {
             type: "registry",
             registry_hostname: "registry.terraform.io",
@@ -300,6 +332,23 @@ module Dependabot
 
         raise "No Terraform configuration file!"
       end
+
+      def determine_version_for(hostname, namespace, name, constraint)
+        return constraint if constraint&.match?(/\A\d/)
+
+        lock_file_content.
+          dig("provider", "#{hostname}/#{namespace}/#{name}", 0, "version")
+      end
+
+      def lock_file_content
+        @lock_file_content ||=
+          begin
+            lock_file = dependency_files.find do |file|
+              file.name == ".terraform.lock.hcl"
+            end
+            lock_file ? parsed_file(lock_file) : {}
+          end
+      end
     end
   end
 end

data/lib/dependabot/terraform/file_updater.rb

@@ -98,9 +98,9 @@ module Dependabot
       end
 
       def provider_declaration_regex
+        name = Regexp.escape(dependency.name)
         /
-          (?:required_providers\s\{)*
-          (source\s*=\s*["']#{Regexp.escape(dependency.name)}["']
+          ((source\s*=\s*["']#{name}["']|\s*#{name}\s*=\s*\{.*)
           (?:(?!^\}).)+)
         /mx
       end

metadata

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