dependabot-go_modules 0.147.1 → 0.148.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49a3c8f5619aea720e7acc5ced077a03a0d3e8ccffccf8fed2d21ce28c64865
-  data.tar.gz: 11cb71557971dbc25d2a9ca07a7c96ffbe12cb9171e539a320b75c23a4685d31
+  metadata.gz: 440891afa53b611d109e2420adc240a145ce52e52c5525603dcc69c4df4422df
+  data.tar.gz: 62d3aecf1258256a757cea7c7170d5b832dd2617f9ad46151932fc64ba484818
 SHA512:
-  metadata.gz: abfc1824171f1c9ffdb9a7b2757ed4e1dff4bf4d40441002102d78d8b79abe04b60d812a4bbec4eac740f9e698601a7b121b427f62de052aa84731297168478f
-  data.tar.gz: 9595d121c7b13fd2bd92cd10e766813eb2113e6b534442815ac60e56a61255f26af0fcbd93d539022dc5e2e99a12cc9305b7975674a7d2843120e409ec737a57
+  metadata.gz: 9db12c769b35527d871fe014a34682ad5cb82b3260907969a2c1498348ff60577801132435cf2d8eb2d47539cf6ada58d8612c2019f4fb1eaacf34376f69f07b
+  data.tar.gz: 0f5589c8c8a3cf502a8079336f83964ebc48e6baffb14445bf9ca9cafcdb90565306f57d18787dd76f26843c9a549d7d57895759ebba602e19a04d42682a9ed3

data/helpers/main.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/dependabot/dependabot-core/go_modules/helpers/importresolver"
 	"github.com/dependabot/dependabot-core/go_modules/helpers/updatechecker"
-	"github.com/dependabot/dependabot-core/go_modules/helpers/updater"
 )
 
 type HelperParams struct {
@@ -37,10 +36,6 @@ func main() {
 		var args updatechecker.Args
 		parseArgs(helperParams.Args, &args)
 		funcOut, funcErr = updatechecker.GetVersions(&args)
-	case "updateDependencyFile":
-		var args updater.Args
-		parseArgs(helperParams.Args, &args)
-		funcOut, funcErr = updater.UpdateDependencyFile(&args)
 	case "getVcsRemoteForImport":
 		var args importresolver.Args
 		parseArgs(helperParams.Args, &args)

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

@@ -18,7 +18,7 @@ module Dependabot
         RESOLVABILITY_ERROR_REGEXES = [
           # The checksum in go.sum does not match the downloaded content
           /verifying .*: checksum mismatch/.freeze,
-          /go: .*: go.mod has post-v\d+ module path/
+          /go (?:get)?: .*: go.mod has post-v\d+ module path/
         ].freeze
 
         REPO_RESOLVABILITY_ERROR_REGEXES = [
@@ -91,11 +91,12 @@ module Dependabot
             # Replace full paths with path hashes in the go.mod
             substitute_all(substitutions)
 
-            # Set the stubbed replace directives
-            update_go_mod(dependencies)
+            # Bump the deps we want to upgrade using `go get lib@version`
+            run_go_get(dependencies)
 
-            # Then run `go get` to pick up other changes to the file caused by
-            # the upgrade
+            # Run `go get`'s internal validation checks against _each_ module in `go.mod`
+            # by running `go get` w/o specifying any library. It finds problems like when a
+            # module declares itself using a different name than specified in our `go.mod` etc.
             run_go_get
 
             # If we stubbed modules, don't run `go mod {tidy,vendor}` as
@@ -153,26 +154,7 @@ module Dependabot
           handle_subprocess_error(stderr) unless status.success?
         end
 
-        def update_go_mod(dependencies)
-          deps = dependencies.map do |dep|
-            {
-              name: dep.name,
-              version: "v" + dep.version.sub(/^v/i, ""),
-              indirect: dep.requirements.empty?
-            }
-          end
-
-          body = SharedHelpers.run_helper_subprocess(
-            command: NativeHelpers.helper_path,
-            env: ENVIRONMENT,
-            function: "updateDependencyFile",
-            args: { dependencies: deps }
-          )
-
-          write_go_mod(body)
-        end
-
-        def run_go_get
+        def run_go_get(dependencies = [])
           tmp_go_file = "#{SecureRandom.hex}.go"
 
           package = Dir.glob("[^\._]*.go").any? do |path|
@@ -181,7 +163,14 @@ module Dependabot
 
           File.write(tmp_go_file, "package dummypkg\n") unless package
 
-          _, stderr, status = Open3.capture3(ENVIRONMENT, "go get -d")
+          # TODO: go 1.18 will make `-d` the default behavior, so remove the flag then
+          command = +"go get -d"
+          # `go get` accepts multiple packages, each separated by a space
+          dependencies.each do |dep|
+            version = "v" + dep.version.sub(/^v/i, "")
+            command << " #{dep.name}@#{version}"
+          end
+          _, stderr, status = Open3.capture3(ENVIRONMENT, command)
           handle_subprocess_error(stderr) unless status.success?
         ensure
           File.delete(tmp_go_file) if File.exist?(tmp_go_file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-go_modules
 version: !ruby/object:Gem::Version
-  version: 0.147.1
+  version: 0.148.0
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.147.1
+        version: 0.148.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.147.1
+        version: 0.148.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -192,8 +192,6 @@ files:
 - helpers/importresolver/main.go
 - helpers/main.go
 - helpers/updatechecker/main.go
-- helpers/updater/helpers.go
-- helpers/updater/main.go
 - lib/dependabot/go_modules.rb
 - lib/dependabot/go_modules/file_fetcher.rb
 - lib/dependabot/go_modules/file_parser.rb

data/helpers/updater/helpers.go

@@ -1,65 +0,0 @@
-package updater
-
-import (
-	"strings"
-
-	"golang.org/x/mod/modfile"
-)
-
-// Private methods lifted from the `modfile` package.
-// Last synced: 4/28/2021 from:
-// https://github.com/golang/mod/blob/858fdbee9c245c8109c359106e89c6b8d321f19c/modfile/rule.go
-
-var slashSlash = []byte("//")
-
-// setIndirect sets line to have (or not have) a "// indirect" comment.
-func setIndirect(line *modfile.Line, indirect bool) {
-	if isIndirect(line) == indirect {
-		return
-	}
-	if indirect {
-		// Adding comment.
-		if len(line.Suffix) == 0 {
-			// New comment.
-			line.Suffix = []modfile.Comment{{Token: "// indirect", Suffix: true}}
-			return
-		}
-
-		com := &line.Suffix[0]
-		text := strings.TrimSpace(strings.TrimPrefix(com.Token, string(slashSlash)))
-		if text == "" {
-			// Empty comment.
-			com.Token = "// indirect"
-			return
-		}
-
-		// Insert at beginning of existing comment.
-		com.Token = "// indirect; " + text
-		return
-	}
-
-	// Removing comment.
-	f := strings.Fields(line.Suffix[0].Token)
-	if len(f) == 2 {
-		// Remove whole comment.
-		line.Suffix = nil
-		return
-	}
-
-	// Remove comment prefix.
-	com := &line.Suffix[0]
-	i := strings.Index(com.Token, "indirect;")
-	com.Token = "//" + com.Token[i+len("indirect;"):]
-}
-
-// isIndirect reports whether line has a "// indirect" comment,
-// meaning it is in go.mod only for its effect on indirect dependencies,
-// so that it can be dropped entirely once the effective version of the
-// indirect dependency reaches the given minimum version.
-func isIndirect(line *modfile.Line) bool {
-	if len(line.Suffix) == 0 {
-		return false
-	}
-	f := strings.Fields(strings.TrimPrefix(line.Suffix[0].Token, string(slashSlash)))
-	return (len(f) == 1 && f[0] == "indirect" || len(f) > 1 && f[0] == "indirect;")
-}

data/helpers/updater/main.go

@@ -1,50 +0,0 @@
-package updater
-
-import (
-	"io/ioutil"
-
-	"golang.org/x/mod/modfile"
-)
-
-type Dependency struct {
-	Name     string `json:"name"`
-	Version  string `json:"version"`
-	Indirect bool   `json:"indirect"`
-}
-
-type Args struct {
-	Dependencies []Dependency `json:"dependencies"`
-}
-
-func UpdateDependencyFile(args *Args) (interface{}, error) {
-	data, err := ioutil.ReadFile("go.mod")
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := modfile.Parse("go.mod", data, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, dep := range args.Dependencies {
-		if err := f.AddRequire(dep.Name, dep.Version); err != nil {
-			return nil, err
-		}
-	}
-
-	for _, r := range f.Require {
-		for _, dep := range args.Dependencies {
-			if r.Mod.Path == dep.Name {
-				setIndirect(r.Syntax, dep.Indirect)
-			}
-		}
-	}
-
-	f.SortBlocks()
-	f.Cleanup()
-
-	newModFile, _ := f.Format()
-
-	return string(newModFile), nil
-}