dependabot-go_modules 0.143.0 → 0.143.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/helpers/Makefile +2 -2
  3. data/helpers/build +2 -2
  4. data/helpers/go.mod +1 -8
  5. data/helpers/go.sum +0 -1
  6. data/helpers/updater/helpers.go +16 -8
  7. data/helpers/updater/main.go +3 -1
  8. data/lib/dependabot/go_modules/update_checker.rb +2 -2
  9. metadata +4 -6
  10. data/helpers/updater/go.mod +0 -3
  11. data/helpers/updater/go.sum +0 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 657d54c489329452912e5f76918dd79a95a429020a37dc90d9a1d61fbe513610
4
- data.tar.gz: f8fa6af636c3d8ed16441f3c89ab188bd8faf73e936c4290235fbd2756fd0f74
3
+ metadata.gz: 9e7f7d52aa2101f758f1b5041a69ec480f43b6afa40cbcc466a2a4ca7c6c5f1d
4
+ data.tar.gz: bc50731b3e23f20bfd368fcad0beeb11ce84ff1d8ebefcb7379d04a6454a8555
5
5
  SHA512:
6
- metadata.gz: affd7950ce174e8c87cb96af2ecd276cf79baf10503b58463209785cf15433560ecd825c4d1eef63f30180d5833843f8186647c51c1826d4ec775f91ad4872d4
7
- data.tar.gz: 30229778ed96351e467b9975d536e96589a1e62f67b3ff595f49e034152d141a46ed3120715579ec5ef431ebba642f38cba22052542ce63f7628003fa3585fdc
6
+ metadata.gz: 823c06ca3d150db110e23bbb06940993af989fb57b401dbe4739f557c86da2ed4dd1494054a7dbc7723cbe063d3813cdd66d55c78fcc3f18eeb25a4a66db5d67
7
+ data.tar.gz: a86a90214f579be6cc32c6a1932d2db80ef3925e2418b627a5fdc412e005a68953f379783a4246e536574a91c05b8ffeb043e7c29ddf370fe41d2f425badd975
data/helpers/Makefile CHANGED
@@ -3,7 +3,7 @@
3
3
  all: darwin linux
4
4
 
5
5
  darwin:
6
- GO111MODULE=on GOOS=darwin GOARCH=amd64 go build -o go-helpers.darwin64 .
6
+ GOOS=darwin GOARCH=amd64 go build -o go-helpers.darwin64 .
7
7
 
8
8
  linux:
9
- GO111MODULE=on GOOS=linux GOARCH=amd64 go build -o go-helpers.linux64 .
9
+ GOOS=linux GOARCH=amd64 go build -o go-helpers.linux64 .
data/helpers/build CHANGED
@@ -23,5 +23,5 @@ cd $helpers_dir
23
23
  os="$(uname -s | tr '[:upper:]' '[:lower:]')"
24
24
  echo "building $install_dir/bin/helper"
25
25
 
26
- GO111MODULE=on GOOS="$os" GOARCH=amd64 go build -o "$install_dir/bin/helper" .
27
- go clean -cache -modcache
26
+ GOOS="$os" GOARCH=amd64 go build -o "$install_dir/bin/helper" .
27
+ go clean -cache -modcache
data/helpers/go.mod CHANGED
@@ -1,16 +1,9 @@
1
1
  module github.com/dependabot/dependabot-core/go_modules/helpers
2
2
 
3
- go 1.13
3
+ go 1.16
4
4
 
5
5
  require (
6
6
  github.com/Masterminds/vcs v1.13.1
7
- github.com/dependabot/dependabot-core/go_modules/helpers/updater v0.0.0
8
7
  github.com/dependabot/gomodules-extracted v1.2.0
9
8
  golang.org/x/mod v0.4.2
10
9
  )
11
-
12
- replace github.com/dependabot/dependabot-core/go_modules/helpers/importresolver => ./importresolver
13
-
14
- replace github.com/dependabot/dependabot-core/go_modules/helpers/updater => ./updater
15
-
16
- replace github.com/dependabot/dependabot-core/go_modules/helpers/updatechecker => ./updatechecker
data/helpers/go.sum CHANGED
@@ -1,6 +1,5 @@
1
1
  github.com/Masterminds/vcs v1.13.1 h1:NL3G1X7/7xduQtA2sJLpVpfHTNBALVNSjob6KEjPXNQ=
2
2
  github.com/Masterminds/vcs v1.13.1/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
3
- github.com/dependabot/gomodules-extracted v0.0.0-20181020215834-1b2f850478a3/go.mod h1:+dRXSrUymjpT4yzKtn1QmeknT1S/yAHRr35en18dHp8=
4
3
  github.com/dependabot/gomodules-extracted v1.2.0 h1:K/gTyOyhasOt4cjULvOPNiD3MAFGytp4F7e39aB+0Y0=
5
4
  github.com/dependabot/gomodules-extracted v1.2.0/go.mod h1:3NWkH8KcZVDM87JuZI8hCZzYbjfUSz98EZI53qjgMgY=
6
5
  golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
data/helpers/updater/helpers.go CHANGED
@@ -6,7 +6,11 @@ import (
6
6
  "golang.org/x/mod/modfile"
7
7
  )
8
8
 
9
- // Private methods lifted from the `modfile` package
9
+ // Private methods lifted from the `modfile` package.
10
+ // Last synced: 4/28/2021 from:
11
+ // https://github.com/golang/mod/blob/858fdbee9c245c8109c359106e89c6b8d321f19c/modfile/rule.go
12
+
13
+ var slashSlash = []byte("//")
10
14
 
11
15
  // setIndirect sets line to have (or not have) a "// indirect" comment.
12
16
  func setIndirect(line *modfile.Line, indirect bool) {
@@ -20,13 +24,17 @@ func setIndirect(line *modfile.Line, indirect bool) {
20
24
  line.Suffix = []modfile.Comment{{Token: "// indirect", Suffix: true}}
21
25
  return
22
26
  }
23
- // Insert at beginning of existing comment.
27
+
24
28
  com := &line.Suffix[0]
25
- space := " "
26
- if len(com.Token) > 2 && com.Token[2] == ' ' || com.Token[2] == '\t' {
27
- space = ""
29
+ text := strings.TrimSpace(strings.TrimPrefix(com.Token, string(slashSlash)))
30
+ if text == "" {
31
+ // Empty comment.
32
+ com.Token = "// indirect"
33
+ return
28
34
  }
29
- com.Token = "// indirect;" + space + com.Token[2:]
35
+
36
+ // Insert at beginning of existing comment.
37
+ com.Token = "// indirect; " + text
30
38
  return
31
39
  }
32
40
 
@@ -52,6 +60,6 @@ func isIndirect(line *modfile.Line) bool {
52
60
  if len(line.Suffix) == 0 {
53
61
  return false
54
62
  }
55
- f := strings.Fields(line.Suffix[0].Token)
56
- return (len(f) == 2 && f[1] == "indirect" || len(f) > 2 && f[1] == "indirect;") && f[0] == "//"
63
+ f := strings.Fields(strings.TrimPrefix(line.Suffix[0].Token, string(slashSlash)))
64
+ return (len(f) == 1 && f[0] == "indirect" || len(f) > 1 && f[0] == "indirect;")
57
65
  }
data/helpers/updater/main.go CHANGED
@@ -28,7 +28,9 @@ func UpdateDependencyFile(args *Args) (interface{}, error) {
28
28
  }
29
29
 
30
30
  for _, dep := range args.Dependencies {
31
- f.AddRequire(dep.Name, dep.Version)
31
+ if err := f.AddRequire(dep.Name, dep.Version); err != nil {
32
+ return nil, err
33
+ }
32
34
  }
33
35
 
34
36
  for _, r := range f.Require {
data/lib/dependabot/go_modules/update_checker.rb CHANGED
@@ -24,7 +24,7 @@ module Dependabot
24
24
  #
25
25
  # To update indirect dependencies we'll need to promote the indirect
26
26
  # dependency to the go.mod file forcing the resolver to pick this
27
- # version (possibly as # indirect)
27
+ # version (possibly as `// indirect`)
28
28
  unless dependency.top_level?
29
29
  return unless dependency.version
30
30
 
@@ -122,7 +122,7 @@ module Dependabot
122
122
 
123
123
  def version_from_tag(tag)
124
124
  # To compare with the current version we either use the commit SHA
125
- # (if that's what the parser picked up) of the tag name.
125
+ # (if that's what the parser picked up) or the tag name.
126
126
  return tag&.fetch(:commit_sha) if dependency.version&.match?(/^[0-9a-f]{40}$/)
127
127
 
128
128
  tag&.fetch(:tag)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-go_modules
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.143.0
4
+ version: 0.143.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-04-21 00:00:00.000000000 Z
11
+ date: 2021-04-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.143.0
19
+ version: 0.143.5
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.143.0
26
+ version: 0.143.5
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -192,8 +192,6 @@ files:
192
192
  - helpers/importresolver/main.go
193
193
  - helpers/main.go
194
194
  - helpers/updatechecker/main.go
195
- - helpers/updater/go.mod
196
- - helpers/updater/go.sum
197
195
  - helpers/updater/helpers.go
198
196
  - helpers/updater/main.go
199
197
  - lib/dependabot/go_modules.rb
data/helpers/updater/go.mod DELETED
@@ -1,3 +0,0 @@
1
- module github.com/dependabot/dependabot-core/helpers/go/updater
2
-
3
- require github.com/dependabot/gomodules-extracted v0.0.0-20181020215834-1b2f850478a3
data/helpers/updater/go.sum DELETED
@@ -1,2 +0,0 @@
1
- github.com/dependabot/gomodules-extracted v0.0.0-20181020215834-1b2f850478a3 h1:Xj2leY0FVyZuo+p59vkIWG3dIqo+QtjskT5O1iTiywA=
2
- github.com/dependabot/gomodules-extracted v0.0.0-20181020215834-1b2f850478a3/go.mod h1:+dRXSrUymjpT4yzKtn1QmeknT1S/yAHRr35en18dHp8=