dependabot-terraform 0.148.0 → 0.148.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d7706b0b1a4caf093c24a35a6c49398abfa8c96b6ad18dc7db44bab894c7581
-  data.tar.gz: f482a7a71f487f0815ff464b189edab66c0a77e3d4ffdd1b5a5080e17680de27
+  metadata.gz: 5ec608a474ca6e97494d0e18ec3c0b6463d5b95793519eee2bcd624f1ad252dd
+  data.tar.gz: a8aed805dc5f16adbe6323785293fe0e3e3e7e5a4017f3cd0e41d76c2a406ede
 SHA512:
-  metadata.gz: bc1983b4f79f865bac2a1f12f379c96f649b7b4056d67c96a6a3d6d2ad0a27e653b216baad1f85aba931bd8c1510a01e4913e32307b91a4311b2160c60e80f44
-  data.tar.gz: d7b18e3cb48784d3fe22c305b6f609d75a7c553d3191305c3b30d2cecd45274a85b615f9513867f08a9d9ff07ae8b248dab1a8198a3c724b159c58016c0126f4
+  metadata.gz: fc4a3cd31273d65e463f0adf47fdea2f01e4af563e14a94466e8bff87f16fd1ca384bae8aefcaf5f709e12295ba3e613f90323a5f847491bab794aeb58d9370d
+  data.tar.gz: 386f1c035c64e6e1680b1b8c6e7adde3805b11ae8aa6b07b822b21d3ff982b21cdbccf52e33571e368297aa848be5e051935703756f53bf5e652143a1de2b3de

data/lib/dependabot/terraform/file_updater.rb

@@ -73,8 +73,9 @@ module Dependabot
       end
 
       def update_registry_declaration(new_req, old_req, updated_content)
-        updated_content.sub!(registry_declaration_regex) do |regex_match|
-          regex_match.sub(/version\s*=.*/) do |req_line_match|
+        regex = new_req[:source][:type] == "provider" ? provider_declaration_regex : registry_declaration_regex
+        updated_content.sub!(regex) do |regex_match|
+          regex_match.sub(/^\s*version\s*=.*/) do |req_line_match|
             req_line_match.sub(old_req[:requirement], new_req[:requirement])
           end
         end
@@ -96,6 +97,14 @@ module Dependabot
         raise "No Terraform configuration file!"
       end
 
+      def provider_declaration_regex
+        /
+          (?:required_providers\s\{)*
+          (source\s*=\s*["']#{Regexp.escape(dependency.name)}["']
+          (?:(?!^\}).)+)
+        /mx
+      end
+
       def registry_declaration_regex
         /
           (?<=\{)

data/lib/dependabot/terraform/metadata_finder.rb

@@ -14,8 +14,7 @@ module Dependabot
       def look_up_source
         case new_source_type
         when "git" then find_source_from_git_url
-        when "registry" then find_source_from_registry_details
-        when "provider" then find_source_from_provider_details
+        when "registry", "provider" then find_source_from_registry_details
         else raise "Unexpected source type: #{new_source_type}"
         end
       end

data/lib/dependabot/terraform/registry_client.rb

@@ -64,9 +64,10 @@ module Dependabot
         # TODO: Implement service discovery for custom registries
         return unless hostname == PUBLIC_HOSTNAME
 
-        endpoint = if dependency.requirements.first[:source][:type] == "registry"
+        type = dependency.requirements.first[:source][:type]
+        endpoint = if type == "registry"
                      "modules/#{dependency.name}/#{dependency.version}"
-                   elsif dependency.source[:type] == "provider"
+                   elsif type == "provider"
                      "providers/#{dependency.name}/#{dependency.version}"
                    else
                      raise "Invalid source type"

metadata

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