From 324e0d69fca43f6c85094d291aaa382e76c1104d Mon Sep 17 00:00:00 2001 From: Jeff Widman Date: Wed, 28 Apr 2021 10:47:56 -0700 Subject: [PATCH 1/2] Check the err returned by AddRequire Looking at the source of `AddRequire`, it looks like it never actually returns a non-`nil` error. However, they wrote the func signature to return an `err` to give themselves future flexibility. So we should respect that and check for any unexpected errors. This way future updates that suddenly start returning errors will be caught rather than insidiously slipping by and causing difficult-to-debug issues elsewhere. --- go_modules/helpers/updater/main.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/go_modules/helpers/updater/main.go b/go_modules/helpers/updater/main.go index d29f126ea8..cbe109d05f 100644 --- a/go_modules/helpers/updater/main.go +++ b/go_modules/helpers/updater/main.go @@ -28,7 +28,10 @@ func UpdateDependencyFile(args *Args) (interface{}, error) { } for _, dep := range args.Dependencies { - f.AddRequire(dep.Name, dep.Version) + err := f.AddRequire(dep.Name, dep.Version) + if err != nil { + return nil, err + } } for _, r := range f.Require { From a7c24ece4674619512ef99a0739de710fca4e3a4 Mon Sep 17 00:00:00 2001 From: Pete Wagner <1559510+thepwagner@users.noreply.github.com> Date: Thu, 29 Apr 2021 09:30:24 -0400 Subject: [PATCH 2/2] Update go_modules/helpers/updater/main.go --- go_modules/helpers/updater/main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/go_modules/helpers/updater/main.go b/go_modules/helpers/updater/main.go index cbe109d05f..c3668d123a 100644 --- a/go_modules/helpers/updater/main.go +++ b/go_modules/helpers/updater/main.go @@ -28,8 +28,7 @@ func UpdateDependencyFile(args *Args) (interface{}, error) { } for _, dep := range args.Dependencies { - err := f.AddRequire(dep.Name, dep.Version) - if err != nil { + if err := f.AddRequire(dep.Name, dep.Version); err != nil { return nil, err } }