diff --git a/.idea/vcs.xml b/.idea/vcs.xml index ed68cfe..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/api/etcd.go b/api/etcd.go new file mode 100644 index 0000000..79f859d --- /dev/null +++ b/api/etcd.go @@ -0,0 +1,115 @@ +package api + +import ( + "cmdb-ops-flow/models" + "cmdb-ops-flow/service" + "cmdb-ops-flow/utils/msg" + "cmdb-ops-flow/utils/result" + "context" + "github.com/gin-gonic/gin" + clientv3 "go.etcd.io/etcd/client/v3" + "net/http" +) + +func AddEtcd(c *gin.Context) { + var data models.EtcdGroup + if err := c.ShouldBindJSON(&data); err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + code := models.CheckEtcdGroup(data.EtcdGroupname) + if code != msg.SUCCSE { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, "etcd name不能重复", msg.GetErrMsg(msg.ERROR))) + return + } + + list, err := service.AddEtcd(data) + if err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + + c.JSON(http.StatusOK, (&result.Result{}).Ok(code, list, msg.GetErrMsg(code))) + +} +func EditEtcd(c *gin.Context) { + var data models.EtcdGroup + if err := c.ShouldBindJSON(&data); err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + list, err := service.EditEtcd(data) + if err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + code := msg.SUCCSE + c.JSON(http.StatusOK, (&result.Result{}).Ok(code, list, msg.GetErrMsg(code))) +} +func GetEtcd(c *gin.Context) { + //var data models.ScriptManager + var data struct { + ID int `json:"id"` + } + + if err := c.ShouldBindJSON(&data); err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(400, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + list, err := service.GetEtcdList(data.ID) + if err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + code := msg.SUCCSE + c.JSON(http.StatusOK, (&result.Result{}).Ok(code, list, msg.GetErrMsg(code))) + +} + +func DelEtcd(c *gin.Context) { + + var data models.EtcdGroup + if err := c.ShouldBindJSON(&data); err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + code := models.DelEtcdGroup(data.EtcdGroupid) + + c.JSON(http.StatusOK, (&result.Result{}).Ok(code, msg.SUCCSE, msg.GetErrMsg(code))) + +} + +func EtcdGetall(c *gin.Context) { + + var data models.EtcdGroup + + if err := c.ShouldBindJSON(&data); err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(400, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + + // 初始化 ETCD 客户端 + etcdClient, err := service.Etcdinit(data) + if err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + defer etcdClient.Close() // 在使用完毕后关闭 ETCD 客户端连接 + + // 获取 ETCD 中的数据 + resp, err := etcdClient.Get(context.Background(), "", clientv3.WithPrefix()) + if err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + + var list []map[string]string + for _, kv := range resp.Kvs { + list = append(list, map[string]string{ + "key": string(kv.Key), + "value": string(kv.Value), + }) + } + + c.JSON(http.StatusOK, (&result.Result{}).Ok(200, list, msg.GetErrMsg(200))) +} diff --git a/api/etcd_bak.go b/api/etcd_bak.go new file mode 100644 index 0000000..60acec5 --- /dev/null +++ b/api/etcd_bak.go @@ -0,0 +1,65 @@ +package api + +import ( + "cmdb-ops-flow/models" + "cmdb-ops-flow/service" + "cmdb-ops-flow/utils/msg" + "cmdb-ops-flow/utils/result" + "github.com/gin-gonic/gin" + "net/http" +) + +func AddEtcdbak(c *gin.Context) { + var data models.EtcdBak + if err := c.ShouldBindJSON(&data); err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + code := models.CheckEtcdBak(data.Etcdbakname) + if code != msg.SUCCSE { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, "etcd name不能重复", msg.GetErrMsg(msg.ERROR))) + return + } + + list, err := service.AddEtcdbak(data) + if err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + + c.JSON(http.StatusOK, (&result.Result{}).Ok(code, list, msg.GetErrMsg(code))) + +} + +func GetEtcdbak(c *gin.Context) { + //var data models.ScriptManager + var data struct { + ID int `json:"id"` + } + + if err := c.ShouldBindJSON(&data); err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(400, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + list, err := service.GetEtcdbakList(data.ID) + if err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + code := msg.SUCCSE + c.JSON(http.StatusOK, (&result.Result{}).Ok(code, list, msg.GetErrMsg(code))) + +} + +func DelEtcdbak(c *gin.Context) { + + var data models.EtcdBak + if err := c.ShouldBindJSON(&data); err != nil { + c.JSON(http.StatusOK, (&result.Result{}).Error(msg.ERROR, err.Error(), msg.GetErrMsg(msg.ERROR))) + return + } + code := models.DelEtcdBak(data.Etcdbakid) + + c.JSON(http.StatusOK, (&result.Result{}).Ok(code, msg.SUCCSE, msg.GetErrMsg(code))) + +} diff --git a/go.mod b/go.mod index a2615fb..e01ac53 100644 --- a/go.mod +++ b/go.mod @@ -6,17 +6,17 @@ require ( github.com/bwmarrin/snowflake v0.3.0 github.com/gin-gonic/gin v1.9.1 github.com/go-ini/ini v1.67.0 - github.com/go-redis/redis/v8 v8.11.5 github.com/gorilla/websocket v1.5.0 github.com/jinzhu/gorm v1.9.16 + go.etcd.io/etcd/client/v3 v3.5.9 golang.org/x/crypto v0.9.0 ) require ( github.com/bytedance/sonic v1.9.1 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect @@ -24,6 +24,8 @@ require ( github.com/go-playground/validator/v10 v10.14.0 // indirect github.com/go-sql-driver/mysql v1.5.0 // indirect github.com/goccy/go-json v0.10.2 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect @@ -35,10 +37,17 @@ require ( github.com/stretchr/testify v1.8.4 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.11 // indirect + go.etcd.io/etcd/api/v3 v3.5.9 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.17.0 // indirect golang.org/x/arch v0.3.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/sys v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect + google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect + google.golang.org/grpc v1.41.0 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 3faa329..d35cc84 100644 --- a/go.sum +++ b/go.sum @@ -1,27 +1,44 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0= github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= @@ -35,20 +52,43 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= -github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= @@ -57,6 +97,8 @@ github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +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/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= @@ -73,17 +115,19 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -96,41 +140,140 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs= +go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= +go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE= +go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= +go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E= +go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c h1:wtujag7C+4D6KMoulW9YauvK2lgdvCMS260jsqqBXr0= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E= +google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/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= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/models/etcd.go b/models/etcd.go index 2640e7f..fd62512 100644 --- a/models/etcd.go +++ b/models/etcd.go @@ -1 +1,74 @@ package models + +import ( + "cmdb-ops-flow/utils/msg" + "errors" + "github.com/jinzhu/gorm" +) + +type EtcdGroup struct { + ID int `json:"id" db:"id" form:"id"` + EtcdGroupid int64 `gorm:"type:bigint;not null" json:"etcdGroupid"` + EtcdGroupname string `json:"etcdGroupname" db:"etcdGroupname" form:"etcdGroupname"` + EtcdEndpoints string `json:"etcdEndpoints" db:"etcdEndpoints" form:"etcdEndpoints"` + Label string `json:"label" db:"label" form:"label"` +} + +func AddEtcdGroup(etcdgroup EtcdGroup) (interface{}, error) { + err := db.Create(&etcdgroup).Error + return etcdgroup, err +} +func EditEtcdGroup(etcdgroup EtcdGroup) (interface{}, error) { + err := db.Select("id").Where("etcdGroupid = ?", etcdgroup.EtcdGroupid).First(&etcdgroup).Error + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return msg.ERROR_SCRIPT_GET_WRONG, err + } + return msg.InvalidParams, err + } + updateData := map[string]interface{}{ + "EtcdGroupname": etcdgroup.EtcdGroupname, + "EtcdEndpoints": etcdgroup.EtcdEndpoints, + + "Label": etcdgroup.Label, + } + + err = db.Model(&etcdgroup).Where("etcdGroupid = ?", etcdgroup.EtcdGroupid).Updates(updateData).Error + if err != nil { + return etcdgroup, err + } + + return etcdgroup, err +} +func DelEtcdGroup(name int64) (code int) { + var etcdgroup EtcdGroup + db.Select("id").Where("etcdGroupid = ?", name).First(&etcdgroup) + if etcdgroup.ID > 0 { + err = db.Where("etcdGroupid = ?", name).Delete(&etcdgroup).Error + if err != nil { + return msg.InvalidParams + } + return msg.SUCCSE + } else { + return msg.ERROR_job_EDIT_WRONG + } + +} +func GetEtcdGroupList(id int) ([]EtcdGroup, error) { + var list []EtcdGroup + if id != 0 { + res := db.Debug().Where("id = ?", id).Find(&list) + return list, res.Error + } else { + res := db.Debug().Find(&list) + return list, res.Error + } +} +func CheckEtcdGroup(etcdGroupname string) (code int) { + var jobgroup EtcdGroup + db.Select("id").Where("etcdGroupname = ?", etcdGroupname).First(&jobgroup) + if jobgroup.ID > 0 { + return msg.ERROR_job_GET_INFO + } + return msg.SUCCSE +} diff --git a/models/etcdbak.go b/models/etcdbak.go new file mode 100644 index 0000000..9c4f788 --- /dev/null +++ b/models/etcdbak.go @@ -0,0 +1,80 @@ +package models + +import ( + "cmdb-ops-flow/utils/msg" + "time" +) + +type EtcdBak struct { + ID int `json:"id" db:"id" form:"id"` + Etcdbakid int64 `gorm:"type:bigint;not null" json:"etcdbakid"` + Etcdbakname string `json:"etcdbakname" db:"etcdbakname" form:"etcdbakname"` + EtcdGroupname string `json:"etcdGroupname" db:"etcdGroupname" form:"etcdGroupname"` + EtcdGroupnames []EtcdGroup `gorm:"FOREIGNKEY:EtcdGroupnames;ASSOCIATION_FOREIGNKEY:EtcdGroupname"` + Key string `json:"key" db:"key"` + Value string `json:"value" db:"value"` + CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP",json:"created_at"` + Label string `json:"label" db:"label" form:"label"` +} + +func AddEtcdBak(etcdBak EtcdBak) (interface{}, error) { + err := db.Create(&etcdBak).Error + return etcdBak, err +} + +// func EditEtcdBak(etcdBak EtcdBak) (interface{}, error) { +// err := db.Select("id").Where("etcdbakid = ?", etcdBak.Etcdbakid).First(&etcdBak).Error +// if err != nil { +// if errors.Is(err, gorm.ErrRecordNotFound) { +// return msg.ERROR_SCRIPT_GET_WRONG, err +// } +// return msg.InvalidParams, err +// } +// updateData := map[string]interface{}{ +// "Etcdbakname": etcdBak.Etcdbakname, +// "EtcdGroupname": etcdBak.EtcdGroupname, +// "Key": etcdBak.Key, +// "Value": etcdBak.Value, +// "CreatedAt":etcdBak.CreatedAt, +// "Label": etcdBak.Label, +// } +// +// err = db.Model(&etcdBak).Where("etcdbakid = ?", etcdBak.Etcdbakid).Updates(updateData).Error +// if err != nil { +// return etcdBak, err +// } +// +// return etcdBak, err +// } +func DelEtcdBak(name int64) (code int) { + var etcdBak EtcdBak + db.Select("id").Where("etcdGroupid = ?", name).First(&etcdBak) + if etcdBak.ID > 0 { + err = db.Where("etcdGroupid = ?", name).Delete(&etcdBak).Error + if err != nil { + return msg.InvalidParams + } + return msg.SUCCSE + } else { + return msg.ERROR_job_EDIT_WRONG + } + +} +func GetEtcdBakList(id int) ([]EtcdBak, error) { + var list []EtcdBak + if id != 0 { + res := db.Debug().Where("id = ?", id).Find(&list) + return list, res.Error + } else { + res := db.Debug().Find(&list) + return list, res.Error + } +} +func CheckEtcdBak(Etcdbakname string) (code int) { + var etcdBak EtcdBak + db.Select("id").Where("etcdGroupname = ?", Etcdbakname).First(&etcdBak) + if etcdBak.ID > 0 { + return msg.ERROR_job_GET_INFO + } + return msg.SUCCSE +} diff --git a/models/model.go b/models/model.go index e57e044..9f34682 100644 --- a/models/model.go +++ b/models/model.go @@ -27,7 +27,7 @@ func InitDb() { db.DB().SetMaxIdleConns(20) //设置连接池，空闲 db.DB().SetMaxOpenConns(100) //打开 db.DB().SetConnMaxLifetime(time.Second * 30) - db.AutoMigrate(Cmdb{}, User{}, ScriptManager{}, Job{}, JobGroup{}) + db.AutoMigrate(Cmdb{}, User{}, ScriptManager{}, Job{}, JobGroup{}, EtcdGroup{}, EtcdBak{}) db.LogMode(true) } diff --git a/router/router.go b/router/router.go index 9aafef7..b1042e5 100644 --- a/router/router.go +++ b/router/router.go @@ -50,6 +50,17 @@ func InitRouter() { apiv1.POST("/script/editScript", api.EditScript) apiv1.POST("/script/delScript", api.DelScript) + apiv1.POST("/etcd/etcdGetall", api.EtcdGetall) + apiv1.POST("/etcd/getEtcd", api.GetEtcd) + apiv1.POST("/etcd/addEtcd", api.AddEtcd) + + apiv1.POST("/etcd/editEtcd", api.EditEtcd) + apiv1.POST("/etcd/delEtcd", api.DelEtcd) + + apiv1.POST("/etcd/getEtcdbak", api.GetEtcdbak) + apiv1.POST("/etcd/delEtcdbak", api.DelEtcdbak) + apiv1.POST("/etcd/addEtcdbak", api.AddEtcdbak) + apiv1.POST("/job/addJob", api.AddJob) apiv1.POST("/job/getJob", api.GetJob) apiv1.POST("/job/editJob", api.EditJob) @@ -67,7 +78,6 @@ func InitRouter() { adminuser := r.Group("/api/admin/user") { adminuser.POST("/login", api.Login) - adminuser.GET("/ssh/webssh", api.VisitorWebsocketServer) } diff --git a/service/etcd.go b/service/etcd.go new file mode 100644 index 0000000..d328ea4 --- /dev/null +++ b/service/etcd.go @@ -0,0 +1,61 @@ +package service + +import ( + "cmdb-ops-flow/models" + "cmdb-ops-flow/utils/common" + "errors" + clientv3 "go.etcd.io/etcd/client/v3" + "time" +) + +func AddEtcd(etcd models.EtcdGroup) (data interface{}, err error) { + if etcd.EtcdGroupname == "" || etcd.EtcdEndpoints == "" { + return nil, errors.New("所有字段都是必填的") + } + daoetcd := models.EtcdGroup{ + EtcdGroupid: common.GenerateRandomNumber(), + EtcdGroupname: etcd.EtcdGroupname, + EtcdEndpoints: etcd.EtcdEndpoints, + Label: etcd.Label, + } + + data, err = models.AddEtcdGroup(daoetcd) + return data, err +} +func EditEtcd(etcd models.EtcdGroup) (data interface{}, err error) { + + daoetcd := models.EtcdGroup{ + EtcdGroupid: etcd.EtcdGroupid, + EtcdGroupname: etcd.EtcdGroupname, + EtcdEndpoints: etcd.EtcdEndpoints, + Label: etcd.Label, + } + + data, err = models.EditEtcdGroup(daoetcd) + return data, err +} + +// func GetScriptList(json models.ScriptManager) (data interface{}, err error) { +func GetEtcdList(id int) ([]models.EtcdGroup, error) { + list, err := models.GetEtcdGroupList(id) + return list, err +} + +var ( + EtcdClient *clientv3.Client + opTimeout = 5 * time.Second +) + +func Etcdinit(etcd models.EtcdGroup) (*clientv3.Client, error) { + var err error + EtcdClient, err = clientv3.New(clientv3.Config{ + Endpoints: []string{etcd.EtcdEndpoints}, + DialTimeout: opTimeout, + }) + if err != nil { + return nil, err // 返回错误 + } + + // 在函数结束之前返回 etcdClient + return EtcdClient, nil +} diff --git a/service/etcdbak.go b/service/etcdbak.go new file mode 100644 index 0000000..a8e7439 --- /dev/null +++ b/service/etcdbak.go @@ -0,0 +1,45 @@ +package service + +import ( + "cmdb-ops-flow/models" + "cmdb-ops-flow/utils/common" + "errors" + "time" +) + +func AddEtcdbak(etcdbak models.EtcdBak) (data interface{}, err error) { + if etcdbak.EtcdGroupname == "" || etcdbak.Etcdbakname == "" { + return nil, errors.New("所有字段都是必填的") + } + etcdbak.CreatedAt = time.Now() + daoetcdbak := models.EtcdBak{ + Etcdbakid: common.GenerateRandomNumber(), + Etcdbakname: etcdbak.Etcdbakname, + EtcdGroupname: etcdbak.EtcdGroupname, + Key: etcdbak.Key, + Value: etcdbak.Value, + CreatedAt: etcdbak.CreatedAt, + Label: etcdbak.Label, + } + + data, err = models.AddEtcdBak(daoetcdbak) + return data, err +} + +//func EditEtcdbak(jobgroup models.EtcdBak) (data interface{}, err error) { +// +// daojobgroup := models.EtcdBak{ +// Jobgroupid: jobgroup.Jobgroupid, +// Jobgroupname: jobgroup.Jobgroupname, +// Label: jobgroup.Label, +// } +// +// data, err = models.EditJobGroup(daojobgroup) +// return data, err +//} + +// func GetScriptList(json models.ScriptManager) (data interface{}, err error) { +func GetEtcdbakList(id int) ([]models.EtcdBak, error) { + list, err := models.GetEtcdBakList(id) + return list, err +} diff --git a/test/main.go b/test/main.go index f4b7b85..9675d91 100644 --- a/test/main.go +++ b/test/main.go @@ -1,94 +1,203 @@ package main import ( + "bytes" "context" "fmt" - "github.com/go-redis/redis/v8" + "io/ioutil" "log" - "strconv" + "net/http" "time" + + "github.com/gin-gonic/gin" + "go.etcd.io/etcd/client/v3" +) + +var ( + etcdClient *clientv3.Client + opTimeout = 5 * time.Second ) func main() { + r := gin.Default() - // 连接到Redis - ctx := context.Background() - client := redis.NewClient(&redis.Options{ - Addr: redisHost, - Password: redisPassword, - DB: 0, + var err error + etcdClient, err = clientv3.New(clientv3.Config{ + Endpoints: []string{"http://192.168.2.81:2379"}, + DialTimeout: opTimeout, }) - - // 检查是否连接成功 - pong, err := client.Ping(ctx).Result() if err != nil { log.Fatal(err) } - fmt.Println("Connected to Redis:", pong) + defer etcdClient.Close() - // 指定时间范围 - timeRanges := []struct { - StartTime int64 - EndTime int64 - }{ - {1690732800, 1690819200}, // 时间范围1: 2023-08-29 00:00:00 to 2023-08-30 00:00:00 - {1690819200, 1690905600}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 - {1690905600, 1690992000}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 - {1690992000, 1691078400}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 + r.GET("/get/", handleGet) + r.GET("/list", handleList) - {1691078400, 1691164800}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 + r.POST("/put", handlePut) + r.DELETE("/delete/:key", handleDelete) + r.GET("/backup", handleBackup) + r.POST("/restore", handleRestore) - {1691164800, 1691251200}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 + if err := r.Run(":8080"); err != nil { + fmt.Println(err) + } +} +func handleList(c *gin.Context) { + resp, err := etcdClient.Get(context.Background(), "", clientv3.WithPrefix()) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } - {1691251200, 1691337600}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 + var data []map[string]string + for _, kv := range resp.Kvs { + data = append(data, map[string]string{ + "key": string(kv.Key), + "value": string(kv.Value), + }) + } - {1691337600, 1691424000}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 + c.JSON(http.StatusOK, data) +} - {1691424000, 1691510400}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 +func handleGet(c *gin.Context) { + key := c.DefaultQuery("key", "") // 获取名为 "key" 的查询参数，默认为空字符串 + if key == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "Missing key parameter"}) + return + } - {1691510400, 1691596800}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 + resp, err := etcdClient.Get(context.Background(), key) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + if len(resp.Kvs) > 0 { + value := string(resp.Kvs[0].Value) + c.JSON(http.StatusOK, gin.H{"key": key, "value": value}) + } else { + c.JSON(http.StatusOK, gin.H{"key": key, "value": "not found"}) + } +} - {1691596800, 1691683200}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 +func handlePut(c *gin.Context) { + var data struct { + Key string `json:"key"` + Value string `json:"value"` + } + if err := c.ShouldBindJSON(&data); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } - {1691683200, 1691769600}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 + _, err := etcdPut(data.Key, data.Value) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + c.JSON(http.StatusOK, gin.H{"message": "Successfully put key-value pair"}) +} - {1691769600, 1691856000}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 - {1691856000, 1691942400}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 - {1691942400, 1692028800}, // 时间范围2: 2023-08-30 00:00:00 to 2023-08-31 00:00:00 +func handleDelete(c *gin.Context) { + key := c.Param("key") + _, err := etcdDelete(key) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + c.JSON(http.StatusOK, gin.H{"message": "Successfully deleted key"}) +} - // 添加更多时间范围... +func handleBackup(c *gin.Context) { + backupData, err := etcdBackup() + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return } + c.Data(http.StatusOK, "application/octet-stream", backupData) +} - // 遍历每个时间范围 - for _, tr := range timeRanges { - keyPattern := fmt.Sprintf("rs_*") // 修改为您的键名模式 +func handleRestore(c *gin.Context) { + restoreFile, _, err := c.Request.FormFile("file") + if err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + defer restoreFile.Close() - // 遍历符合模式的键 - keys, err := client.Keys(ctx, keyPattern).Result() - if err != nil { - log.Fatal(err) - } + restoreData, err := ioutil.ReadAll(restoreFile) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } - // 统计每个时间范围内满足条件的记录数量 - count := 0 - for _, key := range keys { - hgetallResult, err := client.HGetAll(ctx, key).Result() - if err != nil { - log.Fatal(err) - } - - created_atStr, exists := hgetallResult["created_at"] - if exists { - created_at, _ := strconv.ParseInt(created_atStr, 10, 64) - if created_at > tr.StartTime && created_at < tr.EndTime { - count++ - } - } - } + err = etcdRestore(restoreData) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + c.JSON(http.StatusOK, gin.H{"message": "Restore completed"}) +} + +func etcdPut(key, value string) (*clientv3.PutResponse, error) { + ctx, cancel := context.WithTimeout(context.Background(), opTimeout) + defer cancel() - // 输出统计结果 - startTime := time.Unix(tr.StartTime, 0) - endTime := time.Unix(tr.EndTime, 0) - fmt.Printf("Records between %s and %s: %d\n", startTime.Format("2006-01-02 15:04:05"), endTime.Format("2006-01-02 15:04:05"), count) + kvc := clientv3.NewKV(etcdClient) + + resp, err := kvc.Put(ctx, key, value) + if err != nil { + return nil, err + } + return resp, nil +} + +func etcdDelete(key string) (*clientv3.DeleteResponse, error) { + ctx, cancel := context.WithTimeout(context.Background(), opTimeout) + defer cancel() + + kvc := clientv3.NewKV(etcdClient) + + resp, err := kvc.Delete(ctx, key) + if err != nil { + return nil, err + } + return resp, nil +} + +func etcdBackup() ([]byte, error) { + ctx, cancel := context.WithTimeout(context.Background(), opTimeout) + defer cancel() + + resp, err := etcdClient.Get(ctx, "", clientv3.WithSerializable()) + if err != nil { + return nil, err + } + + buf := new(bytes.Buffer) + for _, kv := range resp.Kvs { + fmt.Fprintf(buf, "%s=%s\n", kv.Key, kv.Value) + } + return buf.Bytes(), nil +} + +func etcdRestore(data []byte) error { + ctx, cancel := context.WithTimeout(context.Background(), opTimeout) + defer cancel() + + kvc := clientv3.NewKV(etcdClient) + + lines := bytes.Split(data, []byte("\n")) + for _, line := range lines { + parts := bytes.SplitN(line, []byte("="), 2) + if len(parts) != 2 { + continue + } + _, err := kvc.Put(ctx, string(parts[0]), string(parts[1])) + if err != nil { + return err + } } + return nil } diff --git a/vue-admin-template-master b/vue-admin-template-master deleted file mode 160000 index d4b16b0..0000000 --- a/vue-admin-template-master +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d4b16b0ccda838ee42beb84036359bf84052b46c