dependabot-terraform 0.155.1 → 0.156.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51d974767fa123e36602001d5e912b941f320337c393102382b79bcfcd0a87ab
-  data.tar.gz: 7b856f87b9d0ee6066c2341fdb4b03774e555bcb6084d50f850fb25e42de604b
+  metadata.gz: d510e2ed189deaa3b6949fefd68fd73852f77728080bd1e96776eb91718f4eb7
+  data.tar.gz: 83a3ad61c89ce7606d103328b9500f37ae0e089c5c47041dd37d01e660b83ea8
 SHA512:
-  metadata.gz: a90b8caecc2bdbf7df6b38747ae6cf798e047341243849f6a120d5dbe5d1e6f3c56250feb40c9dc1cae4093f3e634a1250ec9e37054faaf2773dbd75a2cd06d0
-  data.tar.gz: 3ccc5a928652f5f22deec3412683bbdf83642e3b04606ae97049f353a0da2509c98ad33d9a234449e5754a313c827d0b6533f233a8d8479c76e2cf1f6a944196
+  metadata.gz: 48cf7e4734bd72c8a15351a85682e9b5526667276c6c685dd2b4144f00862d5dbf1b17a05629fe661f4ab145d378f4e14e5a744db0e66b0513c144e5fe996195
+  data.tar.gz: 9c583cdb4cf467046d2ece09d80f8ab881cd18708d6ee41f5077915302cbfcd88b4807127237078acfd421d9e02ac244b7de4ebb86f2a5e5674c53b084f24377

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
@@ -102,9 +104,8 @@ module Dependabot
         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}")
 
@@ -123,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.155.1
+  version: 0.156.4
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-06-30 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.155.1
+        version: 0.156.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.155.1
+        version: 0.156.4
 - !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.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement