make Pixiu Admin config management finer-grained (apache#171)

* init * update * add gin * baseinfo and resources * api complete * import * import * update * update * update * update * replace path with id * update * update * update * update * comment * use go 1.15 run ci to fix ci problem * use gost zk * add lock * modify import and chinese comment * split func and bugfix * fix go.mod go.sum * fix go.mod go.sum * fix go.mod go.sum * import location
bobtthp · Jun 25, 2021 · dd29fd1 · dd29fd1
1 parent 2f30c14
commit dd29fd1
Show file tree

Hide file tree

Showing 18 changed files with 519 additions and 1,244 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -35,7 +35,7 @@ jobs:
       # If you want to matrix build , you can append the following list.
       matrix:
         go_version:
-          - 1.14
+          - 1.15
         os:
           - ubuntu-latest
 

diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@
 language: go
 
 go:
-  - "1.14"
+  - "1.15"
 env:
   - GO111MODULE=on
 

diff --git a/cmd/admin/admin.go b/cmd/admin/admin.go
diff --git a/cmd/pixiu/control.go b/cmd/pixiu/control.go
@@ -92,7 +92,7 @@ var (
 			initFromRemote := false
 			if bootstrap.GetAPIMetaConfig() != nil {
 				if _, err := config.LoadAPIConfig(bootstrap.GetAPIMetaConfig()); err != nil {
-					logger.Errorf("load api config from etcd error:%+v", err)
+					logger.Warnf("load api config from etcd error:%+v", err)
 				} else {
 					initFromRemote = true
 				}

diff --git a/configs/admin_config.yaml b/configs/admin_config.yaml
diff --git a/configs/api_config.yaml b/configs/api_config.yaml
@@ -22,6 +22,7 @@ resources:
   - path: '/api/v1/test-dubbo/user'
     type: restful
     description: user
+    timeout: 100ms
     plugins:
       pre:
         pluginNames:

diff --git a/go.mod b/go.mod
@@ -6,26 +6,29 @@ require (
 	github.com/alibaba/sentinel-golang v1.0.2
 	github.com/apache/dubbo-go v1.5.7-rc1
 	github.com/apache/dubbo-go-hessian2 v1.9.2
-	github.com/coreos/etcd v3.3.25+incompatible
 	github.com/dubbogo/dubbo-go-pixiu-filter v0.1.4-0.20210613012702-8488bf80772c
 	github.com/dubbogo/go-zookeeper v1.0.3
-	github.com/dubbogo/gost v1.11.7
+	github.com/dubbogo/gost v1.11.8
 	github.com/emirpasic/gods v1.12.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/goinggo/mapstructure v0.0.0-20140717182941-194205d9b4a9
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/hashicorp/consul/api v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/shirou/gopsutil v3.21.3+incompatible // indirect
 	github.com/spf13/cast v1.3.1
 	github.com/stretchr/testify v1.7.0
 	github.com/tklauser/go-sysconf v0.3.5 // indirect
 	github.com/urfave/cli v1.22.4
+	go.etcd.io/etcd v0.0.0-20200402134248-51bdeb39e698
 	go.uber.org/zap v1.16.0
-	google.golang.org/grpc v1.33.1
+	golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc // indirect
+	golang.org/x/sys v0.0.0-20210415045647-66c3f260301c // indirect
+	golang.org/x/text v0.3.6 // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 replace (
-	github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.8.0
-	google.golang.org/grpc v1.33.1 => google.golang.org/grpc v1.26.0
+	github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 => github.com/envoyproxy/go-control-plane v0.8.0
+	google.golang.org/grpc => google.golang.org/grpc v1.26.0
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ jobs: @@
           # If you want to matrix build , you can append the following list.
           matrix:
             go_version:
-              - 1.14
+              - 1.15
             os:
               - ubuntu-latest
@@ Expand Down @@