From 8324b64d19d13050dd48b375086dfb38a252b0f4 Mon Sep 17 00:00:00 2001 From: cachen Date: Sun, 12 Dec 2021 20:01:49 +0800 Subject: [PATCH 1/5] feat: get interfaces and methods form remote --- cmd/dubbogo-cli-v2/README.md | 35 ++++++ cmd/dubbogo-cli-v2/README_CN.md | 35 ++++++ cmd/dubbogo-cli-v2/cmd/root.go | 74 ++++++++++++ cmd/dubbogo-cli-v2/cmd/show.go | 68 +++++++++++ cmd/dubbogo-cli-v2/main.go | 24 ++++ cmd/dubbogo-cli-v2/metadata/metadata.go | 42 +++++++ .../metadata/zookeeper/zookeeper.go | 107 ++++++++++++++++++ .../metadata/zookeeper/zookeeper_test.go | 38 +++++++ go.mod | 3 + go.sum | 82 ++++++++++++++ 10 files changed, 508 insertions(+) create mode 100644 cmd/dubbogo-cli-v2/README.md create mode 100644 cmd/dubbogo-cli-v2/README_CN.md create mode 100644 cmd/dubbogo-cli-v2/cmd/root.go create mode 100644 cmd/dubbogo-cli-v2/cmd/show.go create mode 100644 cmd/dubbogo-cli-v2/main.go create mode 100644 cmd/dubbogo-cli-v2/metadata/metadata.go create mode 100644 cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper.go create mode 100644 cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper_test.go diff --git a/cmd/dubbogo-cli-v2/README.md b/cmd/dubbogo-cli-v2/README.md new file mode 100644 index 0000000..b589455 --- /dev/null +++ b/cmd/dubbogo-cli-v2/README.md @@ -0,0 +1,35 @@ +# dubbogo-cli-v2 +> dubbo-go integration tool + +## How to use +1. 安装 +```bash +go get -u github.com/dubbogo/tools/cmd/dubbogo-cli-v2 +``` +## The main function + +### Get a list of interfaces and methods +```bash +./dubbogo-cli-v2 show --r zookeeper --h 127.0.0.1:2181 +``` +The output is as follows + +```bash +interface: org.apache.dubbo.game.basketballService +methods: [] +interface: com.apache.dubbo.sample.basic.IGreeter +methods: [] +interface: com.dubbogo.pixiu.UserService +methods: [CreateUser,GetUserByCode,GetUserByName,GetUserByNameAndAge,GetUserTimeout,UpdateUser,UpdateUserByName] +interface: org.apache.dubbo.gate.basketballService +methods: [] +interface: org.apache.dubbo.game.basketballService +methods: [] +interface: com.apache.dubbo.sample.basic.IGreeter +methods: [] +interface: com.dubbogo.pixiu.UserService +methods: [CreateUser,GetUserByCode,GetUserByName,GetUserByNameAndAge,GetUserTimeout,UpdateUser,UpdateUserByName] +interface: org.apache.dubbo.gate.basketballService +methods: [] + +``` \ No newline at end of file diff --git a/cmd/dubbogo-cli-v2/README_CN.md b/cmd/dubbogo-cli-v2/README_CN.md new file mode 100644 index 0000000..f4ecdb1 --- /dev/null +++ b/cmd/dubbogo-cli-v2/README_CN.md @@ -0,0 +1,35 @@ +# dubbogo-cli-v2 +> dubbo-go 集成工具 + +## 使用方式 +1. 安装 +```bash +go get -u github.com/dubbogo/tools/cmd/dubbogo-cli-v2 +``` +## 主要功能 + +### 获取接口及方法列表 +```bash +./dubbogo-cli-v2 show --r zookeeper --h 127.0.0.1:2181 +``` +输出如下 + +```bash +interface: org.apache.dubbo.game.basketballService +methods: [] +interface: com.apache.dubbo.sample.basic.IGreeter +methods: [] +interface: com.dubbogo.pixiu.UserService +methods: [CreateUser,GetUserByCode,GetUserByName,GetUserByNameAndAge,GetUserTimeout,UpdateUser,UpdateUserByName] +interface: org.apache.dubbo.gate.basketballService +methods: [] +interface: org.apache.dubbo.game.basketballService +methods: [] +interface: com.apache.dubbo.sample.basic.IGreeter +methods: [] +interface: com.dubbogo.pixiu.UserService +methods: [CreateUser,GetUserByCode,GetUserByName,GetUserByNameAndAge,GetUserTimeout,UpdateUser,UpdateUserByName] +interface: org.apache.dubbo.gate.basketballService +methods: [] + +``` \ No newline at end of file diff --git a/cmd/dubbogo-cli-v2/cmd/root.go b/cmd/dubbogo-cli-v2/cmd/root.go new file mode 100644 index 0000000..4b46833 --- /dev/null +++ b/cmd/dubbogo-cli-v2/cmd/root.go @@ -0,0 +1,74 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cmd + +import ( + "fmt" + "os" +) + +import ( + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +var cfgFile string + +// rootCmd represents the base command when called without any subcommands +var rootCmd = &cobra.Command{ + Use: "dubbogo-cli-v2", + Short: "", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("hello") + }, +} + +// Execute adds all child commands to the root command and sets flags appropriately. +// This is called by main.main(). It only needs to happen once to the rootCmd. +func Execute() { + cobra.CheckErr(rootCmd.Execute()) +} + +func init() { + cobra.OnInitialize(initConfig) + rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.dubbogo-cli-v2.yaml)") + rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") +} + +// initConfig reads in config file and ENV variables if set. +func initConfig() { + if cfgFile != "" { + // Use config file from the flag. + viper.SetConfigFile(cfgFile) + } else { + home, err := os.UserHomeDir() + cobra.CheckErr(err) + + viper.AddConfigPath(home) + viper.SetConfigType("yaml") + viper.SetConfigName(".dubbogo-cli-v2") + } + + viper.AutomaticEnv() // read in environment variables that match + + // If a config file is found, read it in. + if err := viper.ReadInConfig(); err == nil { + fmt.Fprintln(os.Stderr, "Using config file:", viper.ConfigFileUsed()) + } +} diff --git a/cmd/dubbogo-cli-v2/cmd/show.go b/cmd/dubbogo-cli-v2/cmd/show.go new file mode 100644 index 0000000..db21629 --- /dev/null +++ b/cmd/dubbogo-cli-v2/cmd/show.go @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cmd + +import ( + "fmt" + "github.com/dubbogo/tools/cmd/dubbogo-cli-v2/metadata" + "log" + + "github.com/spf13/cobra" +) + +import ( + _ "github.com/dubbogo/tools/cmd/dubbogo-cli-v2/metadata/zookeeper" +) + +// showCmd represents the show command +var showCmd = &cobra.Command{ + Use: "show", + Short: "show interfaces and methods", + Long: ``, + Run: show, +} + +func init() { + rootCmd.AddCommand(showCmd) + showCmd.Flags().String("r", "r", "") + showCmd.Flags().String("h", "h", "") +} + +func show(cmd *cobra.Command, args []string) { + registry, err := cmd.Flags().GetString("r") + if err != nil { + panic(err) + } + host, err := cmd.Flags().GetString("h") + if err != nil { + panic(err) + } + fact, ok := metadata.GetFactory(registry) + if !ok { + log.Print("registry not support") + return + } + methodsMap, err := fact("dubbogo-cli", []string{host}).ShowChildren() + if err != nil { + panic(err) + } + for k, v := range methodsMap { + fmt.Printf("interface: %s\n", k) + fmt.Printf("methods: %v\n", v) + } +} diff --git a/cmd/dubbogo-cli-v2/main.go b/cmd/dubbogo-cli-v2/main.go new file mode 100644 index 0000000..84f18e6 --- /dev/null +++ b/cmd/dubbogo-cli-v2/main.go @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package main + +import "github.com/dubbogo/tools/cmd/dubbogo-cli-v2/cmd" + +func main() { + cmd.Execute() +} diff --git a/cmd/dubbogo-cli-v2/metadata/metadata.go b/cmd/dubbogo-cli-v2/metadata/metadata.go new file mode 100644 index 0000000..f437597 --- /dev/null +++ b/cmd/dubbogo-cli-v2/metadata/metadata.go @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package metadata + +import ( + "log" +) + +type MetaData interface { + ShowChildren() (map[string][]string, error) +} + +type Factory func(name string, zkAddrs []string) MetaData + +var factMap = make(map[string]Factory) + +func Register(name string, fact Factory) { + if _, ok := factMap[name]; ok { + log.Printf("duplicate name: %s", name) + } + factMap[name] = fact +} + +func GetFactory(name string) (fact Factory, ok bool) { + fact, ok = factMap[name] + return +} diff --git a/cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper.go b/cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper.go new file mode 100644 index 0000000..07fd251 --- /dev/null +++ b/cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper.go @@ -0,0 +1,107 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package zookeeper + +import ( + "fmt" + "log" + "time" +) + +import ( + "dubbo.apache.org/dubbo-go/v3/common" + gxzookeeper "github.com/dubbogo/gost/database/kv/zk" +) + +import ( + "github.com/dubbogo/tools/cmd/dubbogo-cli-v2/metadata" +) + +func init() { + metadata.Register("zookeeper", NewZk) +} + +func NewZk(name string, zkAddrs []string) metadata.MetaData { + return NewZookeeperMetadataReport(name, zkAddrs) +} + +// ZookeeperMetadataReport is the implementation of +// MetadataReport based on zookeeper. +type ZookeeperMetadataReport struct { + client *gxzookeeper.ZookeeperClient + rootDir string +} + +func NewZookeeperMetadataReport(name string, zkAddrs []string) *ZookeeperMetadataReport { + client, err := gxzookeeper.NewZookeeperClient( + name, + zkAddrs, + false, + gxzookeeper.WithZkTimeOut(15*time.Second)) + if err != nil { + panic(err) + } + return &ZookeeperMetadataReport{ + client: client, + rootDir: "/dubbo", + } +} + +func (z *ZookeeperMetadataReport) GetChildren(path string) ([]string, error) { + delimiter := "/" + if path == "" { + delimiter = path + } + return z.client.GetChildren(z.rootDir + delimiter + path) +} + +func (z *ZookeeperMetadataReport) ShowChildren() (map[string][]string, error) { + methodsMap := map[string][]string{} + inters, err := z.GetChildren("") + if err != nil { + return nil, err + } + for _, inter := range inters { + if _, ok := methodsMap[inter]; !ok { + methodsMap[inter] = make([]string, 0) + } + + interChildren, err := z.GetChildren(inter) + if err != nil { + return nil, err + } + for _, interChild := range interChildren { + interURLs, err := z.GetChildren(inter + "/" + interChild) + if err != nil { + log.Println(err) + } + for _, interURL := range interURLs { + url, err := common.NewURL(interURL) + if err != nil { + return nil, err + } + methodsMap[inter] = append(methodsMap[inter], url.GetParam("methods", "")) + } + } + } + for k, v := range methodsMap { + fmt.Printf("interface: %s\n", k) + fmt.Printf("methods: %v\n", v) + } + return methodsMap, nil +} diff --git a/cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper_test.go b/cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper_test.go new file mode 100644 index 0000000..e077ceb --- /dev/null +++ b/cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper_test.go @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package zookeeper + +import ( + "testing" +) + +import ( + "github.com/stretchr/testify/assert" +) + +func TestShowChildren(t *testing.T) { + methodsMap, err := NewZookeeperMetadataReport( + "dubbo-cli", + []string{"127.0.0.1:2181"}, + ).ShowChildren() + assert.NoError(t, err) + for k, v := range methodsMap { + t.Logf("interface: %s\n", k) + t.Logf("methods: %v\n", v) + } +} diff --git a/go.mod b/go.mod index ea19848..ea224b4 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,9 @@ require ( github.com/golang/protobuf v1.5.2 github.com/magiconair/properties v1.8.5 github.com/pkg/errors v0.9.1 + github.com/spf13/cobra v1.2.1 + github.com/spf13/viper v1.8.1 + github.com/stretchr/testify v1.7.0 go.uber.org/atomic v1.9.0 google.golang.org/grpc v1.42.0 google.golang.org/protobuf v1.27.1 diff --git a/go.sum b/go.sum index c5564de..aac960f 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,11 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -113,6 +118,7 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -131,6 +137,7 @@ github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= 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-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= @@ -167,6 +174,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/dubbogo/go-zookeeper v1.0.3 h1:UkuY+rBsxdT7Bs63QAzp9z7XqQ53W1j8E5rwl83me8g= github.com/dubbogo/go-zookeeper v1.0.3/go.mod h1:fn6n2CAEer3novYgk9ULLwAjuV8/g4DdC2ENwRb6E+c= github.com/dubbogo/gost v1.9.0/go.mod h1:pPTjVyoJan3aPxBPNUX0ADkXjPibLo+/Ib0/fADXSG8= github.com/dubbogo/gost v1.11.12/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI= @@ -199,6 +207,7 @@ github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4s 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.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= 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.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= @@ -293,6 +302,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -309,6 +319,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= 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/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -324,6 +335,7 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/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.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -334,6 +346,7 @@ github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -341,6 +354,10 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -426,7 +443,9 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKe github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag= @@ -470,6 +489,7 @@ github.com/knadh/koanf v1.3.2 h1:0JKfmTLcvEmdJwjY16BMOVKpqThxRwj29CtQvZiCsAA= github.com/knadh/koanf v1.3.2/go.mod h1:HZ7HMLIGbrWJUfgtEzfHvzR/rX+eIqQlBNPRr4Vt42s= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -581,6 +601,7 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= @@ -593,6 +614,7 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -676,12 +698,18 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= +github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= +github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -690,6 +718,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stephens2424/writerset v1.0.2/go.mod h1:aS2JhsMn6eA7e82oNmW4rfsgAOp9COBTTl8mzkwADnc= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -743,6 +772,7 @@ go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQc go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0-alpha.0/go.mod h1:kdV+xzCJ3luEBSIeQyB/OEKkWKd8Zkux4sbDeANrosU= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v3 v3.5.0-alpha.0/go.mod h1:wKt7jgDgf/OfKiYmCq5WFGxOFAkVMLxiiXgLDFhECr8= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0/go.mod h1:tV31atvwzcybuqejDoY3oaNRTtlD2l/Ot78Pc9w7DMY= @@ -755,6 +785,7 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= @@ -787,6 +818,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -821,6 +853,7 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= @@ -831,6 +864,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/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.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -873,9 +908,13 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= 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-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -886,6 +925,13 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -949,13 +995,20 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -974,6 +1027,7 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -1035,9 +1089,15 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200928182047-19e03678916f/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201014170642-d1624618ad65/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= @@ -1069,6 +1129,12 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1076,6 +1142,7 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1111,7 +1178,17 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210106152847-07624b53cd92/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20211104193956-4c6863e31247 h1:ZONpjmFT5e+I/0/xE3XXbG5OIvX2hRYzol04MhKBl2E= google.golang.org/genproto v0.0.0-20211104193956-4c6863e31247/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= @@ -1135,10 +1212,14 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= @@ -1175,6 +1256,7 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= From 60f76703065182cc61dd816bc51c563eac012955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=95=E6=B0=98=E6=B0=9A?= Date: Thu, 13 Jan 2022 02:24:53 +0800 Subject: [PATCH 2/5] docs: add blank line between title and content --- cmd/dubbogo-cli-v2/README.md | 3 +++ cmd/dubbogo-cli-v2/README_CN.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cmd/dubbogo-cli-v2/README.md b/cmd/dubbogo-cli-v2/README.md index b589455..b04db08 100644 --- a/cmd/dubbogo-cli-v2/README.md +++ b/cmd/dubbogo-cli-v2/README.md @@ -1,7 +1,9 @@ # dubbogo-cli-v2 + > dubbo-go integration tool ## How to use + 1. 安装 ```bash go get -u github.com/dubbogo/tools/cmd/dubbogo-cli-v2 @@ -9,6 +11,7 @@ go get -u github.com/dubbogo/tools/cmd/dubbogo-cli-v2 ## The main function ### Get a list of interfaces and methods + ```bash ./dubbogo-cli-v2 show --r zookeeper --h 127.0.0.1:2181 ``` diff --git a/cmd/dubbogo-cli-v2/README_CN.md b/cmd/dubbogo-cli-v2/README_CN.md index f4ecdb1..8ba6b85 100644 --- a/cmd/dubbogo-cli-v2/README_CN.md +++ b/cmd/dubbogo-cli-v2/README_CN.md @@ -1,7 +1,9 @@ # dubbogo-cli-v2 + > dubbo-go 集成工具 ## 使用方式 + 1. 安装 ```bash go get -u github.com/dubbogo/tools/cmd/dubbogo-cli-v2 @@ -9,6 +11,7 @@ go get -u github.com/dubbogo/tools/cmd/dubbogo-cli-v2 ## 主要功能 ### 获取接口及方法列表 + ```bash ./dubbogo-cli-v2 show --r zookeeper --h 127.0.0.1:2181 ``` From cba32c95b724cd1c6bd3e04c5dc475385afa0608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=95=E6=B0=98=E6=B0=9A?= Date: Mon, 17 Jan 2022 01:11:28 +0800 Subject: [PATCH 3/5] docs: add comments --- cmd/dubbogo-cli-v2/metadata/metadata.go | 4 ++++ cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper.go | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/dubbogo-cli-v2/metadata/metadata.go b/cmd/dubbogo-cli-v2/metadata/metadata.go index f437597..9072477 100644 --- a/cmd/dubbogo-cli-v2/metadata/metadata.go +++ b/cmd/dubbogo-cli-v2/metadata/metadata.go @@ -21,14 +21,17 @@ import ( "log" ) +// MetaData meta data from registration center type MetaData interface { ShowChildren() (map[string][]string, error) } +// Factory metaData factory function type Factory func(name string, zkAddrs []string) MetaData var factMap = make(map[string]Factory) +// Register a factory into factMap func Register(name string, fact Factory) { if _, ok := factMap[name]; ok { log.Printf("duplicate name: %s", name) @@ -36,6 +39,7 @@ func Register(name string, fact Factory) { factMap[name] = fact } +// GetFactory get a factory function from factMap func GetFactory(name string) (fact Factory, ok bool) { fact, ok = factMap[name] return diff --git a/cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper.go b/cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper.go index 07fd251..c26fb36 100644 --- a/cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper.go +++ b/cmd/dubbogo-cli-v2/metadata/zookeeper/zookeeper.go @@ -33,11 +33,7 @@ import ( ) func init() { - metadata.Register("zookeeper", NewZk) -} - -func NewZk(name string, zkAddrs []string) metadata.MetaData { - return NewZookeeperMetadataReport(name, zkAddrs) + metadata.Register("zookeeper", NewZookeeperMetadataReport) } // ZookeeperMetadataReport is the implementation of @@ -47,7 +43,8 @@ type ZookeeperMetadataReport struct { rootDir string } -func NewZookeeperMetadataReport(name string, zkAddrs []string) *ZookeeperMetadataReport { +// NewZookeeperMetadataReport create a zookeeper metadata reporter +func NewZookeeperMetadataReport(name string, zkAddrs []string) metadata.MetaData { client, err := gxzookeeper.NewZookeeperClient( name, zkAddrs, @@ -62,6 +59,7 @@ func NewZookeeperMetadataReport(name string, zkAddrs []string) *ZookeeperMetadat } } +// GetChildren get children node func (z *ZookeeperMetadataReport) GetChildren(path string) ([]string, error) { delimiter := "/" if path == "" { @@ -70,6 +68,7 @@ func (z *ZookeeperMetadataReport) GetChildren(path string) ([]string, error) { return z.client.GetChildren(z.rootDir + delimiter + path) } +// ShowChildren shou children list func (z *ZookeeperMetadataReport) ShowChildren() (map[string][]string, error) { methodsMap := map[string][]string{} inters, err := z.GetChildren("") From 22daf7b26d3e1548d29700dc2626d6f5504ae56b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=95=E6=B0=98=E6=B0=9A?= Date: Mon, 17 Jan 2022 01:08:35 +0800 Subject: [PATCH 4/5] feat: call service method by call command --- cmd/dubbogo-cli-v2/cmd/call.go | 91 ++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 cmd/dubbogo-cli-v2/cmd/call.go diff --git a/cmd/dubbogo-cli-v2/cmd/call.go b/cmd/dubbogo-cli-v2/cmd/call.go new file mode 100644 index 0000000..299fc9e --- /dev/null +++ b/cmd/dubbogo-cli-v2/cmd/call.go @@ -0,0 +1,91 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cmd + +import ( + "github.com/dubbogo/tools/internal/client" + "github.com/dubbogo/tools/internal/json_register" + "log" + + "github.com/spf13/cobra" +) + +// callCmd represents the call command +var ( + callCmd = &cobra.Command{ + Use: "call", + Short: "call a method", + Long: "", + Run: call, + } +) + +var ( + host string + port int + protocolName string + InterfaceID string + version string + group string + method string + sendObjFilePath string + recvObjFilePath string + timeout int +) + +func init() { + rootCmd.AddCommand(callCmd) + showCmd.Flags().String("r", "localhost", "") + showCmd.Flags().Int("h", 8080, "") + + showCmd.Flags().StringVarP(&host, "h", "", "localhost", "target server host") + showCmd.Flags().IntVarP(&port, "p", "", 8080, "target server port") + showCmd.Flags().StringVarP(&protocolName, "proto", "", "dubbo", "transfer protocol") + showCmd.Flags().StringVarP(&InterfaceID, "i", "", "com", "target service registered interface") + showCmd.Flags().StringVarP(&version, "v", "", "", "target service version") + showCmd.Flags().StringVarP(&group, "g", "", "", "target service group") + showCmd.Flags().StringVarP(&method, "method", "", "", "target method") + showCmd.Flags().StringVarP(&sendObjFilePath, "sendObj", "", "", "json file path to define transfer struct") + showCmd.Flags().StringVarP(&recvObjFilePath, "recvObj", "", "", "json file path to define receive struct") + showCmd.Flags().IntVarP(&timeout, "timeout", "", 3000, "request timeout (ms)") +} + +func call(cmd *cobra.Command, args []string) { + checkParam() + reqPkg := json_register.RegisterStructFromFile(sendObjFilePath) + recvPkg := json_register.RegisterStructFromFile(recvObjFilePath) + + t, err := client.NewTelnetClient(host, port, protocolName, InterfaceID, version, group, method, reqPkg, timeout) + if err != nil { + panic(err) + } + t.ProcessRequests(recvPkg) + t.Destroy() +} + +func checkParam() { + if method == "" { + log.Fatalln("-method value not fond") + } + if sendObjFilePath == "" { + log.Fatalln("-sendObj value not found") + } + if recvObjFilePath == "" { + log.Fatalln("-recObj value not found") + } +} From a56ed3110bc66e9b4fe58a9856c00f1c1bc08e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=95=E6=B0=98=E6=B0=9A?= Date: Mon, 24 Jan 2022 02:48:58 +0800 Subject: [PATCH 5/5] feat: support new project --- cmd/dubbogo-cli-v2/README.md | 14 +- cmd/dubbogo-cli-v2/README_CN.md | 12 +- cmd/dubbogo-cli-v2/cmd/call.go | 33 +-- cmd/dubbogo-cli-v2/cmd/new.go | 48 ++++ cmd/dubbogo-cli-v2/cmd/show.go | 6 +- cmd/dubbogo-cli-v2/docs/demo/img.png | Bin 0 -> 6780 bytes cmd/dubbogo-cli-v2/generator/sample/api.go | 243 ++++++++++++++++++ .../generator/sample/api_tripe.go | 231 +++++++++++++++++ .../generator/sample/constants.go | 22 ++ .../generator/sample/gen_c_conf.go | 23 ++ .../generator/sample/gen_client.go | 47 ++++ .../generator/sample/gen_s_conf.go | 25 ++ .../generator/sample/gen_server.go | 46 ++++ .../generator/sample/generator.go | 80 ++++++ cmd/dubbogo-cli-v2/generator/sample/mod.go | 24 ++ cmd/dubbogo-cli-v2/generator/sample/proto.go | 36 +++ go.sum | 7 + 17 files changed, 877 insertions(+), 20 deletions(-) create mode 100644 cmd/dubbogo-cli-v2/cmd/new.go create mode 100644 cmd/dubbogo-cli-v2/docs/demo/img.png create mode 100644 cmd/dubbogo-cli-v2/generator/sample/api.go create mode 100644 cmd/dubbogo-cli-v2/generator/sample/api_tripe.go create mode 100644 cmd/dubbogo-cli-v2/generator/sample/constants.go create mode 100644 cmd/dubbogo-cli-v2/generator/sample/gen_c_conf.go create mode 100644 cmd/dubbogo-cli-v2/generator/sample/gen_client.go create mode 100644 cmd/dubbogo-cli-v2/generator/sample/gen_s_conf.go create mode 100644 cmd/dubbogo-cli-v2/generator/sample/gen_server.go create mode 100644 cmd/dubbogo-cli-v2/generator/sample/generator.go create mode 100644 cmd/dubbogo-cli-v2/generator/sample/mod.go create mode 100644 cmd/dubbogo-cli-v2/generator/sample/proto.go diff --git a/cmd/dubbogo-cli-v2/README.md b/cmd/dubbogo-cli-v2/README.md index b04db08..817e8d5 100644 --- a/cmd/dubbogo-cli-v2/README.md +++ b/cmd/dubbogo-cli-v2/README.md @@ -4,7 +4,7 @@ ## How to use -1. 安装 +1. Install ```bash go get -u github.com/dubbogo/tools/cmd/dubbogo-cli-v2 ``` @@ -35,4 +35,14 @@ methods: [CreateUser,GetUserByCode,GetUserByName,GetUserByNameAndAge,GetUserTime interface: org.apache.dubbo.gate.basketballService methods: [] -``` \ No newline at end of file +``` + +### Create demo + +```bash +./dubbogo-cli-v2 new --path=./demo +``` + +This command will generate a dubbo-go example, you can refer to the example [HOWTO](https://github.com/apache/dubbo-go-samples/blob/master/HOWTO.md) to run. + +![img.png](docs/demo/img.png) diff --git a/cmd/dubbogo-cli-v2/README_CN.md b/cmd/dubbogo-cli-v2/README_CN.md index 8ba6b85..53d8618 100644 --- a/cmd/dubbogo-cli-v2/README_CN.md +++ b/cmd/dubbogo-cli-v2/README_CN.md @@ -35,4 +35,14 @@ methods: [CreateUser,GetUserByCode,GetUserByName,GetUserByNameAndAge,GetUserTime interface: org.apache.dubbo.gate.basketballService methods: [] -``` \ No newline at end of file +``` + +### 创建 demo + +```bash +./dubbogo-cli-v2 new --path=./demo +``` + +该命令会生成一个 dubbo-go 的样例，该样例可以参考 [HOWTO](https://github.com/apache/dubbo-go-samples/blob/master/HOWTO.md) 运行: + +![img.png](docs/demo/img.png) diff --git a/cmd/dubbogo-cli-v2/cmd/call.go b/cmd/dubbogo-cli-v2/cmd/call.go index 299fc9e..5b52e33 100644 --- a/cmd/dubbogo-cli-v2/cmd/call.go +++ b/cmd/dubbogo-cli-v2/cmd/call.go @@ -18,13 +18,18 @@ package cmd import ( - "github.com/dubbogo/tools/internal/client" - "github.com/dubbogo/tools/internal/json_register" "log" +) +import ( "github.com/spf13/cobra" ) +import ( + "github.com/dubbogo/tools/internal/client" + "github.com/dubbogo/tools/internal/json_register" +) + // callCmd represents the call command var ( callCmd = &cobra.Command{ @@ -50,22 +55,20 @@ var ( func init() { rootCmd.AddCommand(callCmd) - showCmd.Flags().String("r", "localhost", "") - showCmd.Flags().Int("h", 8080, "") - showCmd.Flags().StringVarP(&host, "h", "", "localhost", "target server host") - showCmd.Flags().IntVarP(&port, "p", "", 8080, "target server port") - showCmd.Flags().StringVarP(&protocolName, "proto", "", "dubbo", "transfer protocol") - showCmd.Flags().StringVarP(&InterfaceID, "i", "", "com", "target service registered interface") - showCmd.Flags().StringVarP(&version, "v", "", "", "target service version") - showCmd.Flags().StringVarP(&group, "g", "", "", "target service group") - showCmd.Flags().StringVarP(&method, "method", "", "", "target method") - showCmd.Flags().StringVarP(&sendObjFilePath, "sendObj", "", "", "json file path to define transfer struct") - showCmd.Flags().StringVarP(&recvObjFilePath, "recvObj", "", "", "json file path to define receive struct") - showCmd.Flags().IntVarP(&timeout, "timeout", "", 3000, "request timeout (ms)") + callCmd.Flags().StringVarP(&host, "h", "", "localhost", "target server host") + callCmd.Flags().IntVarP(&port, "p", "", 8080, "target server port") + callCmd.Flags().StringVarP(&protocolName, "proto", "", "dubbo", "transfer protocol") + callCmd.Flags().StringVarP(&InterfaceID, "i", "", "com", "target service registered interface") + callCmd.Flags().StringVarP(&version, "v", "", "", "target service version") + callCmd.Flags().StringVarP(&group, "g", "", "", "target service group") + callCmd.Flags().StringVarP(&method, "method", "", "", "target method") + callCmd.Flags().StringVarP(&sendObjFilePath, "sendObj", "", "", "json file path to define transfer struct") + callCmd.Flags().StringVarP(&recvObjFilePath, "recvObj", "", "", "json file path to define receive struct") + callCmd.Flags().IntVarP(&timeout, "timeout", "", 3000, "request timeout (ms)") } -func call(cmd *cobra.Command, args []string) { +func call(_ *cobra.Command, _ []string) { checkParam() reqPkg := json_register.RegisterStructFromFile(sendObjFilePath) recvPkg := json_register.RegisterStructFromFile(recvObjFilePath) diff --git a/cmd/dubbogo-cli-v2/cmd/new.go b/cmd/dubbogo-cli-v2/cmd/new.go new file mode 100644 index 0000000..0775052 --- /dev/null +++ b/cmd/dubbogo-cli-v2/cmd/new.go @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cmd + +import ( + "github.com/spf13/cobra" +) + +import ( + "github.com/dubbogo/tools/cmd/dubbogo-cli-v2/generator/sample" +) + +// newCmd represents the new command +var newCmd = &cobra.Command{ + Use: "new", + Short: "new a dubbo-go demo project", + Run: createDemo, +} + +func init() { + rootCmd.AddCommand(newCmd) + newCmd.Flags().String("path", "rootPath", "") +} + +func createDemo(cmd *cobra.Command, _ []string) { + path, err := cmd.Flags().GetString("path") + if err != nil { + panic(err) + } + if err := sample.Generate(path); err != nil { + panic(err) + } +} diff --git a/cmd/dubbogo-cli-v2/cmd/show.go b/cmd/dubbogo-cli-v2/cmd/show.go index db21629..6b57f57 100644 --- a/cmd/dubbogo-cli-v2/cmd/show.go +++ b/cmd/dubbogo-cli-v2/cmd/show.go @@ -19,13 +19,15 @@ package cmd import ( "fmt" - "github.com/dubbogo/tools/cmd/dubbogo-cli-v2/metadata" "log" +) +import ( "github.com/spf13/cobra" ) import ( + "github.com/dubbogo/tools/cmd/dubbogo-cli-v2/metadata" _ "github.com/dubbogo/tools/cmd/dubbogo-cli-v2/metadata/zookeeper" ) @@ -43,7 +45,7 @@ func init() { showCmd.Flags().String("h", "h", "") } -func show(cmd *cobra.Command, args []string) { +func show(cmd *cobra.Command, _ []string) { registry, err := cmd.Flags().GetString("r") if err != nil { panic(err) diff --git a/cmd/dubbogo-cli-v2/docs/demo/img.png b/cmd/dubbogo-cli-v2/docs/demo/img.png new file mode 100644 index 0000000000000000000000000000000000000000..531c22bf5aae5f8914e05a324f020ffb4037b371 GIT binary patch literal 6780 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 TmBHIzC4h#ijtWf4I{g0uEGMJw literal 0 HcmV?d00001 diff --git a/cmd/dubbogo-cli-v2/generator/sample/api.go b/cmd/dubbogo-cli-v2/generator/sample/api.go new file mode 100644 index 0000000..d2ddd2d --- /dev/null +++ b/cmd/dubbogo-cli-v2/generator/sample/api.go @@ -0,0 +1,243 @@ +package sample + +const ( + apiFile = `package api + +import ( + reflect "reflect" + sync "sync" +) + +import ( + proto "github.com/golang/protobuf/proto" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + + protoimpl "google.golang.org/protobuf/runtime/protoimpl" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + +// The request message containing the user's name. +type HelloRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + +` + "\nName string `protobuf:\"bytes,1,opt,name=name,proto3\" json:\"name,omitempty\"`\n}\n" + + ` +func (x *HelloRequest) Reset() { + *x = HelloRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_samples_api_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HelloRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HelloRequest) ProtoMessage() {} + +func (x *HelloRequest) ProtoReflect() protoreflect.Message { + mi := &file_samples_api_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HelloRequest.ProtoReflect.Descriptor instead. +func (*HelloRequest) Descriptor() ([]byte, []int) { + return file_samples_api_proto_rawDescGZIP(), []int{0} +} + +func (x *HelloRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} +` + + "type User struct {\n\tstate protoimpl.MessageState\n\tsizeCache " + + "protoimpl.SizeCache\n\tunknownFields protoimpl.UnknownFields\n\n\tName string `protobuf:\"bytes,1,opt,name=name" + + ",proto3\" json:\"name,omitempty\"`\n\tId string `protobuf:\"bytes,2,opt,name=id,proto3\" json:\"id,omitempt" + + "y\"`\n\tAge int32 `protobuf:\"varint,3,opt,name=age,proto3\" json:\"age,omitempty\"`\n}" + + ` +func (x *User) Reset() { + *x = User{} + if protoimpl.UnsafeEnabled { + mi := &file_samples_api_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *User) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*User) ProtoMessage() {} + +func (x *User) ProtoReflect() protoreflect.Message { + mi := &file_samples_api_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use User.ProtoReflect.Descriptor instead. +func (*User) Descriptor() ([]byte, []int) { + return file_samples_api_proto_rawDescGZIP(), []int{1} +} + +func (x *User) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *User) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *User) GetAge() int32 { + if x != nil { + return x.Age + } + return 0 +} + +var File_samples_api_proto protoreflect.FileDescriptor + +var file_samples_api_proto_rawDesc = []byte{ + 0x0a, 0x11, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x61, 0x70, 0x69, 0x22, 0x22, 0x0a, 0x0c, 0x48, 0x65, 0x6c, 0x6c, + 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3c, 0x0a, 0x04, + 0x55, 0x73, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x67, 0x65, 0x32, 0x6b, 0x0a, 0x07, 0x47, 0x72, + 0x65, 0x65, 0x74, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x08, 0x53, 0x61, 0x79, 0x48, 0x65, 0x6c, 0x6c, + 0x6f, 0x12, 0x11, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x09, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, + 0x00, 0x12, 0x34, 0x0a, 0x0e, 0x53, 0x61, 0x79, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x53, 0x74, 0x72, + 0x65, 0x61, 0x6d, 0x12, 0x11, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x09, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x55, 0x73, 0x65, + 0x72, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2f, 0x3b, 0x61, 0x70, + 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_samples_api_proto_rawDescOnce sync.Once + file_samples_api_proto_rawDescData = file_samples_api_proto_rawDesc +) + +func file_samples_api_proto_rawDescGZIP() []byte { + file_samples_api_proto_rawDescOnce.Do(func() { + file_samples_api_proto_rawDescData = protoimpl.X.CompressGZIP(file_samples_api_proto_rawDescData) + }) + return file_samples_api_proto_rawDescData +} + +var file_samples_api_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_samples_api_proto_goTypes = []interface{}{ + (*HelloRequest)(nil), // 0: api.HelloRequest + (*User)(nil), // 1: api.User +} +var file_samples_api_proto_depIdxs = []int32{ + 0, // 0: api.Greeter.SayHello:input_type -> api.HelloRequest + 0, // 1: api.Greeter.SayHelloStream:input_type -> api.HelloRequest + 1, // 2: api.Greeter.SayHello:output_type -> api.User + 1, // 3: api.Greeter.SayHelloStream:output_type -> api.User + 2, // [2:4] is the sub-list for method output_type + 0, // [0:2] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_samples_api_proto_init() } +func file_samples_api_proto_init() { + if File_samples_api_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_samples_api_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HelloRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_samples_api_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*User); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_samples_api_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_samples_api_proto_goTypes, + DependencyIndexes: file_samples_api_proto_depIdxs, + MessageInfos: file_samples_api_proto_msgTypes, + }.Build() + File_samples_api_proto = out.File + file_samples_api_proto_rawDesc = nil + file_samples_api_proto_goTypes = nil + file_samples_api_proto_depIdxs = nil +}` +) + +func init() { + fileMap["apiFile"] = &fileGenerator{ + path: "./api", + file: "samples_api.pb.go", + context: license + apiFile, + } +} diff --git a/cmd/dubbogo-cli-v2/generator/sample/api_tripe.go b/cmd/dubbogo-cli-v2/generator/sample/api_tripe.go new file mode 100644 index 0000000..5803f94 --- /dev/null +++ b/cmd/dubbogo-cli-v2/generator/sample/api_tripe.go @@ -0,0 +1,231 @@ +package sample + +const ( + apiTripeFile = `package api + +import ( + context "context" + fmt "fmt" +) + +import ( + protocol "dubbo.apache.org/dubbo-go/v3/protocol" + dubbo3 "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3" + invocation "dubbo.apache.org/dubbo-go/v3/protocol/invocation" + + grpc_go "github.com/dubbogo/grpc-go" + codes "github.com/dubbogo/grpc-go/codes" + metadata "github.com/dubbogo/grpc-go/metadata" + status "github.com/dubbogo/grpc-go/status" + + common "github.com/dubbogo/triple/pkg/common" + constant "github.com/dubbogo/triple/pkg/common/constant" + triple "github.com/dubbogo/triple/pkg/triple" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc_go.SupportPackageIsVersion7 + +// GreeterClient is the client API for Greeter service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type GreeterClient interface { + // Sends a greeting + SayHello(ctx context.Context, in *HelloRequest, opts ...grpc_go.CallOption) (*User, common.ErrorWithAttachment) + // Sends a greeting via stream + SayHelloStream(ctx context.Context, opts ...grpc_go.CallOption) (Greeter_SayHelloStreamClient, error) +} + +type greeterClient struct { + cc *triple.TripleConn +} + +type GreeterClientImpl struct { + SayHello func(ctx context.Context, in *HelloRequest) (*User, error) + SayHelloStream func(ctx context.Context) (Greeter_SayHelloStreamClient, error) +} + +func (c *GreeterClientImpl) GetDubboStub(cc *triple.TripleConn) GreeterClient { + return NewGreeterClient(cc) +} + +func NewGreeterClient(cc *triple.TripleConn) GreeterClient { + return &greeterClient{cc} +} + +func (c *greeterClient) SayHello(ctx context.Context, in *HelloRequest, opts ...grpc_go.CallOption) (*User, common.ErrorWithAttachment) { + out := new(User) + interfaceKey := ctx.Value(constant.InterfaceKey).(string) + return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/SayHello", in, out) +} + +func (c *greeterClient) SayHelloStream(ctx context.Context, opts ...grpc_go.CallOption) (Greeter_SayHelloStreamClient, error) { + interfaceKey := ctx.Value(constant.InterfaceKey).(string) + stream, err := c.cc.NewStream(ctx, "/"+interfaceKey+"/SayHelloStream", opts...) + if err != nil { + return nil, err + } + x := &greeterSayHelloStreamClient{stream} + return x, nil +} + +type Greeter_SayHelloStreamClient interface { + Send(*HelloRequest) error + Recv() (*User, error) + grpc_go.ClientStream +} + +type greeterSayHelloStreamClient struct { + grpc_go.ClientStream +} + +func (x *greeterSayHelloStreamClient) Send(m *HelloRequest) error { + return x.ClientStream.SendMsg(m) +} + +func (x *greeterSayHelloStreamClient) Recv() (*User, error) { + m := new(User) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +// GreeterServer is the server API for Greeter service. +// All implementations must embed UnimplementedGreeterServer +// for forward compatibility +type GreeterServer interface { + // Sends a greeting + SayHello(context.Context, *HelloRequest) (*User, error) + // Sends a greeting via stream + SayHelloStream(Greeter_SayHelloStreamServer) error + mustEmbedUnimplementedGreeterServer() +} + +// UnimplementedGreeterServer must be embedded to have forward compatible implementations. +type UnimplementedGreeterServer struct { + proxyImpl protocol.Invoker +} + +func (UnimplementedGreeterServer) SayHello(context.Context, *HelloRequest) (*User, error) { + return nil, status.Errorf(codes.Unimplemented, "method SayHello not implemented") +} +func (UnimplementedGreeterServer) SayHelloStream(Greeter_SayHelloStreamServer) error { + return status.Errorf(codes.Unimplemented, "method SayHelloStream not implemented") +} +func (s *UnimplementedGreeterServer) XXX_SetProxyImpl(impl protocol.Invoker) { + s.proxyImpl = impl +} + +func (s *UnimplementedGreeterServer) XXX_GetProxyImpl() protocol.Invoker { + return s.proxyImpl +} + +func (s *UnimplementedGreeterServer) XXX_ServiceDesc() *grpc_go.ServiceDesc { + return &Greeter_ServiceDesc +} +func (UnimplementedGreeterServer) mustEmbedUnimplementedGreeterServer() {} + +// UnsafeGreeterServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to GreeterServer will +// result in compilation errors. +type UnsafeGreeterServer interface { + mustEmbedUnimplementedGreeterServer() +} + +func RegisterGreeterServer(s grpc_go.ServiceRegistrar, srv GreeterServer) { + s.RegisterService(&Greeter_ServiceDesc, srv) +} + +func _Greeter_SayHello_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) { + in := new(HelloRequest) + if err := dec(in); err != nil { + return nil, err + } + base := srv.(dubbo3.Dubbo3GrpcService) + args := []interface{}{} + args = append(args, in) + md, _ := metadata.FromIncomingContext(ctx) + invAttachment := make(map[string]interface{}, len(md)) + for k, v := range md { + invAttachment[k] = v + } + invo := invocation.NewRPCInvocation("SayHello", args, invAttachment) + if interceptor == nil { + result := base.XXX_GetProxyImpl().Invoke(ctx, invo) + return result, result.Error() + } + info := &grpc_go.UnaryServerInfo{ + Server: srv, + FullMethod: "/api.Greeter/SayHello", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(GreeterServer).SayHello(ctx, req.(*HelloRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Greeter_SayHelloStream_Handler(srv interface{}, stream grpc_go.ServerStream) error { + _, ok := srv.(dubbo3.Dubbo3GrpcService) + invo := invocation.NewRPCInvocation("SayHelloStream", nil, nil) + if !ok { + fmt.Println(invo) + return nil + } + return srv.(GreeterServer).SayHelloStream(&greeterSayHelloStreamServer{stream}) +} + +type Greeter_SayHelloStreamServer interface { + Send(*User) error + Recv() (*HelloRequest, error) + grpc_go.ServerStream +} + +type greeterSayHelloStreamServer struct { + grpc_go.ServerStream +} + +func (x *greeterSayHelloStreamServer) Send(m *User) error { + return x.ServerStream.SendMsg(m) +} + +func (x *greeterSayHelloStreamServer) Recv() (*HelloRequest, error) { + m := new(HelloRequest) + if err := x.ServerStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +// Greeter_ServiceDesc is the grpc_go.ServiceDesc for Greeter service. +// It's only intended for direct use with grpc_go.RegisterService, +// and not to be introspected or modified (even as a copy) +var Greeter_ServiceDesc = grpc_go.ServiceDesc{ + ServiceName: "api.Greeter", + HandlerType: (*GreeterServer)(nil), + Methods: []grpc_go.MethodDesc{ + { + MethodName: "SayHello", + Handler: _Greeter_SayHello_Handler, + }, + }, + Streams: []grpc_go.StreamDesc{ + { + StreamName: "SayHelloStream", + Handler: _Greeter_SayHelloStream_Handler, + ServerStreams: true, + ClientStreams: true, + }, + }, + Metadata: "samples_api.proto", +}` +) + +func init() { + fileMap["apiTripeFile"] = &fileGenerator{ + path: "./api", + file: "samples_api_triple.pb.go", + context: license + apiTripeFile, + } +} diff --git a/cmd/dubbogo-cli-v2/generator/sample/constants.go b/cmd/dubbogo-cli-v2/generator/sample/constants.go new file mode 100644 index 0000000..75b41f7 --- /dev/null +++ b/cmd/dubbogo-cli-v2/generator/sample/constants.go @@ -0,0 +1,22 @@ +package sample + +const ( + license = `/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +` +) diff --git a/cmd/dubbogo-cli-v2/generator/sample/gen_c_conf.go b/cmd/dubbogo-cli-v2/generator/sample/gen_c_conf.go new file mode 100644 index 0000000..d006052 --- /dev/null +++ b/cmd/dubbogo-cli-v2/generator/sample/gen_c_conf.go @@ -0,0 +1,23 @@ +package sample + +const ( + clientConfigFile = `dubbo: + registries: + demoZK: + protocol: zookeeper + timeout: 3s + address: 127.0.0.1:2181 + consumer: + references: + GreeterClientImpl: + protocol: tri + interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java` +) + +func init() { + fileMap["clientConfigFile"] = &fileGenerator{ + path: "./go-client/conf", + file: "dubbogo.yml", + context: clientConfigFile, + } +} diff --git a/cmd/dubbogo-cli-v2/generator/sample/gen_client.go b/cmd/dubbogo-cli-v2/generator/sample/gen_client.go new file mode 100644 index 0000000..2e637ae --- /dev/null +++ b/cmd/dubbogo-cli-v2/generator/sample/gen_client.go @@ -0,0 +1,47 @@ +package sample + +const ( + clientCode = `package main + +import ( + "context" +) + +import ( + "dubbo.apache.org/dubbo-go/v3/common/logger" + "dubbo.apache.org/dubbo-go/v3/config" + _ "dubbo.apache.org/dubbo-go/v3/imports" +) + +import ( + "helloworld/api" +) + +var grpcGreeterImpl = new(api.GreeterClientImpl) + +// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-client/conf/dubbogo.yml +func main() { + config.SetConsumerService(grpcGreeterImpl) + if err := config.Load(); err != nil { + panic(err) + } + + logger.Info("start to test dubbo") + req := &api.HelloRequest{ + Name: "laurence", + } + reply, err := grpcGreeterImpl.SayHello(context.Background(), req) + if err != nil { + logger.Error(err) + } + logger.Infof("client response result: %v\n", reply) +}` +) + +func init() { + fileMap["clientGenerator"] = &fileGenerator{ + path: "./go-client/cmd", + file: "client.go", + context: license + clientCode, + } +} diff --git a/cmd/dubbogo-cli-v2/generator/sample/gen_s_conf.go b/cmd/dubbogo-cli-v2/generator/sample/gen_s_conf.go new file mode 100644 index 0000000..91f53d4 --- /dev/null +++ b/cmd/dubbogo-cli-v2/generator/sample/gen_s_conf.go @@ -0,0 +1,25 @@ +package sample + +const ( + serverConfigFile = `dubbo: + registries: + demoZK: + protocol: zookeeper + address: 127.0.0.1:2181 + protocols: + triple: + name: tri + port: 20000 + provider: + services: + GreeterProvider: + interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java` +) + +func init() { + fileMap["srvConfGenerator"] = &fileGenerator{ + path: "./go-server/conf", + file: "dubbogo.yml", + context: serverConfigFile, + } +} diff --git a/cmd/dubbogo-cli-v2/generator/sample/gen_server.go b/cmd/dubbogo-cli-v2/generator/sample/gen_server.go new file mode 100644 index 0000000..1c40d1a --- /dev/null +++ b/cmd/dubbogo-cli-v2/generator/sample/gen_server.go @@ -0,0 +1,46 @@ +package sample + +const ( + serverCode = `package main + +import ( + "context" +) + +import ( + "dubbo.apache.org/dubbo-go/v3/common/logger" + "dubbo.apache.org/dubbo-go/v3/config" + _ "dubbo.apache.org/dubbo-go/v3/imports" +) + +import ( + "helloworld/api" +) + +type GreeterProvider struct { + api.UnimplementedGreeterServer +} + +func (s *GreeterProvider) SayHello(ctx context.Context, in *api.HelloRequest) (*api.User, error) { + logger.Infof("Dubbo3 GreeterProvider get user name = %s\n", in.Name) + return &api.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil +} + +// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-server/conf/dubbogo.yml +func main() { + config.SetProviderService(&GreeterProvider{}) + if err := config.Load(); err != nil { + panic(err) + } + select {} +}` +) + +func init() { + fileMap["srvGenerator"] = &fileGenerator{ + path: "./go-server/cmd", + file: "server.go", + context: license + serverCode, + } + //var str = "`" + `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + "`" +} diff --git a/cmd/dubbogo-cli-v2/generator/sample/generator.go b/cmd/dubbogo-cli-v2/generator/sample/generator.go new file mode 100644 index 0000000..2de4f94 --- /dev/null +++ b/cmd/dubbogo-cli-v2/generator/sample/generator.go @@ -0,0 +1,80 @@ +package sample + +import ( + "bytes" + "go/format" + "os" + "path" +) + +type fileGenerator struct { + path string + file string + context string +} + +var ( + fileMap = make(map[string]*fileGenerator) +) + +func Generate(rootPath string) error { + for _, v := range fileMap { + v.path = path.Join(rootPath, v.path) + if err := genFile(v); err != nil { + return err + } + } + return nil +} + +func genFile(fg *fileGenerator) error { + fp, err := createFile(fg.path, fg.file) + if err != nil { + return err + } + buffer := new(bytes.Buffer) + if _, err := buffer.WriteString(fg.context); err != nil { + return err + } + code := formatCode(buffer.String()) + _, err = fp.WriteString(code) + return err +} + +func createFile(dir, file string) (*os.File, error) { + if err := os.MkdirAll(dir, os.ModePerm); err != nil { + return nil, err + } + return os.Create(path.Join(dir, file)) +} + +func formatCode(code string) string { + res, err := format.Source([]byte(code)) + if err != nil { + return code + } + return string(res) +} + +func createTemplate(file, content string) error { + f, err := os.Create(file) + if err != nil { + return err + } + defer f.Close() + + _, err = f.WriteString(content) + return err +} + +func MkdirIfNotExist(dir string) error { + if len(dir) == 0 { + return nil + } + + if _, err := os.Stat(dir); os.IsNotExist(err) { + return os.MkdirAll(dir, os.ModePerm) + } + + return nil +} diff --git a/cmd/dubbogo-cli-v2/generator/sample/mod.go b/cmd/dubbogo-cli-v2/generator/sample/mod.go new file mode 100644 index 0000000..abad8a3 --- /dev/null +++ b/cmd/dubbogo-cli-v2/generator/sample/mod.go @@ -0,0 +1,24 @@ +package sample + +const ( + modFile = `module helloworld + +go 1.15 + +require ( + dubbo.apache.org/dubbo-go/v3 v3.0.0 + github.com/dubbogo/grpc-go v1.42.7 + github.com/dubbogo/triple v1.1.7 + github.com/golang/protobuf v1.5.2 + google.golang.org/protobuf v1.27.1 +) +` +) + +func init() { + fileMap["modFile"] = &fileGenerator{ + path: "./", + file: "go.mod", + context: modFile, + } +} diff --git a/cmd/dubbogo-cli-v2/generator/sample/proto.go b/cmd/dubbogo-cli-v2/generator/sample/proto.go new file mode 100644 index 0000000..451dd91 --- /dev/null +++ b/cmd/dubbogo-cli-v2/generator/sample/proto.go @@ -0,0 +1,36 @@ +package sample + +const ( + protoFile = `syntax = "proto3"; +package api; + +option go_package = "./;api"; + +// The greeting service definition. +service Greeter { + // Sends a greeting + rpc SayHello (HelloRequest) returns (User) {} + // Sends a greeting via stream + rpc SayHelloStream (stream HelloRequest) returns (stream User) {} +} + +// The request message containing the user's name. +message HelloRequest { + string name = 1; +} + +// The response message containing the greetings +message User { + string name = 1; + string id = 2; + int32 age = 3; +}` +) + +func init() { + fileMap[protoFile] = &fileGenerator{ + path: "./api", + file: "samples_api.proto", + context: license + protoFile, + } +} diff --git a/go.sum b/go.sum index aac960f..6649623 100644 --- a/go.sum +++ b/go.sum @@ -302,6 +302,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -601,6 +602,7 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= +github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= @@ -698,9 +700,11 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= @@ -709,6 +713,7 @@ github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -718,6 +723,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stephens2424/writerset v1.0.2/go.mod h1:aS2JhsMn6eA7e82oNmW4rfsgAOp9COBTTl8mzkwADnc= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1256,6 +1262,7 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=