dependabot-terraform 0.156.6 → 0.156.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b37eaae81190a664f0e7af35f070f93e5d0810e2c9c7d13958090f028fc597f
-  data.tar.gz: af3d57dada676dfe764ee1b0d28a3b9a6b12d3dda7f7f3fa3715e866cb43d171
+  metadata.gz: 29709fe452803fd6ba8cb782eb7901c2b37e616fbec87334e1c84b3008984965
+  data.tar.gz: cad10085fa2305efb26971dc99c06a695a1bbd664fe2b4b7123507ea08e5a685
 SHA512:
-  metadata.gz: 496cc972d76591ea6ee2a2347d2c23f46cce2d7ce9695a11f2366ade1a6ee0f0a777937e507e53645c0c5698d64c17dee59b4d53a5df00f2f50d520623b1f938
-  data.tar.gz: 935d31830365f5f6080fa36a977a2294c09cadf5bffc5e6ab1d8c82deda449f91815405304b076ccd4ee2fceb5df412ca6b882c12ba9a8edb4b74887c6105884
+  metadata.gz: 6046798f76bd52a8eca3b93ae1534489ac541224afe36a3eb721c011609cd42489fe0857599ab9fe5699ae876939ce73182c10f6114ca26382defb71ac699c00
+  data.tar.gz: 5a3cf0547aa1ae16095e94e58e4b90f8cd438ba7e95aca47f18f6f0db34cac472573cc47d1a38d02c09b6652d3027013603b9fca6b9f7b34be9510298fa4a427

data/lib/dependabot/terraform/file_fetcher.rb

@@ -9,6 +9,9 @@ module Dependabot
     class FileFetcher < Dependabot::FileFetchers::Base
       include FileSelector
 
+      # https://www.terraform.io/docs/language/modules/sources.html#local-paths
+      LOCAL_PATH_SOURCE = %r{source\s*=\s*['"](?<path>..?\/[^'"]+)}.freeze
+
       def self.required_files_in?(filenames)
         filenames.any? { |f| f.end_with?(".tf", ".hcl") }
       end
@@ -23,6 +26,7 @@ module Dependabot
         fetched_files = []
         fetched_files += terraform_files
         fetched_files += terragrunt_files
+        fetched_files += local_path_module_files(terraform_files)
         fetched_files += [lock_file] if lock_file
 
         return fetched_files if fetched_files.any?
@@ -47,6 +51,35 @@ module Dependabot
           map { |f| fetch_file_from_host(f.name) }
       end
 
+      def local_path_module_files(files, dir: ".")
+        terraform_files = []
+
+        files.each do |file|
+          terraform_file_local_module_details(file).each do |path|
+            base_path = Pathname.new(File.join(dir, path)).cleanpath.to_path
+            nested_terraform_files =
+              repo_contents(dir: base_path).
+              select { |f| f.type == "file" && f.name.end_with?(".tf") }.
+              map { |f| fetch_file_from_host(File.join(base_path, f.name)) }
+            terraform_files += nested_terraform_files
+            terraform_files += local_path_module_files(nested_terraform_files, dir: path)
+          end
+        end
+
+        # NOTE: The `support_file` attribute is not used but we set this to
+        # match what we do in other ecosystems
+        terraform_files.tap { |fs| fs.each { |f| f.support_file = true } }
+      end
+
+      def terraform_file_local_module_details(file)
+        return [] unless file.name.end_with?(".tf")
+        return [] unless file.content.match?(LOCAL_PATH_SOURCE)
+
+        file.content.scan(LOCAL_PATH_SOURCE).flatten.map do |path|
+          Pathname.new(path).cleanpath.to_path
+        end
+      end
+
       def lock_file
         @lock_file ||= fetch_file_if_present(".terraform.lock.hcl")
       end

data/lib/dependabot/terraform/file_updater.rb

@@ -29,7 +29,7 @@ module Dependabot
 
           updated_files << updated_file(file: file, content: updated_content)
         end
-        updated_lockfile_content = update_lockfile_declaration
+        updated_lockfile_content = update_lockfile_declaration(updated_files)
 
         if updated_lockfile_content && lock_file.content != updated_lockfile_content
           updated_files << updated_file(file: lock_file, content: updated_lockfile_content)
@@ -92,7 +92,7 @@ module Dependabot
         end
       end
 
-      def update_lockfile_declaration # rubocop:disable Metrics/AbcSize
+      def update_lockfile_declaration(updated_manifest_files) # rubocop:disable Metrics/AbcSize
         return if lock_file.nil?
 
         new_req = dependency.requirements.first
@@ -106,6 +106,9 @@ module Dependabot
 
         base_dir = dependency_files.first.directory
         SharedHelpers.in_a_temporary_repo_directory(base_dir, repo_contents_path) do
+          # Update the provider requirements in case the previous requirement doesn't allow the new version
+          updated_manifest_files.each { |f| File.write(f.name, f.content) }
+
           File.write(".terraform.lock.hcl", lockfile_dependency_removed)
           SharedHelpers.run_shell_command("terraform providers lock #{provider_source}")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.156.6
+  version: 0.156.7
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-15 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.156.6
+        version: 0.156.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.156.6
+        version: 0.156.7
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Terraform support for dependabot