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

feat: refactor tls utils.

Browse Source
This commit is contained in:
tx7do
2024-11-19 13:02:41 +08:00
parent 6b606eb032
commit c7f54ac1e2
36 changed files with 159 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
database/cassandra/client.go
View File

@@ -32,25 +32,8 @@ func NewCassandraClient(cfg *conf.Bootstrap, l *log.Helper) *gocql.Session {
var tlsCfg *tls.Config
var err error
if cfg.Data.Cassandra.Tls.File != nil {
if tlsCfg, err = utils.LoadServerTlsConfigFile(
cfg.Data.Cassandra.Tls.File.GetKeyPath(),
cfg.Data.Cassandra.Tls.File.GetCertPath(),
cfg.Data.Cassandra.Tls.File.GetCaPath(),
cfg.Data.Cassandra.Tls.InsecureSkipVerify,
); err != nil {
panic(err)
}
}
if tlsCfg == nil && cfg.Data.Cassandra.Tls.Config != nil {
if tlsCfg, err = utils.LoadServerTlsConfig(
cfg.Data.Cassandra.Tls.Config.GetKeyPem(),
cfg.Data.Cassandra.Tls.Config.GetCertPem(),
cfg.Data.Cassandra.Tls.Config.GetCaPem(),
cfg.Data.Cassandra.Tls.InsecureSkipVerify,
); err != nil {
panic(err)
}
if tlsCfg, err = utils.LoadServerTlsConfig(cfg.Data.Cassandra.Tls); err != nil {
panic(err)
}
if tlsCfg != nil {

6
database/cassandra/go.mod
View File

@@ -9,8 +9,8 @@ replace github.com/tx7do/kratos-bootstrap/api => ../../api
require (
github.com/go-kratos/kratos/v2 v2.8.2
github.com/gocql/gocql v1.7.0
github.com/tx7do/kratos-bootstrap/api v0.0.6
github.com/tx7do/kratos-bootstrap/utils v0.1.0
github.com/tx7do/kratos-bootstrap/api v0.0.8
github.com/tx7do/kratos-bootstrap/utils v0.1.2
)
require (
@@ -18,6 +18,6 @@ require (
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/kr/text v0.2.0 // indirect
golang.org/x/sync v0.9.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
google.golang.org/protobuf v1.35.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
)

8
database/cassandra/go.sum
View File

@@ -27,11 +27,11 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/tx7do/kratos-bootstrap/utils v0.1.0 h1:nY1VtIVnnGsOSj4HVhjFBk3qTxjIKDPV7lVR8ZT+gFk=
github.com/tx7do/kratos-bootstrap/utils v0.1.0/go.mod h1:AuXQsL0dtIoOKmAaxiJnBg/9inx7kXX/z7YQeLJ1qmw=
github.com/tx7do/kratos-bootstrap/utils v0.1.2 h1:hgPYYiO1bLL9vfmozY3fqPY6Yx3prlv2EEV9hFWhKIY=
github.com/tx7do/kratos-bootstrap/utils v0.1.2/go.mod h1:T8Mnd4+uFBXqH320U10+NXyjiGY5dbRM9TubxLhFlqQ=
golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=