chore: more speedup

Signed-off-by: Valery Piashchynski <[email protected]>

Author: rustatian

builder/builder.go

@@ -63,6 +63,7 @@ func (b *Builder) Build(rrModule string) error { //nolint:gocyclo
 	t.Entries = make([]*templates.Entry, len(b.modules))
 	for i := 0; i < len(b.modules); i++ {
 		t.Entries[i] = &templates.Entry{
+			Time:      b.modules[i].Time,
 			Module:    b.modules[i].ModuleName,
 			Prefix:    randStringBytes(5),
 			Structure: pluginStructureStr,
@@ -73,7 +74,7 @@ func (b *Builder) Build(rrModule string) error { //nolint:gocyclo
 
 	buf := new(bytes.Buffer)
 
-	// compatibility with the version 2
+	// compatibility with version 2
 	switch t.ModuleVersion {
 	case velox.V2023:
 		err = templates.CompileTemplateV2023(buf, t)
@@ -131,7 +132,7 @@ func (b *Builder) Build(rrModule string) error { //nolint:gocyclo
 
 	buf.Reset()
 
-	// compatibility with the version 2
+	// compatibility with version 2
 	switch t.ModuleVersion {
 	case velox.V2023:
 		err = templates.CompileGoModTemplate2023(buf, t)
@@ -160,16 +161,9 @@ func (b *Builder) Build(rrModule string) error { //nolint:gocyclo
 		return err
 	}
 
-	for i := 0; i < len(t.Entries); i++ {
-		// go get only deps w/o replace
-		if t.Entries[i].Replace != "" {
-			t.Entries = append(t.Entries, b.getDepsReplace(t.Entries[i].Replace)...)
-			continue
-		}
-		err = b.goGetMod(t.Entries[i].Module, t.Entries[i].Version)
-		if err != nil {
-			return err
-		}
+	err = b.goModDowloadCmd()
+	if err != nil {
+		return err
 	}
 
 	err = b.goModTidyCmd()
@@ -259,9 +253,9 @@ func (b *Builder) goBuildCmd(out string) error {
 	return nil
 }
 
-func (b *Builder) goModTidyCmd() error {
-	b.log.Info("[EXECUTING CMD]", zap.String("cmd", "go mod tidy"))
-	cmd := exec.Command("go", "mod", "tidy")
+func (b *Builder) goModDowloadCmd() error {
+	b.log.Info("[EXECUTING CMD]", zap.String("cmd", "go mod download"))
+	cmd := exec.Command("go", "mod", "download")
 	cmd.Stderr = b
 	err := cmd.Start()
 	if err != nil {
@@ -274,11 +268,10 @@ func (b *Builder) goModTidyCmd() error {
 	return nil
 }
 
-func (b *Builder) goGetMod(repo, hash string) error {
-	b.log.Info("[EXECUTING CMD]", zap.String("cmd", "go get "+repo+"@"+hash))
-	cmd := exec.Command("go", "get", repo+"@"+hash) //nolint:gosec
+func (b *Builder) goModTidyCmd() error {
+	b.log.Info("[EXECUTING CMD]", zap.String("cmd", "go mod tidy"))
+	cmd := exec.Command("go", "mod", "tidy")
 	cmd.Stderr = b
-
 	err := cmd.Start()
 	if err != nil {
 		return err

builder/templates/entry.go

@@ -7,11 +7,12 @@ import (
 
 // Entry represents all info about module
 type Entry struct {
+	Time      string
 	Module    string
 	Structure string
 	Prefix    string
 	Version   string
-	// Replace directive, should include path
+	// Replace directive, should include a path
 	Replace string
 }
 

builder/templates/templateV2023.go

@@ -5,7 +5,7 @@ module github.com/roadrunner-server/roadrunner/{{.ModuleVersion}}
 
 go 1.21
 
-toolchain go1.21.0
+toolchain go1.21.1
 
 require (
         github.com/buger/goterm v1.0.4
@@ -16,6 +16,10 @@ require (
 		github.com/spf13/viper v1.15.0
         github.com/stretchr/testify v1.8.2
 		go.uber.org/automaxprocs v1.5.2
+
+		// Go module pseudo-version
+		{{range $v := .Entries}}{{$v.Module}} v4.0.0-{{$v.Time}}-{{$v.Version}}
+		{{end}}
 )
 
 replace (

cmd/vx/main.go

@@ -9,7 +9,7 @@ import (
 )
 
 func main() {
-	// os.Args[0] always contains path to the executable, like foo/bar/rr -> rr
+	// os.Args[0] always contains a path to the executable, like foo/bar/rr -> rr
 	cmd := cli.NewCommand(filepath.Base(os.Args[0]))
 	err := cmd.Execute()
 	if err != nil {

github/pool.go

@@ -10,11 +10,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/google/go-github/v49/github"
+	"github.com/google/go-github/v53/github"
 	"github.com/roadrunner-server/velox"
 	"go.uber.org/zap"
 )
 
+const (
+	referenceFormat string = "20060102150405"
+)
+
 type processor struct {
 	maxWorkers int
 	errs       []error
@@ -150,7 +154,10 @@ func (p *processor) run() {
 				}
 
 				for j := 0; j < len(commits); j++ {
-					modInfo.Version = *commits[j].SHA
+					at := commits[j].GetCommit().GetCommitter().GetDate()
+					modInfo.Time = at.Format(referenceFormat)
+					// [:12] because of go.mod pseudo format specs
+					modInfo.Version = commits[j].GetSHA()[:12]
 				}
 
 				if v.pluginCfg.Replace != "" {

github/repo.go

@@ -13,7 +13,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/google/go-github/v49/github"
+	"github.com/google/go-github/v53/github"
 	"github.com/roadrunner-server/velox"
 	"go.uber.org/zap"
 	"golang.org/x/oauth2"
@@ -28,7 +28,6 @@ const (
 GHRepo represents template repository
 */
 type GHRepo struct {
-	pool   *processor
 	client *github.Client
 	config *velox.Config
 	log    *zap.Logger
@@ -37,15 +36,14 @@ type GHRepo struct {
 func NewGHRepoInfo(cfg *velox.Config, log *zap.Logger) *GHRepo {
 	var client *http.Client
 
-	// if token exists, use it to increase rate limiter
+	// if a token exists, use it to increase rate limiter
 	if t := cfg.GitHub.Token; t != nil {
 		ctx := context.Background()
 		ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: t.Token})
 		client = oauth2.NewClient(ctx, ts)
 	}
 
 	return &GHRepo{
-		pool:   newPool(log, github.NewClient(client)),
 		log:    log,
 		config: cfg,
 		client: github.NewClient(client),
@@ -198,21 +196,22 @@ func extract(dest string, zf *zip.File) error {
 // https://github.com/spiral/roadrunner-binary/archive/refs/tags/v2.7.0.zip
 
 func (r *GHRepo) GetPluginsModData() ([]*velox.ModulesInfo, error) {
+	poolExecutor := newPool(r.log, r.client)
 	for k, v := range r.config.GitHub.Plugins {
-		r.pool.add(&pcfg{
+		poolExecutor.add(&pcfg{
 			pluginCfg: v,
 			name:      k,
 		})
 	}
 
-	r.pool.wait()
+	poolExecutor.wait()
 
-	if len(r.pool.errors()) != 0 {
-		return nil, errors.Join(r.pool.errors()...)
+	if len(poolExecutor.errors()) != 0 {
+		return nil, errors.Join(poolExecutor.errors()...)
 	}
 
-	mi := r.pool.moduleinfo()
-	r.pool.stop()
+	mi := poolExecutor.moduleinfo()
+	poolExecutor.stop()
 
 	return mi, nil
 }

go.mod

@@ -2,11 +2,11 @@ module github.com/roadrunner-server/velox
 
 go 1.21
 
-toolchain go1.21.0
+toolchain go1.21.1
 
 require (
 	github.com/fatih/color v1.15.0
-	github.com/google/go-github/v49 v49.1.0
+	github.com/google/go-github/v53 v53.2.0
 	github.com/hashicorp/go-version v1.6.0
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.7.0
@@ -18,6 +18,8 @@ require (
 )
 
 require (
+	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
+	github.com/cloudflare/circl v1.3.3 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect

go.sum

@@ -38,11 +38,17 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 h1:wPbRQzjjwFc0ih8puEVAOFGELsn1zoIIYdxvML7mDxA=
+github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
+github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
+github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
+github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -109,8 +115,8 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v49 v49.1.0 h1:LFkMgawGQ8dfzWLH/rNE0b3u1D3n6/dw7ZmrN3b+YFY=
-github.com/google/go-github/v49 v49.1.0/go.mod h1:MUUzHPrhGniB6vUKa27y37likpipzG+BXXJbG04J334=
+github.com/google/go-github/v53 v53.2.0 h1:wvz3FyF53v4BK+AsnvCmeNhf8AkTaeh2SoYu/XUvTtI=
+github.com/google/go-github/v53 v53.2.0/go.mod h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
@@ -365,6 +371,7 @@ golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

modulesInfo.go

@@ -2,6 +2,8 @@ package velox
 
 // ModulesInfo represents single go module
 type ModulesInfo struct {
+	// Time - commit time
+	Time string
 	// Version - commit sha or tag
 	Version string
 	// module name - eg: github.com/roadrunner-server/logger/v2

velox_rr_v2023.toml

@@ -86,5 +86,5 @@ ref = "v2023.3.0"
 #    test_plugin_2 = { ref = "main", owner = "rustatian", repository = "36405235" }
 #
 [log]
-level = "error"
+level = "debug"
 mode = "development"