diff options
| -rw-r--r-- | build.go | 26 | ||||
| -rw-r--r-- | cleanGoSum.go | 187 | ||||
| -rw-r--r-- | finalGoSumCheck.go | 24 | ||||
| -rw-r--r-- | goSrcScan.go | 2 |
4 files changed, 19 insertions, 220 deletions
@@ -44,28 +44,11 @@ func (f *Forge) doBuild(repo *gitpb.Repo, userFlags []string, goWhat string) err defer os.Unsetenv("GO111MODULE") } - // get the version - version := repo.GetCurrentBranchVersion() - - /* - all := repo.Tags.SortByRefname() - for all.Scan() { - t := all.Next() - log.Info("Build() tag:", t.Refname) - } - */ - - if repo.GoDeps == nil { - repo.RedoGoMod() - } - if repo.GoDeps.Len() == 0 { - // eh, potentially runs it twice. don't care right now - log.Info("redo go.mod", repo.GetGoPath()) - repo.RedoGoMod() - f.Repos.ConfigSave() + if err := repo.ValidGoSum(); err != nil { + return err } - // run autogenpb in all protobuf repos + // build the protobuf files in all protobuf repos all := repo.GoDeps.SortByGoPath() for all.Scan() { t := all.Next() @@ -77,6 +60,9 @@ func (f *Forge) doBuild(repo *gitpb.Repo, userFlags []string, goWhat string) err } } + // get the version + version := repo.GetCurrentBranchVersion() + if repo.CheckDirty() { version = version + "-dirty" } diff --git a/cleanGoSum.go b/cleanGoSum.go deleted file mode 100644 index 49f9787..0000000 --- a/cleanGoSum.go +++ /dev/null @@ -1,187 +0,0 @@ -package forgepb - -import ( - "errors" - "fmt" - "os" - "path/filepath" - "sort" - "strings" - - "go.wit.com/lib/protobuf/gitpb" - "go.wit.com/log" -) - -// This will recreate your go.sum and go.mod files - -// checks to see if every 'master' git branch version -// matches the go.sum file -func (f *Forge) CleanGoDepsCheckOk(check *gitpb.Repo) error { - if check == nil { - log.Info("boo, check == nil") - return errors.New("*repo == nil") - } - - // re-create go.sum and go.mod - if _, err := check.RedoGoMod(); err != nil { - return err - } - - // if go.mod still does not exist. maybe this isn't a golang repo? - if !check.Exists("go.mod") { - return errors.New("go.mod can not be created in " + check.GoPath) - } - - check.GoDeps = nil - - // this assumes that go mod init and go mod tidy worked - // if they did, then the go.mod file might be the only - // file here. if so, this is called a 'primitive' golang package here - // this means, it's totally self contained and requires only the language go - // the name 'primitive' doesn't mean they are simple; these packages are usually awesome! - if ok, _ := check.IsPrimitive(); ok { - return nil - } - - // parse the go.sum file - if ok, err := check.ParseGoSum(); !ok { - log.Info("CleanGoDepsCheckOk() error", err) - return err - } - - // this probably shouldn't happen and this check should be removed or logged - if check.GoDepsLen() == 0 { - // this is a primitive go lang library (or an interesting binary?) - check.GoPrimitive = true - return nil - } - - // simple trim - if err := f.TrimGoSum(check); err != nil { - return err - } - - // parse the go.sum file - if ok, err := check.ParseGoSum(); !ok { - log.Info("CleanGoDepsCheckOk() error", err) - return err - } - - var err error = nil - log.Printf("current repo %s go dependancy count: %d", check.GetGoPath(), check.GoDepsLen()) - all := check.GoDeps.SortByGoPath() - for all.Scan() { - depRepo := all.Next() - found := f.Repos.FindByGoPath(depRepo.GetGoPath()) - if found == nil { - if f.checkOverride(depRepo.GetGoPath()) { - // skip this gopath because it's probably broken forever - continue - } - log.Info("not found:", depRepo.GetGoPath()) - err = errors.New("not found: " + depRepo.GetGoPath()) - continue - } - // log.Info("found dep", depRepo.GetGoPath()) - if depRepo.GetVersion() != found.GetMasterVersion() { - check := f.Repos.FindByGoPath(depRepo.GoPath) - var ends string - if check.CheckDirty() { - ends = "(dirty) " - } - - if f.Config.IsReadOnly(check.GoPath) { - ends += "(ignoring read-only) " - log.Printf("%-48s ok error .%s. vs .%s. %s", depRepo.GetGoPath(), - depRepo.GetVersion(), found.GetMasterVersion(), ends) - } else { - if f.checkOverride(depRepo.GetGoPath()) { - ends += "(override) " - log.Printf("%-48s ok error .%s. vs .%s. %s", depRepo.GetGoPath(), - depRepo.GetVersion(), found.GetMasterVersion(), ends) - // skip this gopath because it's probably broken forever - continue - } else { - log.Printf("%-48s error %10s vs %10s %s", depRepo.GetGoPath(), - depRepo.GetVersion(), found.GetMasterVersion(), ends) - errs := fmt.Sprintf("%s error %s vs %s %s", depRepo.GetGoPath(), - depRepo.GetVersion(), found.GetMasterVersion(), ends) - err = errors.New(errs) - } - } - } - } - return err -} - -func (f *Forge) TrimGoSum(check *gitpb.Repo) error { - var stuff map[string]string - stuff = make(map[string]string) - - var modver map[string]string - modver = make(map[string]string) - - var good map[string]bool - good = make(map[string]bool) - - if check == nil { - log.Info("boo, check == nil") - return errors.New("*repo == nil") - } - filename := filepath.Join(filepath.Join(check.FullPath, "go.sum")) - data, err := os.ReadFile(filename) - if err != nil { - return err - } - - for _, line := range strings.Split(string(data), "\n") { - parts := strings.Fields(line) - if len(parts) < 3 { - log.Info("BAD:", line) - continue - } - - gopath := parts[0] - version := parts[1] - hash := parts[2] - - if strings.HasSuffix(version, "/go.mod") { - if _, ok := stuff[gopath]; ok { - log.Info("MATCHED: gopath:", gopath, "version:", version) - modver[gopath] = version + " " + hash - good[gopath] = true - } else { - log.Info("GARBAGE: gopath:", gopath, "version:", version) - } - } else { - log.Info("GOOD : gopath:", gopath, "version:", version) - stuff[gopath] = version + " " + hash - } - } - - keys := make([]string, 0, len(stuff)) - for k := range stuff { - keys = append(keys, k) - } - - // rewrite the go.sum file - newfilename := filepath.Join(filepath.Join(check.FullPath, "go.sum")) - newf, err := os.OpenFile(newfilename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) - if err != nil { - return err - } - defer newf.Close() - sort.Strings(keys) - for _, gopath := range keys { - if good[gopath] { - fmt.Fprintf(newf, "%s %s\n", gopath, stuff[gopath]) - fmt.Fprintf(newf, "%s %s\n", gopath, modver[gopath]) - check := f.Repos.FindByGoPath(gopath) - if check == nil { - log.Info("gopath does not really exist:", gopath) - } - } - } - // fmt.Fprintln(newf, "test") - return nil -} diff --git a/finalGoSumCheck.go b/finalGoSumCheck.go index 33e5a4d..01a9195 100644 --- a/finalGoSumCheck.go +++ b/finalGoSumCheck.go @@ -49,7 +49,7 @@ func (f *Forge) FinalGoDepsCheckOk(check *gitpb.Repo) bool { depRepo := deps.Next() found := f.Repos.FindByGoPath(depRepo.GetGoPath()) if found == nil { - if f.checkOverride(depRepo.GetGoPath()) { + if f.CheckOverride(depRepo.GetGoPath()) { // skip this gopath because it's probably broken forever continue } @@ -63,8 +63,8 @@ func (f *Forge) FinalGoDepsCheckOk(check *gitpb.Repo) bool { if f.Config.IsReadOnly(check.GoPath) { log.Printf("%-48s ok error .%s. vs .%s. (ignoring read-only repo)", depRepo.GetGoPath(), depRepo.GetVersion(), found.GetTargetVersion()) } else { - if f.checkOverride(depRepo.GetGoPath()) { - log.Printf("%-48s ok error .%s. vs .%s. (forge.checkOverride())", depRepo.GetGoPath(), depRepo.GetVersion(), found.GetTargetVersion()) + if f.CheckOverride(depRepo.GetGoPath()) { + log.Printf("%-48s ok error .%s. vs .%s. (forge.CheckOverride())", depRepo.GetGoPath(), depRepo.GetVersion(), found.GetTargetVersion()) // skip this gopath because it's probably broken forever continue } else { @@ -77,38 +77,38 @@ func (f *Forge) FinalGoDepsCheckOk(check *gitpb.Repo) bool { return good } -func (f *Forge) checkOverride(gopath string) bool { +func (f *Forge) CheckOverride(gopath string) bool { if gopath == "cloud.google.com/go" { - log.Info("checkOverride() is ignoring", gopath) + log.Info("CheckOverride() is ignoring", gopath) return true } if gopath == "bou.ke/monkey" { - log.Info("checkOverride() is ignoring", gopath) + log.Info("CheckOverride() is ignoring", gopath) return true } if gopath == "github.com/posener/complete/v2" { - log.Info("checkOverride() is ignoring", gopath) + log.Info("CheckOverride() is ignoring", gopath) return true } if strings.HasPrefix(gopath, "github.com/go-gl") { - log.Info("checkOverride() is ignoring", gopath) + log.Info("CheckOverride() is ignoring", gopath) return true } if strings.HasPrefix(gopath, "google.golang.org") { - log.Info("checkOverride() is ignoring", gopath) + log.Info("CheckOverride() is ignoring", gopath) return true } if strings.HasPrefix(gopath, "go.opencensus.io") { - log.Info("checkOverride() is ignoring", gopath) + log.Info("CheckOverride() is ignoring", gopath) return true } if strings.HasPrefix(gopath, "github.com/nicksnyder/go-i18n") { - log.Info("checkOverride() is ignoring", gopath) + log.Info("CheckOverride() is ignoring", gopath) return true } // fuckit for now. just blacklist github.com if strings.HasPrefix(gopath, "github.com/") { - log.Info("checkOverride() is ignoring", gopath) + log.Info("CheckOverride() is ignoring", gopath) return true } return false diff --git a/goSrcScan.go b/goSrcScan.go index 473e36b..1879a1b 100644 --- a/goSrcScan.go +++ b/goSrcScan.go @@ -154,7 +154,7 @@ func (f *Forge) RillRedoGoMod() int { err := rill.ForEach(dirs, 20, func(repo *gitpb.Repo) error { counter += 1 - repo.RedoGoMod() + // repo.RedoGoMod() return nil }) |