dependabot-terraform 0.154.5 → 0.156.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c2f99ef0a28f946419c0c91ff73277f5fc38c7fa138cca3798a7417d895cc9f
-  data.tar.gz: fab6fff6a747012e09d87ef387577fbba7279ca46923797e2edbca3bd1ed227f
+  metadata.gz: 69ebba35c11cda0464908885855ed6cf732624e233843b23c3611b5926871153
+  data.tar.gz: 1d46629e2f0627a081af19f513f30760d9b7f11f557ba24fb6f38830bb6166c1
 SHA512:
-  metadata.gz: 8aaccbbe38e0ccffaba559b7b095d25472d5cbce71381885abdf0a3a5268483ae22f60678b1489590e9009cd2654b2d17844cdb4c6b8bb1cd040d7789e74c82a
-  data.tar.gz: e27dbba4b1d5d78d26afe0c023ddeb73114c86312ec0efe90f177f820525ea787e22b3bbd3966af0113c270108c098677367d2d38de245b0de1dee881f2c796e
+  metadata.gz: 7780476e6910b3ea4352c973e81be96f22bfc3ddf6eb46d98dab8769e72199aecb28948058cd97b9a605ead2a54e95285d80549fe968082472d823900c9c4c09
+  data.tar.gz: 76302461f7a9d596cb9f4ab7e9c72942bafbe62a6bb4fedbf6804f33358d8deefb3d0563a438cacae8acbcc001f8bacc0dc58de9484ff8e2a1a69e3091361694

data/lib/dependabot/terraform.rb

@@ -17,3 +17,6 @@ Dependabot::PullRequestCreator::Labeler.
 require "dependabot/dependency"
 Dependabot::Dependency.
   register_production_check("terraform", ->(_) { true })
+
+require "dependabot/utils"
+Dependabot::Utils.register_always_clone("terraform")

data/lib/dependabot/terraform/file_updater.rb

@@ -11,6 +11,8 @@ module Dependabot
     class FileUpdater < Dependabot::FileUpdaters::Base
       include FileSelector
 
+      PRIVATE_MODULE_ERROR = /Could not download module.*code from\n.*\"(?<repo>\S+)\":/.freeze
+
       def self.updated_files_regex
         [/\.tf$/, /\.hcl$/]
       end
@@ -94,15 +96,16 @@ module Dependabot
         return if lock_file.nil?
 
         new_req = dependency.requirements.first
-        content = lock_file.content.dup
+        # NOTE: Only providers are inlcuded in the lockfile, modules are not
+        return unless new_req[:source][:type] == "provider"
 
+        content = lock_file.content.dup
         provider_source = new_req[:source][:registry_hostname] + "/" + new_req[:source][:module_identifier]
         declaration_regex = lockfile_declaration_regex(provider_source)
         lockfile_dependency_removed = content.sub(declaration_regex, "")
 
-        SharedHelpers.in_a_temporary_directory do
-          write_dependency_files
-
+        base_dir = dependency_files.first.directory
+        SharedHelpers.in_a_temporary_repo_directory(base_dir, repo_contents_path) do
           File.write(".terraform.lock.hcl", lockfile_dependency_removed)
           SharedHelpers.run_shell_command("terraform providers lock #{provider_source}")
 
@@ -121,19 +124,25 @@ module Dependabot
           # NOTE: Modules need to be installed before terraform can update the
           # lockfile
           @retrying_lock = true
-          SharedHelpers.run_shell_command("terraform init")
+          run_terraform_init
           retry
         end
 
         content
       end
 
-      def write_dependency_files
-        dependency_files.each do |file|
-          # Do not include the .terraform directory or .terraform.lock.hcl
-          next if file.name.include?(".terraform")
+      def run_terraform_init
+        SharedHelpers.with_git_configured(credentials: credentials) do
+          # -backend=false option used to ignore any backend configuration, as these won't be accessible
+          # -input=false option used to immediately fail if it needs user input
+          # -no-color option used to prevent any color characters being printed in the output
+          SharedHelpers.run_shell_command("terraform init -backend=false -input=false -no-color")
+        rescue SharedHelpers::HelperSubprocessFailed => e
+          output = e.message
 
-          File.write(file.name, file.content)
+          if output.match?(PRIVATE_MODULE_ERROR)
+            raise PrivateSourceAuthenticationFailure, output.match(PRIVATE_MODULE_ERROR).named_captures.fetch("repo")
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.154.5
+  version: 0.156.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-06-25 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.154.5
+        version: 0.156.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.154.5
+        version: 0.156.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement