refactor: reorganize buildinfo and update dependencies

Author: kooksee

buildinfo/build.go

@@ -0,0 +1,29 @@
+package buildinfo
+
+var domain string
+var mainPath string
+
+// git rev-parse HEAD
+// git describe --always --abbrev=7 --dirty
+var (
+	// commitID, git commit id
+	commitID string
+
+	// buildTime, build time, rfc3339
+	buildTime string
+)
+
+// git describe --tags --abbrev=0
+// git tag --sort=committerdate | tail -n 1
+var (
+	// version, git tag
+	version string
+
+	// project, project name
+	project string
+)
+
+var (
+	// release tag
+	release string
+)

buildinfo/version.go

@@ -11,42 +11,6 @@ import (
 	v "github.com/pubgo/funk/v2/buildinfo/version"
 )
 
-func CommitID() string       { return commitID }
-func MainPath() string       { return mainPath }
-func Version() string        { return version }
-func ReleaseVersion() string { return release }
-func BuildTime() string      { return buildTime }
-func Project() string        { return project }
-func Domain() string         { return domain }
-
-var domain string
-var mainPath string
-
-// git rev-parse HEAD
-// git describe --always --abbrev=7 --dirty
-var (
-	// commitID, git commit id
-	commitID string
-
-	// buildTime, build time, rfc3339
-	buildTime string
-)
-
-// git describe --tags --abbrev=0
-// git tag --sort=committerdate | tail -n 1
-var (
-	// version, git tag
-	version string
-
-	// project, project name
-	project string
-)
-
-var (
-	// release tag
-	release string
-)
-
 func init() {
 	bi, ok := debug.ReadBuildInfo()
 	if !ok {

cmds/testmain/main.go

@@ -10,7 +10,7 @@ import (
 	"github.com/urfave/cli/v3"
 
 	"github.com/pubgo/funk/v2/assert"
-	"github.com/pubgo/funk/v2/buildinfo"
+	"github.com/pubgo/funk/v2/buildinfo/version"
 	"github.com/pubgo/funk/v2/cliutils"
 	"github.com/pubgo/funk/v2/cmds/versioncmd"
 	"github.com/pubgo/funk/v2/ctxutil"
@@ -22,7 +22,7 @@ func main() {
 		Suggest:                true,
 		UseShortOptionHandling: true,
 		ShellComplete:          cli.DefaultAppComplete,
-		Version:                buildinfo.Version(),
+		Version:                version.Version(),
 		Commands: []*cli.Command{
 			versioncmd.New(),
 		},

cmds/versioncmd/cmd.go

@@ -4,18 +4,17 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/urfave/cli/v3"
-
-	"github.com/pubgo/funk/v2/buildinfo"
+	"github.com/pubgo/funk/v2/buildinfo/version"
 	"github.com/pubgo/funk/v2/pretty"
 	"github.com/pubgo/funk/v2/recovery"
 	"github.com/pubgo/funk/v2/running"
+	"github.com/urfave/cli/v3"
 )
 
 func New() *cli.Command {
 	return &cli.Command{
 		Name:  "version",
-		Usage: fmt.Sprintf("%s version info", buildinfo.Project()),
+		Usage: fmt.Sprintf("%s version info", version.Project()),
 		Commands: []*cli.Command{
 			{
 				Name:  "validate",

component/cloudevent/client.go

@@ -11,7 +11,6 @@ import (
 	"github.com/nats-io/nats.go/jetstream"
 	ants "github.com/panjf2000/ants/v2"
 	"github.com/pubgo/funk/v2/assert"
-	"github.com/pubgo/funk/v2/buildinfo"
 	"github.com/pubgo/funk/v2/buildinfo/version"
 	"github.com/pubgo/funk/v2/component/lifecycle"
 	"github.com/pubgo/funk/v2/component/natsclient"
@@ -138,7 +137,7 @@ func (c *Client) initConsumer() (r error) {
 				// A streaming consumer can only have one corresponding job handler
 				assert.If(c.consumers[streamName][consumerName] != nil, "consumer %s already exists", consumerName)
 
-				metadata := map[string]string{"version": fmt.Sprintf("%s/%s", buildinfo.Project(), buildinfo.Version())}
+				metadata := map[string]string{"version": fmt.Sprintf("%s/%s", version.Project(), version.Version())}
 				consumerCfg := jetstream.ConsumerConfig{
 					Name:     consumerName,
 					Durable:  consumerName,

migrates/entmigrates/aaa.go renamed to component/entmigrates/aaa.go

@@ -22,7 +22,7 @@ import (
 	"gorm.io/gorm/logger"
 
 	"github.com/pubgo/funk/v2/assert"
-	"github.com/pubgo/funk/v2/buildinfo"
+	"github.com/pubgo/funk/v2/buildinfo/version"
 	"github.com/pubgo/funk/v2/config"
 	"github.com/pubgo/funk/v2/errors"
 	"github.com/pubgo/funk/v2/generic"
@@ -149,7 +149,7 @@ func %s() *entmigrates.Migration {
 		DataMigrate:  nil,
 	}
 }
-`, name, name, fmt.Sprint(now.String(), " ", buildinfo.Version()), name))
+`, name, name, fmt.Sprint(now.String(), " ", version.Version()), name))
 
 	filename = filepath.Join(g.config.MigrationPath, fmt.Sprintf("%s.go", name))
 	err = os.WriteFile(filename, []byte(genFile.GoString()), 0o644)

migrates/entmigrates/config.go renamed to component/entmigrates/config.go

@@ -28,7 +28,7 @@ func New(p Param) *Client {
 
 	nc := assert.Must1(nats.Connect(p.Cfg.Url, func(o *nats.Options) error {
 		o.AllowReconnect = true
-		o.Name = fmt.Sprintf("%s/%s/%s", running.Hostname, running.Project, running.InstanceID)
+		o.Name = fmt.Sprintf("%s/%s/%s", running.Hostname, running.Project(), running.InstanceID)
 		return nil
 	}))