dependabot-terraform 0.164.1 → 0.167.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab4f44fc7567abba4ed67e1f7e49cd54453b14c9e64da85085eaab739271be9b
-  data.tar.gz: 6377f202cb0c34db0ebef44c830e990b19560018754bc5f6333069ed891822cc
+  metadata.gz: a703decf561894e3c5ef7ca84884b60f9405df193d6e746dc91d5739c9a13c24
+  data.tar.gz: 491ce3b10bf61b769cce5eb4da1f38d769d21a49b99ef631bf3c9d36d40f0c1a
 SHA512:
-  metadata.gz: 9ab06deb18bc36af087c108a344f30b78afce1bdb2964509ecb3b29644d8be40e6c1eb9cb1c7682c459de0e7247449f9e90231ac0b609dad26aa34dd20b76c06
-  data.tar.gz: e6b0b39099d7a06e8a72abb118c3f5c9bb6865c44ec4683afd129e06510893a8325fb4b0938226d3abd5dafa73314102f901f7e1165d9c25771ea6b1c0a9fba4
+  metadata.gz: 1871e9c8c43b7418bbb48b3a783ec216135020b1f6227b8276710b22dd90fbfccec8222904e1afc2b2d1e25de7b5f6ea2e87890627ae16c630354a9943705391
+  data.tar.gz: 86ac5ed622f2210a22e3226d9dad9b51c07d56775ae1888f5fee570101f0c9093fd66896bb600b9cda3a8f34648b727ace3b3bafb4139beafc4c525e90491ae6

data/lib/dependabot/terraform/file_updater.rb

@@ -12,6 +12,7 @@ module Dependabot
       include FileSelector
 
       PRIVATE_MODULE_ERROR = /Could not download module.*code from\n.*\"(?<repo>\S+)\":/.freeze
+      MODULE_NOT_INSTALLED_ERROR =  /Module not installed.*module\s*\"(?<mod>\S+)\"/m.freeze
 
       def self.updated_files_regex
         [/\.tf$/, /\.hcl$/]
@@ -110,7 +111,7 @@ module Dependabot
           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}")
+          SharedHelpers.run_shell_command("terraform providers lock #{provider_source} -no-color")
 
           updated_lockfile = File.read(".terraform.lock.hcl")
           updated_dependency = updated_lockfile.scan(declaration_regex).first
@@ -122,6 +123,10 @@ module Dependabot
             content.sub!(declaration_regex, updated_dependency)
           end
         rescue SharedHelpers::HelperSubprocessFailed => e
+          if @retrying_lock && e.message.match?(MODULE_NOT_INSTALLED_ERROR)
+            mod = e.message.match(MODULE_NOT_INSTALLED_ERROR).named_captures.fetch("mod")
+            raise Dependabot::DependencyFileNotResolvable, "Attempt to install module #{mod} failed"
+          end
           raise if @retrying_lock || !e.message.include?("terraform init")
 
           # NOTE: Modules need to be installed before terraform can update the
@@ -146,6 +151,8 @@ module Dependabot
           if output.match?(PRIVATE_MODULE_ERROR)
             raise PrivateSourceAuthenticationFailure, output.match(PRIVATE_MODULE_ERROR).named_captures.fetch("repo")
           end
+
+          raise Dependabot::DependencyFileNotResolvable, "Error running `terraform init`: #{output}"
         end
       end
 

data/lib/dependabot/terraform/registry_client.rb

@@ -33,6 +33,8 @@ module Dependabot
         JSON.parse(response.body).
           fetch("versions").
           map { |release| version_class.new(release.fetch("version")) }
+      rescue Excon::Error
+        raise error("Could not fetch provider versions")
       end
 
       # Fetch all the versions of a module, and return a Version

metadata

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