feat(run): enhance command flags and config loading

- Refactor flag parsing to support default config bytes input
- Add comprehensive CLI flag bindings for server, JWT, database,
  registry, Kubernetes, and other configurations
- Improve configuration loading logic with better error handling
- Introduce bytes source for in-memory config loading
- Update Dockerfile CMD to include custom config and output paths
- Modify cluster endpoint validation in client config generation
- Remove unused GlobalEmail field from Bootstrap proto message
- Add helper methods for RegistryType enum checks
- Adjust default values in server.yaml for cluster settings

Author: aide-cloud

Dockerfile

@@ -56,4 +56,4 @@ EXPOSE 8080
 EXPOSE 9090
 
 # 运行应用
-CMD ["rabbit", "run"]
+CMD ["rabbit", "run", "-c", "/moon/config", "-o", "~/.rabbit"]

cmd/run/client.go

@@ -15,6 +15,7 @@ import (
 	"google.golang.org/protobuf/types/known/durationpb"
 
 	"github.com/aide-family/magicbox/load"
+	"github.com/aide-family/magicbox/strutil"
 	"github.com/aide-family/magicbox/strutil/cnst"
 	"github.com/aide-family/rabbit/internal/conf"
 	"github.com/aide-family/rabbit/internal/server"
@@ -70,7 +71,7 @@ func generateClientConfig(
 		clientConfig.Kubernetes = bc.GetKubernetes()
 	}
 
-	if clusterConfig != nil {
+	if clusterConfig != nil && strutil.IsNotEmpty(clusterConfig.GetEndpoints()) {
 		clientConfig.Cluster = clusterConfig
 	} else {
 		// 如果没有配置，使用默认值

cmd/run/flags.go

@@ -10,6 +10,7 @@ import (
 	"github.com/aide-family/magicbox/strutil"
 	"github.com/aide-family/rabbit/cmd"
 	"github.com/aide-family/rabbit/internal/conf"
+	"github.com/aide-family/rabbit/pkg/config"
 	"github.com/aide-family/rabbit/pkg/enum"
 )
 
@@ -18,76 +19,93 @@ type Flags struct {
 	configPath             string
 	clientConfigOutputPath string
 
-	httpAddress string
-	httpNetwork string
-	httpTimeout string
-	grpcAddress string
-	grpcNetwork string
-	grpcTimeout string
-	environment string
+	*conf.Bootstrap
+	environment     string
+	httpTimeout     string
+	grpcTimeout     string
+	jwtExpire       string
+	eventBusTimeout string
+	registryType    string
 }
 
 var flags Flags
 
-func (f *Flags) addFlags(c *cobra.Command) {
-	c.Flags().StringVarP(&f.configPath, "config", "c", "./config", "config file (default is ./config)")
-	c.Flags().StringVarP(&f.clientConfigOutputPath, "client-config-output", "o", "~/.rabbit/config.yaml", "client config output file (default is ~/.rabbit/config.yaml)")
+func (f *Flags) addFlags(c *cobra.Command, bc *conf.Bootstrap) {
+	f.Bootstrap = bc
+	c.Flags().StringVarP(&f.configPath, "config", "c", "", `Example: -c=./config/, --config="./config/"`)
+	c.Flags().StringVarP(&f.clientConfigOutputPath, "client-config-output", "o", "~/.rabbit/", `Example: -o=./client/, --client-config-output="~/.rabbit/"`)
 
-	c.Flags().StringVar(&f.httpAddress, "http-address", "0.0.0.0:8080", "http address (default is 0.0.0.0:8080)")
-	c.Flags().StringVar(&f.httpNetwork, "http-network", "tcp", "http network (default is tcp)")
-	c.Flags().StringVar(&f.httpTimeout, "http-timeout", "10s", "http timeout (default is 10s)")
-	c.Flags().StringVar(&f.grpcAddress, "grpc-address", "0.0.0.0:9090", "grpc address (default is 0.0.0.0:9090)")
-	c.Flags().StringVar(&f.grpcNetwork, "grpc-network", "tcp", "grpc network (default is tcp)")
-	c.Flags().StringVar(&f.grpcTimeout, "grpc-timeout", "10s", "grpc timeout (default is 10s)")
-	c.Flags().StringVarP(&f.environment, "environment", "e", "PROD", "environment (DEV, TEST, PREVIEW, PROD)")
+	c.Flags().StringVar(&f.environment, "environment", f.Environment.String(), `Example: --environment="DEV", --environment="TEST", --environment="PREVIEW", --environment="PROD"`)
+	c.Flags().StringVar(&f.Server.Http.Address, "http-address", f.Server.Http.Address, `Example: --http-address="0.0.0.0:8080", --http-address=":8080"`)
+	c.Flags().StringVar(&f.Server.Http.Network, "http-network", f.Server.Http.Network, `Example: --http-network="tcp"`)
+	c.Flags().StringVar(&f.httpTimeout, "http-timeout", f.Server.Http.Timeout.AsDuration().String(), `Example: --http-timeout="10s", --http-timeout="1m", --http-timeout="1h", --http-timeout="1d"`)
+	c.Flags().StringVar(&f.Server.Grpc.Address, "grpc-address", f.Server.Grpc.Address, `Example: --grpc-address="0.0.0.0:9090", --grpc-address=":9090"`)
+	c.Flags().StringVar(&f.Server.Grpc.Network, "grpc-network", f.Server.Grpc.Network, `Example: --grpc-network="tcp"`)
+	c.Flags().StringVar(&f.grpcTimeout, "grpc-timeout", f.Server.Grpc.Timeout.AsDuration().String(), `Example: --grpc-timeout="10s", --grpc-timeout="1m", --grpc-timeout="1h", --grpc-timeout="1d"`)
+	c.Flags().StringVar(&f.Jwt.Secret, "jwt-secret", f.Jwt.Secret, `Example: --jwt-secret="xxx"`)
+	c.Flags().StringVar(&f.jwtExpire, "jwt-expire", f.Jwt.Expire.AsDuration().String(), `Example: --jwt-expire="10s", --jwt-expire="1m", --jwt-expire="1h", --jwt-expire="1d"`)
+	c.Flags().StringVar(&f.Jwt.Issuer, "jwt-issuer", f.Jwt.Issuer, `Example: --jwt-issuer="xxx"`)
+	c.Flags().StringVar(&f.Main.Username, "main-username", f.Main.Username, `Example: --main-username="root"`)
+	c.Flags().StringVar(&f.Main.Password, "main-password", f.Main.Password, `Example: --main-password="123456"`)
+	c.Flags().StringVar(&f.Main.Host, "main-host", f.Main.Host, `Example: --main-host="localhost"`)
+	c.Flags().Int32Var(&f.Main.Port, "main-port", f.Main.Port, `Example: --main-port=3306"`)
+	c.Flags().StringVar(&f.Main.Database, "main-database", f.Main.Database, `Example: --main-database="rabbit"`)
+	c.Flags().StringVar(&f.Main.Debug, "main-debug", f.Main.Debug, `Example: --main-debug="false"`)
+	c.Flags().StringVar(&f.Main.UseSystemLogger, "main-use-system-logger", f.Main.UseSystemLogger, `Example: --main-use-system-logger="true"`)
+	c.Flags().Int32Var(&f.EventBus.WorkerCount, "event-bus-worker-count", f.EventBus.WorkerCount, `Example: --event-bus-worker-count=1"`)
+	c.Flags().StringVar(&f.eventBusTimeout, "event-bus-timeout", f.EventBus.Timeout.AsDuration().String(), `Example: --event-bus-timeout="10s", --event-bus-timeout="1m", --event-bus-timeout="1h", --event-bus-timeout="1d"`)
+	c.Flags().StringVar(&f.registryType, "registry-type", f.RegistryType.String(), `Example: --registry-type="etcd"`)
+	c.Flags().StringVar(&f.Etcd.Endpoints, "etcd-endpoints", f.Etcd.Endpoints, `Example: --etcd-endpoints="127.0.0.1:2379"`)
+	c.Flags().StringVar(&f.Etcd.Username, "etcd-username", f.Etcd.Username, `Example: --etcd-username="root"`)
+	c.Flags().StringVar(&f.Etcd.Password, "etcd-password", f.Etcd.Password, `Example: --etcd-password="123456"`)
+	c.Flags().StringVar(&f.Kubernetes.Namespace, "kubernetes-namespace", f.Kubernetes.Namespace, `Example: --kubernetes-namespace="moon"`)
+	c.Flags().StringVar(&f.Kubernetes.KubeConfig, "kubernetes-kubeconfig", f.Kubernetes.KubeConfig, `Example: --kubernetes-kubeconfig="~/.kube/config"`)
+	c.Flags().StringVar(&f.SwaggerBasicAuth.Username, "swagger-basic-auth-username", f.SwaggerBasicAuth.Username, `Example: --swagger-basic-auth-username="root"`)
+	c.Flags().StringVar(&f.SwaggerBasicAuth.Password, "swagger-basic-auth-password", f.SwaggerBasicAuth.Password, `Example: --swagger-basic-auth-password="123456"`)
+	c.Flags().StringVar(&f.MetricsBasicAuth.Username, "metrics-basic-auth-username", f.MetricsBasicAuth.Username, `Example: --metrics-basic-auth-username="root"`)
+	c.Flags().StringVar(&f.MetricsBasicAuth.Password, "metrics-basic-auth-password", f.MetricsBasicAuth.Password, `Example: --metrics-basic-auth-password="123456"`)
+	c.Flags().StringVar(&f.EnableClientConfig, "enable-client-config", f.EnableClientConfig, `Example: --enable-client-config="true"`)
+	c.Flags().StringVar(&f.EnableSwagger, "enable-swagger", f.EnableSwagger, `Example: --enable-swagger="true"`)
+	c.Flags().StringVar(&f.EnableMetrics, "enable-metrics", f.EnableMetrics, `Example: --enable-metrics="true"`)
+	c.Flags().StringVar(&f.UseDatabase, "use-database", f.UseDatabase, `Example: --use-database="true"`)
+	c.Flags().StringSliceVar(&f.ConfigPaths, "config-paths", f.ConfigPaths, `Example: --config-paths="./datasource"`)
 }
 
-func (f *Flags) applyToBootstrap(bc *conf.Bootstrap) {
-	if pointer.IsNil(bc.GetServer()) {
-		bc.Server = &conf.Server{
-			Http: &conf.Server_HTTPServer{},
-			Grpc: &conf.Server_GRPCServer{},
-		}
-	}
-	httpConf := bc.GetServer().GetHttp()
-	if pointer.IsNil(httpConf) {
-		httpConf = &conf.Server_HTTPServer{}
-		bc.Server.Http = httpConf
-	}
-	if strutil.IsEmpty(httpConf.Address) {
-		httpConf.Address = f.httpAddress
+func (f *Flags) applyToBootstrap() {
+	metadata := f.Server.Metadata
+	if pointer.IsNil(metadata) {
+		metadata = make(map[string]string)
 	}
-	if strutil.IsEmpty(httpConf.Network) {
-		httpConf.Network = f.httpNetwork
-	}
-	if httpConf.GetTimeout().AsDuration() <= 0 {
-		timeout, err := time.ParseDuration(f.httpTimeout)
-		if pointer.IsNil(err) {
-			httpConf.Timeout = durationpb.New(timeout)
+	metadata["repository"] = f.Repo
+	metadata["author"] = f.Author
+	metadata["email"] = f.Email
+	f.Server.Metadata = metadata
+	if strutil.IsNotEmpty(f.httpTimeout) {
+		if timeout, err := time.ParseDuration(f.httpTimeout); pointer.IsNil(err) {
+			f.Server.Http.Timeout = durationpb.New(timeout)
 		}
 	}
-	grpcConf := bc.GetServer().GetGrpc()
-	if pointer.IsNil(grpcConf) {
-		grpcConf = &conf.Server_GRPCServer{}
-		bc.Server.Grpc = grpcConf
-	}
-	if strutil.IsEmpty(grpcConf.Address) {
-		grpcConf.Address = f.grpcAddress
+	if strutil.IsNotEmpty(f.grpcTimeout) {
+		if timeout, err := time.ParseDuration(f.grpcTimeout); pointer.IsNil(err) {
+			f.Server.Grpc.Timeout = durationpb.New(timeout)
+		}
 	}
-	if strutil.IsEmpty(grpcConf.Network) {
-		grpcConf.Network = f.grpcNetwork
+
+	if strutil.IsNotEmpty(f.environment) {
+		f.Environment = enum.Environment(enum.Environment_value[f.environment])
 	}
-	if grpcConf.GetTimeout().AsDuration() <= 0 {
-		timeout, err := time.ParseDuration(f.grpcTimeout)
-		if pointer.IsNil(err) {
-			grpcConf.Timeout = durationpb.New(timeout)
+	if strutil.IsNotEmpty(f.jwtExpire) {
+		if expire, err := time.ParseDuration(f.jwtExpire); pointer.IsNil(err) {
+			f.Jwt.Expire = durationpb.New(expire)
 		}
 	}
-	if bc.Environment.IsUnknown() {
-		env := enum.Environment_PROD
-		if strutil.IsNotEmpty(f.environment) {
-			env = enum.Environment(enum.Environment_value[f.environment])
+	if strutil.IsNotEmpty(f.eventBusTimeout) {
+		if timeout, err := time.ParseDuration(f.eventBusTimeout); pointer.IsNil(err) {
+			f.EventBus.Timeout = durationpb.New(timeout)
 		}
-		bc.Environment = env
+	}
+
+	if strutil.IsNotEmpty(f.registryType) {
+		f.RegistryType = config.RegistryType(config.RegistryType_value[f.registryType])
 	}
 }

cmd/run/run.go

@@ -18,7 +18,7 @@ import (
 	"github.com/aide-family/rabbit/internal/server"
 )
 
-func NewCmd() *cobra.Command {
+func NewCmd(defaultServerConfigBytes []byte) *cobra.Command {
 	runCmd := &cobra.Command{
 		Use:   "run",
 		Short: "Run the Rabbit service",
@@ -28,39 +28,53 @@ func NewCmd() *cobra.Command {
 		},
 		Run: runServer,
 	}
-	flags.addFlags(runCmd)
-	return runCmd
-}
-
-func runServer(_ *cobra.Command, _ []string) {
-	flags.GlobalFlags = cmd.GetGlobalFlags()
 	var bc conf.Bootstrap
 	c := config.New(config.WithSource(
 		env.NewSource(),
-		file.NewSource(flags.configPath),
+		conf.NewBytesSource(defaultServerConfigBytes),
 	))
 	if err := c.Load(); err != nil {
 		flags.Helper.Errorw("msg", "load config failed", "error", err)
-		return
+		panic(err)
 	}
 
 	if err := c.Scan(&bc); err != nil {
 		flags.Helper.Errorw("msg", "scan config failed", "error", err)
-		return
+		panic(err)
+	}
+
+	flags.addFlags(runCmd, &bc)
+	return runCmd
+}
+
+func runServer(_ *cobra.Command, _ []string) {
+	flags.GlobalFlags = cmd.GetGlobalFlags()
+	var bc conf.Bootstrap
+	if strutil.IsNotEmpty(flags.configPath) {
+		c := config.New(config.WithSource(
+			env.NewSource(),
+			file.NewSource(flags.configPath),
+		))
+		if err := c.Load(); err != nil {
+			flags.Helper.Errorw("msg", "load config failed", "error", err)
+			return
+		}
+
+		if err := c.Scan(&bc); err != nil {
+			flags.Helper.Errorw("msg", "scan config failed", "error", err)
+			return
+		}
+		flags.Bootstrap = &bc
 	}
 
-	flags.applyToBootstrap(&bc)
-	serverConf := bc.GetServer()
-	metadata := serverConf.GetMetadata()
-	metadata["repository"] = "https://github.com/aide-family/rabbit"
-	metadata["author"] = "Aide Family"
-	metadata["email"] = "1058165620@qq.com"
+	flags.applyToBootstrap()
+	serverConf := flags.GetServer()
 	envOpts := []hello.Option{
 		hello.WithVersion(flags.Version),
 		hello.WithID(flags.Hostname),
 		hello.WithName(serverConf.GetName()),
-		hello.WithEnv(bc.GetEnvironment().String()),
-		hello.WithMetadata(metadata),
+		hello.WithEnv(flags.Environment.String()),
+		hello.WithMetadata(serverConf.GetMetadata()),
 	}
 	if serverConf.GetUseRandomID() == "true" {
 		envOpts = append(envOpts, hello.WithID(strutil.RandomID()))
@@ -76,7 +90,7 @@ func runServer(_ *cobra.Command, _ []string) {
 		"span.id", tracing.SpanID()),
 	)
 
-	app, cleanup, err := wireApp(&bc, helper)
+	app, cleanup, err := wireApp(flags.Bootstrap, helper)
 	if err != nil {
 		flags.Helper.Errorw("msg", "wireApp failed", "error", err)
 		return

config/server.yaml

@@ -43,8 +43,8 @@ eventBus:
 registryType: ${MOON_RABBIT_REGISTRY_TYPE:}
 
 cluster:
-  name: ${MOON_RABBIT_CLUSTER_NAME:rabbit}
-  endpoints: ${MOON_RABBIT_CLUSTER_ENDPOINTS:localhost:9090}
+  name: ${MOON_RABBIT_CLUSTER_NAME:moon.rabbit}
+  endpoints: ${MOON_RABBIT_CLUSTER_ENDPOINTS:}
   protocol: ${MOON_RABBIT_CLUSTER_PROTOCOL:GRPC}
   timeout: ${MOON_RABBIT_CLUSTER_TIMEOUT:10s}
 

internal/conf/conf.go

@@ -0,0 +1,73 @@
+package conf
+
+import (
+	"context"
+	"strings"
+
+	"github.com/go-kratos/kratos/v2/config"
+)
+
+var (
+	_ config.Source  = (*bytesSource)(nil)
+	_ config.Watcher = (*noOpWatcher)(nil)
+)
+
+func NewBytesSource(data []byte) config.Source {
+	d := bytesSource(data)
+	return &d
+}
+
+type bytesSource []byte
+
+// Load implements config.Source.
+func (b *bytesSource) Load() ([]*config.KeyValue, error) {
+	// Make a copy of the data to avoid external modifications
+	data := make([]byte, len(*b))
+	copy(data, *b)
+	return []*config.KeyValue{
+		{
+			Key:    "server",
+			Value:  data,
+			Format: format(*b),
+		},
+	}, nil
+}
+
+// format detects the format from the data content.
+func format(data []byte) string {
+	content := strings.TrimSpace(string(data))
+	if strings.HasPrefix(content, "{") || strings.HasPrefix(content, "[") {
+		return "json"
+	}
+	return "yaml"
+}
+
+// Watch implements config.Source.
+func (b *bytesSource) Watch() (config.Watcher, error) {
+	return newNoOpWatcher(), nil
+}
+
+type noOpWatcher struct {
+	ctx    context.Context
+	cancel context.CancelFunc
+}
+
+func newNoOpWatcher() config.Watcher {
+	ctx, cancel := context.WithCancel(context.Background())
+	return &noOpWatcher{
+		ctx:    ctx,
+		cancel: cancel,
+	}
+}
+
+// Next implements config.Watcher.
+func (w *noOpWatcher) Next() ([]*config.KeyValue, error) {
+	<-w.ctx.Done()
+	return nil, w.ctx.Err()
+}
+
+// Stop implements config.Watcher.
+func (w *noOpWatcher) Stop() error {
+	w.cancel()
+	return nil
+}

internal/conf/conf.proto

@@ -11,7 +11,7 @@ option go_package = "github.com/aide-family/rabbit/internal/conf;conf";
 message Bootstrap {
 	rabbit.enum.Environment environment = 1;
 	Server server = 2;
-	GlobalEmail globalEmail = 3;
+	// GlobalEmail globalEmail = 3;
 	JWT jwt = 4;
 	map<string, rabbit.config.MySQLConfig> biz = 5;
 	rabbit.config.MySQLConfig main = 6;

main.go

@@ -61,7 +61,7 @@ func main() {
 		config.NewCmd(defaultServerConfig),
 		delete.NewCmd(),
 		get.NewCmd(),
-		run.NewCmd(),
+		run.NewCmd(defaultServerConfig),
 		send.NewCmd(),
 		version.NewCmd(),
 	}

pkg/config/config.go

@@ -0,0 +1,13 @@
+package config
+
+func (e RegistryType) IsUnknown() bool {
+	return e == RegistryType_UNKNOWN
+}
+
+func (e RegistryType) IsEtcd() bool {
+	return e == RegistryType_ETCD
+}
+
+func (e RegistryType) IsKubernetes() bool {
+	return e == RegistryType_KUBERNETES
+}