diff --git a/go.mod b/go.mod index c709e9ba4..a5fecb5ee 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( firebase.google.com/go v3.13.0+incompatible github.com/OpenIMSDK/protocol v0.0.48 - github.com/OpenIMSDK/tools v0.0.29 + github.com/OpenIMSDK/tools v0.0.31 github.com/bwmarrin/snowflake v0.3.0 // indirect github.com/dtm-labs/rockscache v0.1.1 github.com/gin-gonic/gin v1.9.1 @@ -31,7 +31,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) -require github.com/google/uuid v1.3.1 +require github.com/google/uuid v1.5.0 require ( github.com/IBM/sarama v1.41.3 @@ -94,8 +94,8 @@ require ( github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect - github.com/klauspost/compress v1.16.7 // indirect - github.com/klauspost/cpuid/v2 v2.2.5 // indirect + github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/leodido/go-urn v1.2.4 // indirect github.com/lithammer/shortuuid v3.0.0+incompatible // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect @@ -129,7 +129,7 @@ require ( go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.3.0 // indirect - golang.org/x/net v0.17.0 // indirect + golang.org/x/net v0.19.0 // indirect golang.org/x/oauth2 v0.13.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect @@ -141,7 +141,7 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect - gorm.io/gorm v1.23.8 // indirect + gorm.io/gorm v1.25.4 // indirect stathat.com/c/consistent v1.0.0 // indirect ) diff --git a/go.sum b/go.sum index b7b40632f..fbd9366c3 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,8 @@ github.com/IBM/sarama v1.41.3 h1:MWBEJ12vHC8coMjdEXFq/6ftO6DUZnQlFYcxtOJFa7c= github.com/IBM/sarama v1.41.3/go.mod h1:Xxho9HkHd4K/MDUo/T/sOqwtX/17D33++E9Wib6hUdQ= github.com/OpenIMSDK/protocol v0.0.48 h1:8MIMjyzJRsruYhVv2ZKArFiOveroaofDOb3dlAdgjsw= github.com/OpenIMSDK/protocol v0.0.48/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= -github.com/OpenIMSDK/tools v0.0.29 h1:NS4PEwYl9sX3SWsMjDOLVxMo3LcTWREMr+2cjzWjcqc= -github.com/OpenIMSDK/tools v0.0.29/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI= +github.com/OpenIMSDK/tools v0.0.31 h1:fSrhcPTvHEMTSyrJZDupe730mL4nuhvSOUP/BaZiHaY= +github.com/OpenIMSDK/tools v0.0.31/go.mod h1:wBfR5CYmEyvxl03QJbTkhz1CluK6J4/lX0lviu8JAjE= github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= @@ -152,8 +152,8 @@ github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ= github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= @@ -194,7 +194,6 @@ github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= @@ -205,12 +204,12 @@ github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= +github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -402,8 +401,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= @@ -531,8 +530,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE= -gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= +gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw= +gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/pkg/rpcclient/third.go b/pkg/rpcclient/third.go index 48a537112..0d5708fc8 100755 --- a/pkg/rpcclient/third.go +++ b/pkg/rpcclient/third.go @@ -16,12 +16,10 @@ package rpcclient import ( "context" - "net/url" - "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "google.golang.org/grpc" + "net/url" "github.com/OpenIMSDK/protocol/third" "github.com/OpenIMSDK/tools/discoveryregistry" diff --git a/tools/component/component.go b/tools/component/component.go index 220b845ee..4200b46f5 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -15,44 +15,26 @@ package main import ( - "context" "errors" "flag" "fmt" - "net" - "net/url" "os" "strings" "time" - "github.com/IBM/sarama" + "github.com/OpenIMSDK/tools/component" "github.com/OpenIMSDK/tools/errs" - "github.com/go-zookeeper/zk" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" - "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/minio/minio-go/v7" - "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/redis/go-redis/v9" "gopkg.in/yaml.v3" ) const ( // defaultCfgPath is the default path of the configuration file. - defaultCfgPath = "../../../../../config/config.yaml" - minioHealthCheckDuration = 1 - maxRetry = 300 - componentStartErrCode = 6000 - configErrCode = 6001 - mongoConnTimeout = 30 * time.Second -) - -const ( - colorRed = 31 - colorGreen = 32 - colorYellow = 33 + defaultCfgPath = "../../../../../config/config.yaml" + maxRetry = 300 + componentStartErrCode = 6000 + configErrCode = 6001 ) var ( @@ -103,16 +85,16 @@ func main() { for _, check := range checks { str, err := check.function() if err != nil { - errorPrint(fmt.Sprintf("Starting %s failed, %v", check.name, err)) + component.ErrorPrint(fmt.Sprintf("Starting %s failed, %v", check.name, err)) allSuccess = false break } else { - successPrint(fmt.Sprintf("%s connected successfully, %s", check.name, str)) + component.SuccessPrint(fmt.Sprintf("%s connected successfully, %s", check.name, str)) } } if allSuccess { - successPrint("All components started successfully!") + component.SuccessPrint("All components started successfully!") return } @@ -120,19 +102,6 @@ func main() { os.Exit(1) } -func exactIP(urll string) string { - u, _ := url.Parse(urll) - host, _, err := net.SplitHostPort(u.Host) - if err != nil { - host = u.Host - } - if strings.HasSuffix(host, ":") { - host = host[0 : len(host)-1] - } - - return host -} - // Helper function to get environment variable or default value func getEnv(key, fallback string) string { if value, exists := os.LookupEnv(key); exists { @@ -143,47 +112,25 @@ func getEnv(key, fallback string) string { // checkMongo checks the MongoDB connection without retries func checkMongo() (string, error) { - uri := getEnv("MONGO_URI", buildMongoURI()) + mongo := &component.Mongo{ + Address: config.Config.Mongo.Address, + Database: config.Config.Mongo.Database, + Username: config.Config.Mongo.Username, + Password: config.Config.Mongo.Password, + MaxPoolSize: config.Config.Mongo.MaxPoolSize, + } + uri, uriExist := os.LookupEnv("MONGO_URI") + if uriExist { + mongo.URL = uri + } - ctx, cancel := context.WithTimeout(context.Background(), mongoConnTimeout) - defer cancel() - - str := "ths addr is:" + strings.Join(config.Config.Mongo.Address, ",") - - client, err := mongo.Connect(ctx, options.Client().ApplyURI(uri)) + str, err := component.CheckMongo(mongo) if err != nil { - return "", errs.Wrap(errStr(err, str)) + return "", err } - defer client.Disconnect(context.Background()) - - ctx, cancel = context.WithTimeout(context.Background(), mongoConnTimeout) - defer cancel() - - if err = client.Ping(ctx, nil); err != nil { - return "", errs.Wrap(errStr(err, str)) - } - return str, nil } -// buildMongoURI constructs the MongoDB URI using configuration settings -func buildMongoURI() string { - // Fallback to config if environment variables are not set - username := config.Config.Mongo.Username - password := config.Config.Mongo.Password - database := config.Config.Mongo.Database - maxPoolSize := config.Config.Mongo.MaxPoolSize - - mongodbHosts := strings.Join(config.Config.Mongo.Address, ",") - - if username != "" && password != "" { - return fmt.Sprintf("mongodb://%s:%s@%s/%s?maxPoolSize=%d", - username, password, mongodbHosts, database, maxPoolSize) - } - return fmt.Sprintf("mongodb://%s/%s?maxPoolSize=%d", - mongodbHosts, database, maxPoolSize) -} - // checkMinio checks the MinIO connection func checkMinio() (string, error) { // Check if MinIO is enabled @@ -191,52 +138,24 @@ func checkMinio() (string, error) { return "", nil } - // Prioritize environment variables - endpoint := getEnv("MINIO_ENDPOINT", config.Config.Object.Minio.Endpoint) - accessKeyID := getEnv("MINIO_ACCESS_KEY_ID", config.Config.Object.Minio.AccessKeyID) - secretAccessKey := getEnv("MINIO_SECRET_ACCESS_KEY", config.Config.Object.Minio.SecretAccessKey) - useSSL := getEnv("MINIO_USE_SSL", "false") // Assuming SSL is not used by default - - if endpoint == "" || accessKeyID == "" || secretAccessKey == "" { - return "", ErrConfig.Wrap("MinIO configuration missing") - } - - // Parse endpoint URL to determine if SSL is enabled - u, err := url.Parse(endpoint) + endpoint, err := getMinioAddr("MINIO_ENDPOINT", "MINIO_ADDRESS", "MINIO_PORT", config.Config.Object.Minio.Endpoint) if err != nil { - str := "the endpoint is:" + endpoint - return "", errs.Wrap(errStr(err, str)) + return "", err } - secure := u.Scheme == "https" || useSSL == "true" - // Initialize MinIO client - minioClient, err := minio.New(u.Host, &minio.Options{ - Creds: credentials.NewStaticV4(accessKeyID, secretAccessKey, ""), - Secure: secure, - }) - str := "ths addr is:" + u.Host + minio := &component.Minio{ + ApiURL: config.Config.Object.ApiURL, + Endpoint: endpoint, + AccessKeyID: getEnv("MINIO_ACCESS_KEY_ID", config.Config.Object.Minio.AccessKeyID), + SecretAccessKey: getEnv("MINIO_SECRET_ACCESS_KEY", config.Config.Object.Minio.SecretAccessKey), + SignEndpoint: config.Config.Object.Minio.SignEndpoint, + UseSSL: getEnv("MINIO_USE_SSL", "false"), + } + + str, err := component.CheckMinio(minio) if err != nil { - strs := fmt.Sprintf("%v;host:%s,accessKeyID:%s,secretAccessKey:%s,Secure:%v", err, u.Host, accessKeyID, secretAccessKey, secure) - return "", errs.Wrap(err, strs) + return "", err } - - // Perform health check - cancel, err := minioClient.HealthCheck(time.Duration(minioHealthCheckDuration) * time.Second) - if err != nil { - return "", errs.Wrap(errStr(err, str)) - } - defer cancel() - - if minioClient.IsOffline() { - str := fmt.Sprintf("Minio server is offline;%s", str) - return "", ErrComponentStart.Wrap(str) - } - - // Check for localhost in API URL and Minio SignEndpoint - if exactIP(config.Config.Object.ApiURL) == "127.0.0.1" || exactIP(config.Config.Object.Minio.SignEndpoint) == "127.0.0.1" { - return "", ErrConfig.Wrap("apiURL or Minio SignEndpoint endpoint contain 127.0.0.1") - } - return str, nil } @@ -247,76 +166,48 @@ func checkRedis() (string, error) { username := getEnv("REDIS_USERNAME", config.Config.Redis.Username) password := getEnv("REDIS_PASSWORD", config.Config.Redis.Password) - // Split address to handle multiple addresses for cluster setup - redisAddresses := strings.Split(address, ",") - - var redisClient redis.UniversalClient - if len(redisAddresses) > 1 { - // Use cluster client for multiple addresses - redisClient = redis.NewClusterClient(&redis.ClusterOptions{ - Addrs: redisAddresses, - Username: username, - Password: password, - }) - } else { - // Use regular client for single address - redisClient = redis.NewClient(&redis.Options{ - Addr: redisAddresses[0], - Username: username, - Password: password, - }) + redis := &component.Redis{ + Address: strings.Split(address, ","), + Username: username, + Password: password, } - defer redisClient.Close() - // Ping Redis to check connectivity - _, err := redisClient.Ping(context.Background()).Result() - str := "the addr is:" + strings.Join(redisAddresses, ",") + addresses, err := getAddress("REDIS_ADDRESS", "REDIS_PORT", config.Config.Redis.Address) if err != nil { - return "", errs.Wrap(errStr(err, str)) + return "", err } + redis.Address = addresses + str, err := component.CheckRedis(redis) + if err != nil { + return "", err + } return str, nil } // checkZookeeper checks the Zookeeper connection func checkZookeeper() (string, error) { // Prioritize environment variables - schema := getEnv("ZOOKEEPER_SCHEMA", "digest") + address := getEnv("ZOOKEEPER_ADDRESS", strings.Join(config.Config.Zookeeper.ZkAddr, ",")) - username := getEnv("ZOOKEEPER_USERNAME", config.Config.Zookeeper.Username) - password := getEnv("ZOOKEEPER_PASSWORD", config.Config.Zookeeper.Password) - // Split addresses to handle multiple Zookeeper nodes - zookeeperAddresses := strings.Split(address, ",") + zk := &component.Zookeeper{ + Schema: getEnv("ZOOKEEPER_SCHEMA", "digest"), + ZkAddr: strings.Split(address, ","), + Username: getEnv("ZOOKEEPER_USERNAME", config.Config.Zookeeper.Username), + Password: getEnv("ZOOKEEPER_PASSWORD", config.Config.Zookeeper.Password), + } - // Connect to Zookeeper - str := "the addr is:" + address - c, eventChan, err := zk.Connect(zookeeperAddresses, time.Second) // Adjust the timeout as necessary + addresses, err := getAddress("ZOOKEEPER_ADDRESS", "ZOOKEEPER_PORT", config.Config.Zookeeper.ZkAddr) if err != nil { - return "", errs.Wrap(errStr(err, str)) + return "", nil } - timeout := time.After(5 * time.Second) - for { - select { - case event := <-eventChan: - if event.State == zk.StateConnected { - fmt.Println("Connected to Zookeeper") - goto Connected - } - case <-timeout: - return "", errs.Wrap(errors.New("timeout waiting for Zookeeper connection"), "Zookeeper Addr: "+strings.Join(config.Config.Zookeeper.ZkAddr, " ")) - } - } -Connected: - defer c.Close() + zk.ZkAddr = addresses - // Set authentication if username and password are provided - if username != "" && password != "" { - if err := c.AddAuth(schema, []byte(username+":"+password)); err != nil { - return "", errs.Wrap(errStr(err, str)) - } + str, err := component.CheckZookeeper(zk) + if err != nil { + return "", err } - return str, nil } @@ -327,24 +218,21 @@ func checkKafka() (string, error) { password := getEnv("KAFKA_PASSWORD", config.Config.Kafka.Password) address := getEnv("KAFKA_ADDRESS", strings.Join(config.Config.Kafka.Addr, ",")) - // Split addresses to handle multiple Kafka brokers - kafkaAddresses := strings.Split(address, ",") - - // Configure Kafka client - cfg := sarama.NewConfig() - if username != "" && password != "" { - cfg.Net.SASL.Enable = true - cfg.Net.SASL.User = username - cfg.Net.SASL.Password = password + kafka := &component.Kafka{ + Username: username, + Password: password, + Addr: strings.Split(address, ","), } - // Additional Kafka setup (e.g., TLS configuration) can be added here - // kafka.SetupTLSConfig(cfg) - // Create Kafka client - str := "the addr is:" + address - kafkaClient, err := sarama.NewClient(kafkaAddresses, cfg) + addresses, err := getAddress("KAFKA_ADDRESS", "KAFKA_PORT", config.Config.Kafka.Addr) if err != nil { - return "", errs.Wrap(errStr(err, str)) + return "", nil + } + kafka.Addr = addresses + + str, kafkaClient, err := component.CheckKafka(kafka) + if err != nil { + return "", err } defer kafkaClient.Close() @@ -379,22 +267,42 @@ func isTopicPresent(topic string, topics []string) bool { return false } -func colorPrint(colorCode int, format string, a ...interface{}) { - fmt.Printf("\x1b[%dm%s\x1b[0m\n", colorCode, fmt.Sprintf(format, a...)) +func getAddress(key1, key2 string, fallback []string) ([]string, error) { + address, addrExist := os.LookupEnv(key1) + port, portExist := os.LookupEnv(key2) + + if addrExist && portExist { + addresses := strings.Split(address, ",") + for i, addr := range addresses { + addresses[i] = addr + ":" + port + } + return addresses, nil + } else if !addrExist && portExist { + result := make([]string, len(config.Config.Redis.Address)) + for i, addr := range config.Config.Redis.Address { + add := strings.Split(addr, ":") + result[i] = add[0] + ":" + port + } + return result, nil + } else if addrExist && !portExist { + return nil, errs.Wrap(errors.New("the ZOOKEEPER_PORT of minio is empty")) + } + return fallback, nil } -func errorPrint(s string) { - colorPrint(colorRed, "%v", s) -} - -func successPrint(s string) { - colorPrint(colorGreen, "%v", s) -} - -func warningPrint(s string) { - colorPrint(colorYellow, "Warning: But %v", s) -} - -func errStr(err error, str string) error { - return fmt.Errorf("%v;%s", err, str) -} +func getMinioAddr(key1, key2, key3, fallback string) (string, error) { + // Prioritize environment variables + endpoint := getEnv(key1, fallback) + address, addressExist := os.LookupEnv(key2) + port, portExist := os.LookupEnv(key3) + if portExist && addressExist { + endpoint = "http://" + address + ":" + port + } else if !portExist && addressExist { + return "", errs.Wrap(errors.New("the MINIO_PORT of minio is empty")) + } else if portExist && !addressExist { + arr := strings.Split(config.Config.Object.Minio.Endpoint, ":") + arr[2] = port + endpoint = strings.Join(arr, ":") + } + return endpoint, nil +} \ No newline at end of file