dependabot-terraform 0.148.1 → 0.148.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7deaa50339570bf2aa6a092465692a047db22f62342284d484c9bd447130e8d7
-  data.tar.gz: bc1e4776ea8c45cb9e4967456c23372a5ba4c02fb467e46171b2d87a3d77b026
+  metadata.gz: ae4366dea7cdc8902be7fc60c702dd4880f3eb061779da6b0dafee4ec81b0a30
+  data.tar.gz: 27006c4842926165444aba49096aae361c6dd8b84639546cb0fb800f9ac51f18
 SHA512:
-  metadata.gz: 47b0dee55cc993cf107e74577df8ae26c75050defe0d564fef43718e5c335ac63819848455db69994ae1a0becd9061a02cb5f40a4c38555e4d9a4a887161589d
-  data.tar.gz: f5e38dccd33ba13e417cb6a3dc6dd1ae4c3bb316d4ab95fa72c86eb5b9873729d433ea8f08550ceb38ddd4d1e240d8f1df0be85b6ed22366f59ff9f3c92b7f7b
+  metadata.gz: bf9ec46421f129b6c566bb489f0c0da2f6a95cb760f429f2f03e6be456356746bc538e17fce65f12b3da331451b7346600744888d36d0919e0a1b43a65d74d7c
+  data.tar.gz: 7a4c1512faf5c2f2be193fd71bacffbf598cd87418c8c9f00d8ae6b39b226f04782ae46c5a06dabcc7941f67b6dcba302247de9e59e52370df95f3edb3a0a938

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.1
+  version: 0.148.6
 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.1
+        version: 0.148.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.148.1
+        version: 0.148.6
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement