From 0b9d677beb6b31f5bb5fae3968613d8f70bee12a Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Mon, 29 Jan 2024 18:28:25 +0800 Subject: [PATCH] fix: fix the component check func --- go.mod | 18 ++- go.sum | 37 +++-- tools/component/component.go | 299 ++++++++++++----------------------- 3 files changed, 127 insertions(+), 227 deletions(-) diff --git a/go.mod b/go.mod index fdc6a58de..81819d2ce 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/gorilla/websocket v1.5.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect - github.com/minio/minio-go/v7 v7.0.63 + github.com/minio/minio-go/v7 v7.0.66 github.com/mitchellh/mapstructure v1.5.0 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -31,13 +31,13 @@ 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 + github.com/IBM/sarama v1.42.1 github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible github.com/go-redis/redis v6.15.9+incompatible - github.com/redis/go-redis/v9 v9.2.1 + github.com/redis/go-redis/v9 v9.4.0 github.com/spf13/pflag v1.0.5 github.com/stathat/consistent v1.0.0 github.com/tencentyun/cos-go-sdk-v5 v0.7.45 @@ -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.6.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.2-0.20230530020048-26663ab9bf55 // indirect stathat.com/c/consistent v1.0.0 // indirect ) @@ -158,3 +158,5 @@ require ( ) replace github.com/OpenIMSDK/protocol v0.0.47 => github.com/AndrewZuo01/protocol v0.0.0-20240112093520-fd9c53e27b94 + +replace github.com/OpenIMSDK/tools v0.0.28 => github.com/luhaoling/tools v0.0.0-20240129093731-a82c07b43a68 diff --git a/go.sum b/go.sum index 5539b41fc..bea16c2d8 100644 --- a/go.sum +++ b/go.sum @@ -16,12 +16,10 @@ cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7Biccwk firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4= firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -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/IBM/sarama v1.42.1 h1:wugyWa15TDEHh2kvq2gAy1IHLjEjuYOYgXz/ruC/OSQ= +github.com/IBM/sarama v1.42.1/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.28 h1:UT0rN1ysCFvsxQXyuxAj2TEkHt4C/sUezy+ChKpgt2Y= -github.com/OpenIMSDK/tools v0.0.28/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI= 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 +150,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 +192,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 +202,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= @@ -227,14 +224,16 @@ github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205Ah github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw= github.com/lithammer/shortuuid v3.0.0+incompatible h1:NcD0xWW/MZYXEHa6ITy6kaXN5nwm/V115vj2YXfhS0w= github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHTK2Tciko1/vKuIKS9dSkDrA4w= +github.com/luhaoling/tools v0.0.0-20240129093731-a82c07b43a68 h1:2bDshGtp6ETBMzsqLuThqYdmZ/+uJMgNn61Zkt3PrVE= +github.com/luhaoling/tools v0.0.0-20240129093731-a82c07b43a68/go.mod h1:ToR1sEcu7zWTl25g8h64Wko62zg6FMV8n0Ohw4r2CvY= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.63 h1:GbZ2oCvaUdgT5640WJOpyDhhDxvknAJU2/T3yurwcbQ= -github.com/minio/minio-go/v7 v7.0.63/go.mod h1:Q6X7Qjb7WMhvG65qKf4gUgA5XaiSox74kR1uAEjxRS4= +github.com/minio/minio-go/v7 v7.0.66 h1:bnTOXOHjOqv/gcMuiVbN9o2ngRItvqE774dG9nq0Dzw= +github.com/minio/minio-go/v7 v7.0.66/go.mod h1:DHAgmyQEGdW3Cif0UooKOyrT3Vxs82zNdV6tkKhRtbs= github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -290,8 +289,8 @@ github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwa github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/redis/go-redis/v9 v9.2.1 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6QmlCg= -github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= +github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= @@ -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.2-0.20230530020048-26663ab9bf55 h1:sC1Xj4TYrLqg1n3AN10w871An7wJM0gzgcm8jkIkECQ= +gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/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/tools/component/component.go b/tools/component/component.go index 220b845ee..8ed84288b 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,45 +112,23 @@ func getEnv(key, fallback string) string { // checkMongo checks the MongoDB connection without retries func checkMongo() (string, error) { - uri := getEnv("MONGO_URI", buildMongoURI()) - - 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)) - if err != nil { - return "", errs.Wrap(errStr(err, str)) + 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, } - 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)) + uri, uriExist := os.LookupEnv("MONGO_URI") + if uriExist { + mongo.URL = uri } - 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) + str, err := component.CheckMongo(mongo) + if err != nil { + return "", err } - return fmt.Sprintf("mongodb://%s/%s?maxPoolSize=%d", - mongodbHosts, database, maxPoolSize) + return str, nil } // checkMinio checks the MinIO connection @@ -193,50 +140,29 @@ func checkMinio() (string, error) { // 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") + address, addressExist := os.LookupEnv("MINIO_ADDRESS") + port, portExist := os.LookupEnv("MINIO_PORT") + if portExist && addressExist { + endpoint = "http://" + address + ":" + port + } else if !portExist && addressExist { + return "", errs.Wrap(errors.New("the MINIO_ADDRESS of minio is empty")) + } else if portExist && !addressExist { + return "", errs.Wrap(errors.New("the MINIO_PORT of minio is empty")) } - // Parse endpoint URL to determine if SSL is enabled - u, err := url.Parse(endpoint) - if err != nil { - str := "the endpoint is:" + endpoint - return "", errs.Wrap(errStr(err, str)) - } - 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 - 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) + 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"), } - // Perform health check - cancel, err := minioClient.HealthCheck(time.Duration(minioHealthCheckDuration) * time.Second) + str, err := component.CheckMinio(minio) if err != nil { - return "", errs.Wrap(errStr(err, str)) + return "", err } - 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 +173,65 @@ 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, ",") - if err != nil { - return "", errs.Wrap(errStr(err, str)) + addr, addrExist := os.LookupEnv("REDIS_ADDRESS") + port, portExist := os.LookupEnv("REDIS_PORT") + + if addrExist && portExist { + addresses := strings.Split(addr, ",") + for i, address := range addresses { + addresses[i] = address + ":" + port + } + redis.Address = addresses + } else if !addrExist && portExist { + return "", errs.Wrap(errors.New("the REDIS_ADDRESS of minio is empty")) + } else if addrExist && !portExist { + return "", errs.Wrap(errors.New("the REDIS_PORT of minio is empty")) } + 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, ",") + address := getEnv("ZOOKEEPER_USERNAME", config.Config.Zookeeper.Username) - // Connect to Zookeeper - str := "the addr is:" + address - c, eventChan, err := zk.Connect(zookeeperAddresses, time.Second) // Adjust the timeout as necessary - if err != nil { - return "", errs.Wrap(errStr(err, str)) + 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), } - 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() - // 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)) + address, addrExist := os.LookupEnv("ZOOKEEPER_ADDRESS") + port, portExist := os.LookupEnv("ZOOKEEPER_PORT") + if addrExist && portExist { + addresses := strings.Split(address, ",") + for i, addr := range addresses { + addresses[i] = addr + ":" + port } + zk.ZkAddr = addresses + } else if !addrExist && portExist { + return "", errs.Wrap(errors.New("the ZOOKEEPER_ADDRESS of minio is empty")) + } else if addrExist && !portExist { + return "", errs.Wrap(errors.New("the ZOOKEEPER_PORT of minio is empty")) } + str, err := component.CheckZookeeper(zk) + if err != nil { + return "", err + } return str, nil } @@ -327,26 +242,30 @@ 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, ",") + kafka := &component.Kafka{ + Username: username, + Password: password, + Addr: 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 + address, addrExist := os.LookupEnv("KAFKA_ADDRESS") + port, portExist := os.LookupEnv("KAFKA_PORT") + if addrExist && portExist { + addresses := strings.Split(address, ",") + for i, addr := range addresses { + addresses[i] = addr + ":" + port + } + kafka.Addr = addresses + } else if !addrExist && portExist { + return "", errs.Wrap(errors.New("the KAFKA_ADDRESS of minio is empty")) + } else if addrExist && !portExist { + return "", errs.Wrap(errors.New("the KAFKA_PORT of minio is empty")) } - // 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) + str, kafkaClient, err := component.CheckKafka(kafka) if err != nil { - return "", errs.Wrap(errStr(err, str)) + return "", err } - defer kafkaClient.Close() // Verify if necessary topics exist topics, err := kafkaClient.Topics() @@ -378,23 +297,3 @@ 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 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) -}