fix CI

kitex-contrib · Oct 23, 2024 · ec64f3f · ec64f3f
1 parent 2a82d8c
commit ec64f3f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/etcd/parser.go b/etcd/parser.go
@@ -15,9 +15,8 @@
 package etcd
 
 import (
+	"github.com/cloudwego-contrib/cwgo-pkg/config/etcd/etcd"
 	"time"
-
-	common "github.com/cloudwego-contrib/cwgo-pkg/config/common"
 )
 
 const (
@@ -33,7 +32,7 @@ type CustomFunction func(*Key)
 
 // ConfigParamConfig use for render the path or prefix info by go template, ref: https://pkg.go.dev/text/template
 // The fixed key shows as below.
-type ConfigParamConfig = common.ConfigParamConfig
+type ConfigParamConfig = etcd.ConfigParamConfig
 
 // ConfigParser the parser for etcd config.
-type ConfigParser = common.ConfigParser
+type ConfigParser = etcd.ConfigParser
diff --git a/example/go.mod b/example/go.mod
@@ -62,8 +62,8 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/cloudwego-contrib/cwgo-pkg/config/etcd => github.com/smx-Morgan/cwgo-pkg/config/etcd v0.0.0-20241016000926-d56ef7e0f578
-
 replace github.com/apache/thrift v0.20.0 => github.com/apache/thrift v0.13.0
 
-replace github.com/cloudwego-contrib/cwgo-pkg/config/common => github.com/smx-Morgan/cwgo-pkg/config/common v0.0.0-20241016000926-d56ef7e0f578
+replace github.com/cloudwego-contrib/cwgo-pkg/config/etcd => github.com/smx-Morgan/cwgo-pkg/config/etcd v0.0.0-20241022123807-97b427526bb6
+
+replace github.com/cloudwego-contrib/cwgo-pkg/config/common => github.com/smx-Morgan/cwgo-pkg/config/common v0.0.0-20241022123807-97b427526bb6
diff --git a/go.mod b/go.mod
@@ -60,11 +60,10 @@ require (
 	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 replace github.com/apache/thrift v0.20.0 => github.com/apache/thrift v0.13.0
 
-replace github.com/cloudwego-contrib/cwgo-pkg/config/etcd => github.com/smx-Morgan/cwgo-pkg/config/etcd v0.0.0-20241016000926-d56ef7e0f578
+replace github.com/cloudwego-contrib/cwgo-pkg/config/etcd => github.com/smx-Morgan/cwgo-pkg/config/etcd v0.0.0-20241022123807-97b427526bb6
 
-replace github.com/cloudwego-contrib/cwgo-pkg/config/common => github.com/smx-Morgan/cwgo-pkg/config/common v0.0.0-20241016000926-d56ef7e0f578
+replace github.com/cloudwego-contrib/cwgo-pkg/config/common => github.com/smx-Morgan/cwgo-pkg/config/common v0.0.0-20241022123807-97b427526bb6
diff --git a/go.sum b/go.sum
@@ -74,9 +74,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 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.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
 github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
@@ -116,10 +115,10 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-github.com/smx-Morgan/cwgo-pkg/config/common v0.0.0-20241016000926-d56ef7e0f578 h1:Iknd91xaXpAl8j60b0k301dYBUHMqymvwLc26z7408I=
-github.com/smx-Morgan/cwgo-pkg/config/common v0.0.0-20241016000926-d56ef7e0f578/go.mod h1:lVIAupiOabEhRlmMTGh2XZDFUn6tWRDAYcWpOGoNMIM=
-github.com/smx-Morgan/cwgo-pkg/config/etcd v0.0.0-20241016000926-d56ef7e0f578 h1:14gHM+PShDepYYJTyoojrJOjxoHVg3+M0Wf6G/6dLFw=
-github.com/smx-Morgan/cwgo-pkg/config/etcd v0.0.0-20241016000926-d56ef7e0f578/go.mod h1:02nMV7LXn3unrbi3zBFGyIY77gDxFCyFXSjEwMK1eSI=
+github.com/smx-Morgan/cwgo-pkg/config/common v0.0.0-20241022123807-97b427526bb6 h1:oJo7frKAvT8G8NZp0YP54Z/U+7RJj6t7MXDGRLy5SYY=
+github.com/smx-Morgan/cwgo-pkg/config/common v0.0.0-20241022123807-97b427526bb6/go.mod h1:PEOhwaM6va1ahPXEoUh+P9pDFBkHIr/I/3LOPoI0nMw=
+github.com/smx-Morgan/cwgo-pkg/config/etcd v0.0.0-20241022123807-97b427526bb6 h1:IR9PyCbsszy71v+eKG6VR+x56RQlf68y6XzOfpH6IWg=
+github.com/smx-Morgan/cwgo-pkg/config/etcd v0.0.0-20241022123807-97b427526bb6/go.mod h1:mxp7SUCggfqPNEMCEAyex0UqHtMd8gZknMzz6LAqvwI=
 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=
@@ -274,5 +273,3 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
-sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
-sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=