dependabot-go_modules 0.138.6 → 0.138.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c7dedb732a27d9c584f560e2a8feb455544812304e936b672ca3da768bb8b79
-  data.tar.gz: 34c2c937316d8ae415e4f7d87c0da228d4facf49f99229d9bff457349a22a6b9
+  metadata.gz: d4bf01422d0d6b5d38f97230bc59d0cabb422c6c5f254dc6a3fd82f165cd6b3e
+  data.tar.gz: 3137ada20e69002e022109ddfe4627eb6fd510634e529064d5d10500f16138b9
 SHA512:
-  metadata.gz: 9431d4d8cadff527b74e933f5f4c47b2e756f148ab3d03a4c62c9615077be546f8abf738c8c6627f51ba6513bc7df6cdb0538f1f170beb063fa4973cbead9975
-  data.tar.gz: d13165568ea340a5b26c98a80bfd7a1a1b3e17a5e208d4cca945d7d85768c6ff9abda007eac23e38c15d67f0fdd7f4f2cf79ce699566f7cec833c28db8967f51
+  metadata.gz: f49969b54b69804c7df6aedeb32cf85a0c9a19fdf4b2360f713c48f95384d5850c4e3978c493de9f37724a214fff8c3a4ed875b936ba21b3788b036133a81958
+  data.tar.gz: ddcbdd053d70479fe24112b2423daf43b8f2660ff282963bd34227ad8ae37b332c54b81d576f97b6bf42a1a93abd54c1ff88bc447858d92cc12b411b982d534e

data/helpers/go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/Masterminds/vcs v1.13.1
 	github.com/dependabot/dependabot-core/go_modules/helpers/updater v0.0.0
 	github.com/dependabot/gomodules-extracted v1.2.0
-	golang.org/x/mod v0.4.1
+	golang.org/x/mod v0.4.2
 )
 
 replace github.com/dependabot/dependabot-core/go_modules/helpers/importresolver => ./importresolver

data/helpers/go.sum

@@ -6,8 +6,8 @@ github.com/dependabot/gomodules-extracted v1.2.0/go.mod h1:3NWkH8KcZVDM87JuZI8hC
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

data/lib/dependabot/go_modules/file_updater/go_mod_updater.rb

@@ -222,18 +222,12 @@ module Dependabot
         # process afterwards.
         def replace_directive_substitutions(manifest)
           @replace_directive_substitutions ||=
-            begin
-              # Find all the local replacements, and return them with a stub
-              # path we can use in their place. Using generated paths is safer
-              # as it means we don't need to worry about references to parent
-              # directories, etc.
-              (manifest["Replace"] || []).
-                map { |r| r["New"]["Path"] }.
-                compact.
-                select { |p| stub_replace_path?(p) }.
-                map { |p| [p, "./" + Digest::SHA2.hexdigest(p)] }.
-                to_h
-            end
+            (manifest["Replace"] || []).
+            map { |r| r["New"]["Path"] }.
+            compact.
+            select { |p| stub_replace_path?(p) }.
+            map { |p| [p, "./" + Digest::SHA2.hexdigest(p)] }.
+            to_h
         end
 
         # returns true if the provided path should be replaced with a stub
@@ -269,22 +263,20 @@ module Dependabot
           write_go_mod(body)
         end
 
-        # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/PerceivedComplexity
         def handle_subprocess_error(stderr)
           stderr = stderr.gsub(Dir.getwd, "")
 
           # Package version doesn't match the module major version
           error_regex = RESOLVABILITY_ERROR_REGEXES.find { |r| stderr =~ r }
           if error_regex
-            lines = stderr.lines.drop_while { |l| error_regex !~ l }
-            raise Dependabot::DependencyFileNotResolvable, lines.join
+            error_message = filter_error_message(message: stderr, regex: error_regex)
+            raise Dependabot::DependencyFileNotResolvable, error_message
           end
 
           repo_error_regex = REPO_RESOLVABILITY_ERROR_REGEXES.find { |r| stderr =~ r }
           if repo_error_regex
-            lines = stderr.lines.drop_while { |l| repo_error_regex !~ l }
-            ResolvabilityErrors.handle(lines.join, credentials: credentials)
+            error_message = filter_error_message(message: stderr, regex: repo_error_regex)
+            ResolvabilityErrors.handle(error_message, credentials: credentials)
           end
 
           path_regex = MODULE_PATH_MISMATCH_REGEXES.find { |r| stderr =~ r }
@@ -296,16 +288,22 @@ module Dependabot
 
           out_of_disk_regex = OUT_OF_DISK_REGEXES.find { |r| stderr =~ r }
           if out_of_disk_regex
-            lines = stderr.lines.select { |l| out_of_disk_regex =~ l }
-            raise Dependabot::OutOfDisk.new, lines.join
+            error_message = filter_error_message(message: stderr, regex: out_of_disk_regex)
+            raise Dependabot::OutOfDisk.new, error_message
           end
 
           # We don't know what happened so we raise a generic error
           msg = stderr.lines.last(10).join.strip
           raise Dependabot::DependabotError, msg
         end
-        # rubocop:enable Metrics/PerceivedComplexity
-        # rubocop:enable Metrics/AbcSize
+
+        def filter_error_message(message:, regex:)
+          lines = message.lines.select { |l| regex =~ l }
+          return lines.join if lines.any?
+
+          # In case the regex is multi-line, match the whole string
+          message.match(regex).to_s
+        end
 
         def go_mod_path
           return "go.mod" if directory == "/"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-go_modules
 version: !ruby/object:Gem::Version
-  version: 0.138.6
+  version: 0.138.7
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-03-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.138.6
+        version: 0.138.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.138.6
+        version: 0.138.7
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement