dependabot-terraform 0.166.0 → 0.166.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57cc3a91a547ed341e2bd13e83d4dc8064d91021a8d885f72a28d38357365f9d
-  data.tar.gz: 917b4f01802b149ff59e2b34e783d9054a5d00af1937e86a00a0ee965c7543d4
+  metadata.gz: 944a2ace751a6a1c326a489cf9da6c75b9092551df0c2418c673a31be41e9630
+  data.tar.gz: 00433d20db41689468689c98d42fdc46f9aafca420d2f20a02c06d4840e777bb
 SHA512:
-  metadata.gz: 5f1af2fc261df0b4c49deb4d1a29458655815a9046cc94036783f37fe919841f0acb48765ccb6502a69532c86647658902ef49dd6cb83af4958ff5c975315c5d
-  data.tar.gz: fb846d27e8d159988cc7e34736a2c11a23a5e8c07fd1f8e7ecbe2ae329e645953ee0190dd7b316a5688f12817410a98edd604bb5496fb8c7f96e4b6a8a8e5679
+  metadata.gz: f7fba016c08190ca0c9632efd0c0d7c5f90ab900a80e14b7fabd5afdc463aab82a871dd249ce62492e50ead1eec0b2df552e0f2beaf9efa9c19a606053838016
+  data.tar.gz: 241681b21218793c984dcd55f755d4d65a4c9bb7f5e5273150f8f5c2d35a2e73681939a6e3a511cb39cae1f16e90348b4ad57200d7b5d54c89d2d148c6c09b7a

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.166.0
+  version: 0.166.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2021-11-14 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.166.0
+        version: 0.166.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.166.0
+        version: 0.166.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement