tx7do/kratos-bootstrap
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: config.

Browse Source
This commit is contained in:
Bobo
2025-06-02 15:12:30 +08:00
parent f7166c40b0
commit 13aa5042b4
12 changed files with 37 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bootstrap/bootstrap.go
View File

@@ -9,7 +9,6 @@ import (
kratosRegistry "github.com/go-kratos/kratos/v2/registry"
"github.com/go-kratos/kratos/v2/transport"
"github.com/tx7do/kratos-bootstrap/config"
"github.com/tx7do/kratos-bootstrap/logger"
"github.com/tx7do/kratos-bootstrap/tracer"
@@ -43,28 +42,28 @@ func NewApp(ll log.Logger, rr kratosRegistry.Registrar, srv ...transport.Server)
// DoBootstrap 执行引导
func DoBootstrap(serviceInfo *utils.ServiceInfo) (*conf.Bootstrap, log.Logger, kratosRegistry.Registrar) {
// inject command flags
Flags := config.NewCommandFlags()
Flags := NewCommandFlags()
Flags.Init()
var err error
// load configs
if err = config.LoadBootstrapConfig(Flags.Conf); err != nil {
if err = LoadBootstrapConfig(Flags.Conf); err != nil {
panic(fmt.Sprintf("load config failed: %v", err))
}
// init logger
ll := logger.NewLoggerProvider(config.GetBootstrapConfig().Logger, serviceInfo)
ll := logger.NewLoggerProvider(GetBootstrapConfig().Logger, serviceInfo)
// init registrar
reg := NewRegistry(config.GetBootstrapConfig().Registry)
reg := NewRegistry(GetBootstrapConfig().Registry)
// init tracer
if err = tracer.NewTracerProvider(config.GetBootstrapConfig().Trace, serviceInfo); err != nil {
if err = tracer.NewTracerProvider(GetBootstrapConfig().Trace, serviceInfo); err != nil {
panic(fmt.Sprintf("init tracer failed: %v", err))
}
return config.GetBootstrapConfig(), ll, reg
return GetBootstrapConfig(), ll, reg
}
type InitApp func(logger log.Logger, registrar kratosRegistry.Registrar, bootstrap *conf.Bootstrap) (*kratos.App, func(), error)

2
config/bootstrap_config.go → bootstrap/bootstrap_config.go
View File

@@ -1,4 +1,4 @@
package config
package bootstrap
import conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"

3
bootstrap/bootstrap_test.go
View File

@@ -8,7 +8,6 @@ import (
"github.com/go-kratos/kratos/v2/registry"
v1 "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
"github.com/tx7do/kratos-bootstrap/config"
)
func initApp(logger log.Logger, registrar registry.Registrar, _ *v1.Bootstrap) (*kratos.App, func(), error) {
@@ -35,7 +34,7 @@ func initAppEx(logger log.Logger, registrar registry.Registrar, _ *v1.Bootstrap,
func TestCustomBootstrap(t *testing.T) {
customCfg := &CustomConfig{}
config.RegisterConfig(customCfg)
RegisterConfig(customCfg)
Service.SetName("test")
Service.SetVersion("v0.0.1")

2
config/config.go → bootstrap/config.go
View File

@@ -1,4 +1,4 @@
package config
package bootstrap
import (
"github.com/go-kratos/kratos/v2/config"

6
config/config_test.go → bootstrap/config_test.go
View File

@@ -1,6 +1,8 @@
package config
package bootstrap
import "testing"
import (
"testing"
)
func TestRegisterConfig(t *testing.T) {
var cfg struct {

2
config/flag.go → bootstrap/flag.go
View File

@@ -1,4 +1,4 @@
package config
package bootstrap
import (
"flag"

31
bootstrap/go.mod
View File

@@ -8,10 +8,24 @@ replace (
github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.4.1
github.com/tx7do/kratos-bootstrap/api => ../api
github.com/tx7do/kratos-bootstrap/config => ../config
github.com/tx7do/kratos-bootstrap/logger => ../logger
github.com/tx7do/kratos-bootstrap/registry => ../registry
github.com/tx7do/kratos-bootstrap/registry/consul => ../registry/consul
github.com/tx7do/kratos-bootstrap/registry/etcd => ../registry/etcd
github.com/tx7do/kratos-bootstrap/registry/eureka => ../registry/eureka
github.com/tx7do/kratos-bootstrap/registry/kubernetes => ../registry/kubernetes
github.com/tx7do/kratos-bootstrap/registry/nacos => ../registry/nacos
github.com/tx7do/kratos-bootstrap/registry/polaris => ../registry/polaris
github.com/tx7do/kratos-bootstrap/registry/servicecomb => ../registry/servicecomb
github.com/tx7do/kratos-bootstrap/registry/zookeeper => ../registry/zookeeper
github.com/tx7do/kratos-bootstrap/remoteconfig/apollo => ../remoteconfig/apollo
github.com/tx7do/kratos-bootstrap/remoteconfig/consul => ../remoteconfig/consul
github.com/tx7do/kratos-bootstrap/remoteconfig/etcd => ../remoteconfig/etcd
github.com/tx7do/kratos-bootstrap/remoteconfig/kubernetes => ../remoteconfig/kubernetes
github.com/tx7do/kratos-bootstrap/remoteconfig/nacos => ../remoteconfig/nacos
github.com/tx7do/kratos-bootstrap/remoteconfig/polaris => ../remoteconfig/polaris
github.com/tx7do/kratos-bootstrap/tracer => ../tracer
github.com/tx7do/kratos-bootstrap/utils => ../utils
)
@@ -22,7 +36,6 @@ require (
github.com/olekukonko/tablewriter v1.0.7
github.com/spf13/cobra v1.9.1
github.com/tx7do/kratos-bootstrap/api v0.0.21
github.com/tx7do/kratos-bootstrap/config v0.0.10
github.com/tx7do/kratos-bootstrap/logger v0.0.10
github.com/tx7do/kratos-bootstrap/registry v0.1.0
github.com/tx7do/kratos-bootstrap/registry/consul v0.1.0
@@ -32,6 +45,12 @@ require (
github.com/tx7do/kratos-bootstrap/registry/nacos v0.1.0
github.com/tx7do/kratos-bootstrap/registry/servicecomb v0.1.0
github.com/tx7do/kratos-bootstrap/registry/zookeeper v0.1.0
github.com/tx7do/kratos-bootstrap/remoteconfig/apollo v0.1.0
github.com/tx7do/kratos-bootstrap/remoteconfig/consul v0.1.0
github.com/tx7do/kratos-bootstrap/remoteconfig/etcd v0.1.0
github.com/tx7do/kratos-bootstrap/remoteconfig/kubernetes v0.1.0
github.com/tx7do/kratos-bootstrap/remoteconfig/nacos v0.1.1
github.com/tx7do/kratos-bootstrap/remoteconfig/polaris v0.1.0
github.com/tx7do/kratos-bootstrap/tracer v0.0.10
github.com/tx7do/kratos-bootstrap/utils v0.1.3
golang.org/x/tools v0.33.0
@@ -154,12 +173,6 @@ require (
github.com/tencentcloud/tencentcloud-cls-sdk-go v1.0.11 // indirect
github.com/tinylib/msgp v1.3.0 // indirect
github.com/tjfoc/gmsm v1.4.1 // indirect
github.com/tx7do/kratos-bootstrap/remoteconfig/apollo v0.1.0 // indirect
github.com/tx7do/kratos-bootstrap/remoteconfig/consul v0.1.0 // indirect
github.com/tx7do/kratos-bootstrap/remoteconfig/etcd v0.1.0 // indirect
github.com/tx7do/kratos-bootstrap/remoteconfig/kubernetes v0.1.0 // indirect
github.com/tx7do/kratos-bootstrap/remoteconfig/nacos v0.1.0 // indirect
github.com/tx7do/kratos-bootstrap/remoteconfig/polaris v0.1.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.etcd.io/etcd/api/v3 v3.6.0 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.6.0 // indirect

26
bootstrap/go.sum
View File

@@ -628,32 +628,6 @@ github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn
github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho=
github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/tx7do/kratos-bootstrap/registry/consul v0.1.0 h1:O25Fb6c7pK2wQcaCsek3Rr5aWFwhyd493onVPwMKCd0=
github.com/tx7do/kratos-bootstrap/registry/consul v0.1.0/go.mod h1:sQeHz3LTab9nai22ID++nY1Epixljh/XbXWG84lHskY=
github.com/tx7do/kratos-bootstrap/registry/etcd v0.1.0 h1:hRjBltNtwxo6Tq10Xg4VJa3PQXKpmLgIqk3+Pkc/Q20=
github.com/tx7do/kratos-bootstrap/registry/etcd v0.1.0/go.mod h1:KlKs9hUA0rLr3oXddz/Svp+O83YDSNBSrMtNj/8fUHE=
github.com/tx7do/kratos-bootstrap/registry/eureka v0.1.0 h1:nF7O5At2lkYDOJnYDupvF84nXFYdHoIIOnk2SltFtT4=
github.com/tx7do/kratos-bootstrap/registry/eureka v0.1.0/go.mod h1:7DrS4kWWyjPGYLU6ZK66yixCsVVrLBokJM/zVRhWsBU=
github.com/tx7do/kratos-bootstrap/registry/kubernetes v0.1.0 h1:g9WKluXphQKn8+Cqf2zaQ6MZ/CKfuWHAOFUWMYhSJ8A=
github.com/tx7do/kratos-bootstrap/registry/kubernetes v0.1.0/go.mod h1:cnTOKn2L1zhySWTyA8zIpOyKryqCzH9jj0x+dFSF7s0=
github.com/tx7do/kratos-bootstrap/registry/nacos v0.1.0 h1:u/mJlI5CdPsHrfPOhzcS1fT72yLRkLu50lhYwkXYZtM=
github.com/tx7do/kratos-bootstrap/registry/nacos v0.1.0/go.mod h1:/sBbHxWAcCAj4trjmguwViS/za2CelOTQPnDKExbo74=
github.com/tx7do/kratos-bootstrap/registry/servicecomb v0.1.0 h1:sJZwmEzdUzC4qn5+tyTjujIl/EP4pq4Ve9RhXAp2T2M=
github.com/tx7do/kratos-bootstrap/registry/servicecomb v0.1.0/go.mod h1:3J4HMpqYKaYMaHeQ2JGm9LiLCj0HEpbJEMNTfi/5yps=
github.com/tx7do/kratos-bootstrap/registry/zookeeper v0.1.0 h1:jnb4mKxhHY3fjofEsuT47YC6id98ePGqeOvwsqjo4Pw=
github.com/tx7do/kratos-bootstrap/registry/zookeeper v0.1.0/go.mod h1:J1djr1sRj0bgYqweR+lm4xADePt6oC2HhAr4xNyYep4=
github.com/tx7do/kratos-bootstrap/remoteconfig/apollo v0.1.0 h1:gEi8ukkZ7+9QWi5yvc3u2LX4Tmcro5QSrqrt1dhGidY=
github.com/tx7do/kratos-bootstrap/remoteconfig/apollo v0.1.0/go.mod h1:No4jfTwG6yGPaxUkbRPOQg8rrwiAsoYPEIvajfT5TBw=
github.com/tx7do/kratos-bootstrap/remoteconfig/consul v0.1.0 h1:QaZq/fbIEdPzsG5PsxLLwxFz8K4EwJsb+drZedjRxmo=
github.com/tx7do/kratos-bootstrap/remoteconfig/consul v0.1.0/go.mod h1:DfV9MOzBhQbjrcJJo4yzBLl2e87gw4pxG0rrp6aN/Fk=
github.com/tx7do/kratos-bootstrap/remoteconfig/etcd v0.1.0 h1:XRMZlAmgebrsx4pJJNR7XqNiPNEb//1Ovmj8M2xJGO8=
github.com/tx7do/kratos-bootstrap/remoteconfig/etcd v0.1.0/go.mod h1:bnpvKsNputwma0ddQ8b5IEPlNy2MYFmYi6Xf0F7m18o=
github.com/tx7do/kratos-bootstrap/remoteconfig/kubernetes v0.1.0 h1:yPjm22Iu/szERlog8KIwDm1DWidij4U8/cpFN63Ei4A=
github.com/tx7do/kratos-bootstrap/remoteconfig/kubernetes v0.1.0/go.mod h1:53m4kOfvXfyrIjUq/ZK7hXY5LraJFbWrR4y9Qqkjlp0=
github.com/tx7do/kratos-bootstrap/remoteconfig/nacos v0.1.0 h1:clGiOIkrV+5ICVxo2UXzLofbHgSNeQQ3ktmnSBtC6mI=
github.com/tx7do/kratos-bootstrap/remoteconfig/nacos v0.1.0/go.mod h1:RcCVpBOkRkpVdX8m5EdevwFy91EzXA+TocLncNRG4j4=
github.com/tx7do/kratos-bootstrap/remoteconfig/polaris v0.1.0 h1:mmJL9YXmspyRfKr7LbYE0e5cNpRiVpzZppE/QHOzVM0=
github.com/tx7do/kratos-bootstrap/remoteconfig/polaris v0.1.0/go.mod h1:43O4L+Xe6fItWsBMSYAmrGjxRXVKzreOxD1H01U5uwE=
github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=

2
config/options.go → bootstrap/remote_config.go
View File

@@ -1,4 +1,4 @@
package config
package bootstrap
import (
"github.com/go-kratos/kratos/v2/config"

145
config/go.mod
View File

@@ -1,145 +0,0 @@
module github.com/tx7do/kratos-bootstrap/config
go 1.24.0
toolchain go1.24.3
replace (
github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.4.1
github.com/tx7do/kratos-bootstrap/api => ../api
github.com/tx7do/kratos-bootstrap/utils => ../utils
)
require (
github.com/go-kratos/kratos/v2 v2.8.4
github.com/tx7do/kratos-bootstrap/api v0.0.21
github.com/tx7do/kratos-bootstrap/remoteconfig/apollo v0.1.0
github.com/tx7do/kratos-bootstrap/remoteconfig/consul v0.1.0
github.com/tx7do/kratos-bootstrap/remoteconfig/etcd v0.1.0
github.com/tx7do/kratos-bootstrap/remoteconfig/kubernetes v0.1.0
github.com/tx7do/kratos-bootstrap/remoteconfig/nacos v0.1.0
github.com/tx7do/kratos-bootstrap/remoteconfig/polaris v0.1.0
github.com/tx7do/kratos-bootstrap/utils v0.1.3
)
require (
dario.cat/mergo v1.0.2 // indirect
github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.8 // indirect
github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 // indirect
github.com/alibabacloud-go/darabonba-array v0.1.0 // indirect
github.com/alibabacloud-go/darabonba-encode-util v0.0.2 // indirect
github.com/alibabacloud-go/darabonba-map v0.0.2 // indirect
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.7 // indirect
github.com/alibabacloud-go/darabonba-signature-util v0.0.7 // indirect
github.com/alibabacloud-go/darabonba-string v1.0.2 // indirect
github.com/alibabacloud-go/debug v1.0.1 // indirect
github.com/alibabacloud-go/endpoint-util v1.1.1 // indirect
github.com/alibabacloud-go/kms-20160120/v3 v3.2.3 // indirect
github.com/alibabacloud-go/openapi-util v0.1.1 // indirect
github.com/alibabacloud-go/tea v1.3.9 // indirect
github.com/alibabacloud-go/tea-utils/v2 v2.0.7 // indirect
github.com/aliyun/alibaba-cloud-sdk-go v1.63.107 // indirect
github.com/aliyun/alibabacloud-dkms-gcs-go-sdk v0.5.1 // indirect
github.com/aliyun/alibabacloud-dkms-transfer-go-sdk v0.1.9 // indirect
github.com/aliyun/aliyun-secretsmanager-client-go v1.1.5 // indirect
github.com/aliyun/credentials-go v1.4.6 // indirect
github.com/apolloconfig/agollo/v4 v4.4.0 // indirect
github.com/armon/go-metrics v0.5.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/clbanning/mxj/v2 v2.7.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
github.com/hashicorp/consul/api v1.32.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-metrics v0.5.4 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/hashicorp/serf v0.10.2 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nacos-group/nacos-sdk-go/v2 v2.3.2 // indirect
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
github.com/orcaman/concurrent-map v1.0.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.22.0 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.64.0 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/sagikazarmark/locafero v0.9.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.14.0 // indirect
github.com/spf13/cast v1.9.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/spf13/viper v1.20.1 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tjfoc/gmsm v1.4.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.etcd.io/etcd/api/v3 v3.6.0 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.6.0 // indirect
go.etcd.io/etcd/client/v3 v3.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.38.0 // indirect
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect
golang.org/x/net v0.40.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.14.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/time v0.11.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
google.golang.org/grpc v1.72.2 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.33.1 // indirect
k8s.io/apimachinery v0.33.1 // indirect
k8s.io/client-go v0.33.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

1109
config/go.sum
View File

File diff suppressed because it is too large Load Diff

2
tag.bat
View File

@@ -25,8 +25,6 @@ git tag registry/polaris/v0.1.0 --force
git tag registry/servicecomb/v0.1.0 --force
git tag registry/zookeeper/v0.1.0 --force
git tag config/v0.0.10 --force
git tag remoteconfig/apollo/v0.1.0 --force
git tag remoteconfig/consul/v0.1.0 --force
git tag remoteconfig/etcd/v0.1.0 --force