From 232d298af14ed0d427f9101a5a7df4ae5ed16201 Mon Sep 17 00:00:00 2001
From: Jake Taylor <jake@privategrity.com>
Date: Tue, 18 Feb 2020 00:36:46 +0000
Subject: [PATCH] update version info
---
.gitignore | 2 --
.gitlab-ci.yml | 4 +--
api/client.go | 2 +-
api/connect.go | 1 -
api/mockserver.go | 2 +-
bindings/client_test.go | 2 +-
cmd/gen.go | 76 -----------------------------------------
cmd/root.go | 11 +-----
cmd/version.go | 34 ++++++++++++------
globals/checkVersion.go | 2 +-
globals/version.go | 8 -----
globals/version_vars.go | 43 +++++++++++++++++++++++
go.mod | 8 +++--
go.sum | 21 ++++++------
14 files changed, 88 insertions(+), 128 deletions(-)
delete mode 100644 cmd/gen.go
delete mode 100644 globals/version.go
create mode 100644 globals/version_vars.go
diff --git a/.gitignore b/.gitignore
index 134870324..30f29f0e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,5 +27,3 @@ localdev_*
*.class
*.aar
*.jar
-# Ignore genered version file
-cmd/version_vars.go
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed10c896c..d2fba101a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,13 +83,11 @@ build:
- tags
script:
- mkdir -p release
- - go generate cmd/version.go
- GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' ./...
- GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.linux64 main.go
- GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.win64 main.go
- GOOS=windows GOARCH=386 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.win32 main.go
- GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.darwin64 main.go
- - release/client.linux64 --version
artifacts:
paths:
- release/
@@ -101,7 +99,7 @@ tag:
image: $DOCKER_IMAGE
script:
- git remote add origin_tags git@gitlab.com:elixxir/client.git || true
- - git tag $(release/client.linux64 -V | grep "Elixxir Client v"| cut -d ' ' -f3) -f
+ - git tag $(release/client.linux64 version | grep "Elixxir Client v"| cut -d ' ' -f3) -f
- git push origin_tags -f --tags
#bindings:
diff --git a/api/client.go b/api/client.go
index 034fe3293..e845339a7 100644
--- a/api/client.go
+++ b/api/client.go
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////
-// Copyright © 2019 Privategrity Corporation /
+// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
////////////////////////////////////////////////////////////////////////////////
diff --git a/api/connect.go b/api/connect.go
index d371dcb84..d3b3212d1 100644
--- a/api/connect.go
+++ b/api/connect.go
@@ -80,7 +80,6 @@ func (cl *Client) setupPermissioning() error {
cl.ndf = def
}
-
globals.Log.DEBUG.Printf("Local version: %v; Remote version: %v",
globals.SEMVER, cl.GetRegistrationVersion())
diff --git a/api/mockserver.go b/api/mockserver.go
index 948980e41..ae8b444d2 100644
--- a/api/mockserver.go
+++ b/api/mockserver.go
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////
-// Copyright © 2019 Privategrity Corporation /
+// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
////////////////////////////////////////////////////////////////////////////////
diff --git a/bindings/client_test.go b/bindings/client_test.go
index 3b134fa88..043ebaca8 100644
--- a/bindings/client_test.go
+++ b/bindings/client_test.go
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////
-// Copyright © 2019 Privategrity Corporation /
+// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
////////////////////////////////////////////////////////////////////////////////
diff --git a/cmd/gen.go b/cmd/gen.go
deleted file mode 100644
index fae0ee14b..000000000
--- a/cmd/gen.go
+++ /dev/null
@@ -1,76 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Copyright © 2020 Privategrity Corporation /
-// /
-// All rights reserved. /
-////////////////////////////////////////////////////////////////////////////////
-
-// The following directive is necessary to make the package coherent:
-
-// +build ignore
-
-// This program generates cmd/version.go. It can be invoked by running
-// go generate
-package main
-
-import (
- "bufio"
- "io/ioutil"
- "log"
- "os"
- "os/exec"
- "strings"
- "text/template"
- "time"
-)
-
-func GenerateGitVersion() string {
- cmd := exec.Command("git", "show", "--oneline")
- stdoutStderr, err := cmd.CombinedOutput()
- if err != nil {
- log.Fatal(err)
- }
- scanner := bufio.NewScanner(strings.NewReader(string(stdoutStderr)))
- for scanner.Scan() {
- return scanner.Text()
- }
- return "UNKNOWNVERSION"
-}
-
-func ReadGlideLock() string {
- r, _ := ioutil.ReadFile("../glide.lock")
- return string(r)
-}
-
-func main() {
- gitversion := GenerateGitVersion()
- glidedependencies := ReadGlideLock()
-
- f, err := os.Create("../globals/version.go")
- die(err)
- defer f.Close()
-
- packageTemplate.Execute(f, struct {
- Timestamp time.Time
- GITVER string
- GLIDEDEPS string
- }{
- Timestamp: time.Now(),
- GITVER: gitversion,
- GLIDEDEPS: glidedependencies,
- })
-}
-
-func die(err error) {
- if err != nil {
- log.Fatal(err)
- }
-}
-
-var packageTemplate = template.Must(template.New("").Parse(
- "// Code generated by go generate; DO NOT EDIT.\n" +
- "// This file was generated by robots at\n" +
- "// {{ .Timestamp }}\n" +
- "package globals\n\n" +
- "const GITVERSION = `{{ .GITVER }}`\n" +
- "const SEMVER = \"1.1.1\"\n" +
- "const GLIDEDEPS = `{{ .GLIDEDEPS }}`\n"))
diff --git a/cmd/root.go b/cmd/root.go
index 401f0ba61..37cf4d6fe 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////
-// Copyright © 2019 Privategrity Corporation /
+// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
////////////////////////////////////////////////////////////////////////////////
@@ -41,7 +41,6 @@ var message string
var sessionFile string
var noBlockingTransmission bool
var rateLimiting uint32
-var showVer bool
var registrationCode string
var username string
var end2end bool
@@ -384,11 +383,6 @@ var rootCmd = &cobra.Command{
}
globals.Log = globals.InitLog(verbose, logPath)
// Main client run function
- if showVer {
- printVersion()
- return
- }
-
userID, _, client := sessionInitialization()
err := client.RegisterWithNodes()
if err != nil {
@@ -642,9 +636,6 @@ func init() {
rootCmd.Flags().StringVarP(&message, "message", "m", "", "Message to send")
rootCmd.PersistentFlags().Uint64VarP(&destinationUserId, "destid", "d", 0,
"ID to send message to")
- rootCmd.Flags().BoolVarP(&showVer, "version", "V", false,
- "Show the server version information.")
-
rootCmd.PersistentFlags().BoolVarP(&end2end, "end2end", "", false,
"Send messages with E2E encryption to destination user. Must have found each other via UDB first")
diff --git a/cmd/version.go b/cmd/version.go
index 0dac058f7..f6b7e9a19 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,35 +1,47 @@
////////////////////////////////////////////////////////////////////////////////
-// Copyright © 2019 Privategrity Corporation /
+// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
////////////////////////////////////////////////////////////////////////////////
+// Handles command-line version functionality
+
package cmd
import (
"fmt"
"github.com/spf13/cobra"
"gitlab.com/elixxir/client/globals"
+ "gitlab.com/elixxir/primitives/utils"
)
-//go:generate go run gen.go
-// The above generates: GITVERSION, GLIDEDEPS, and SEMVER
-
-func init() {
- rootCmd.AddCommand(versionCmd)
-}
+// Change this value to set the version for this build
+const currentVersion = "1.2.1"
func printVersion() {
fmt.Printf("Elixxir Client v%s -- %s\n\n", globals.SEMVER, globals.GITVERSION)
- fmt.Printf("Dependencies:\n\n%s\n", globals.GLIDEDEPS)
+ fmt.Printf("Dependencies:\n\n%s\n", globals.DEPENDENCIES)
+}
+
+func init() {
+ rootCmd.AddCommand(versionCmd)
+ rootCmd.AddCommand(generateCmd)
}
var versionCmd = &cobra.Command{
Use: "version",
- Short: "Print the version number of Elixxir Client",
- Long: `Print the version number of Elixxir Client. This also prints
-the glide cache versions of all of its dependencies.`,
+ Short: "Print the version and dependency information for the Elixxir binary",
+ Long: `Print the version and dependency information for the Elixxir binary`,
Run: func(cmd *cobra.Command, args []string) {
printVersion()
},
}
+
+var generateCmd = &cobra.Command{
+ Use: "generate",
+ Short: "Generates version and dependency information for the Elixxir binary",
+ Long: `Generates version and dependency information for the Elixxir binary`,
+ Run: func(cmd *cobra.Command, args []string) {
+ utils.GenerateVersionFile(currentVersion)
+ },
+}
diff --git a/globals/checkVersion.go b/globals/checkVersion.go
index 0c3c71d60..a9517bacd 100644
--- a/globals/checkVersion.go
+++ b/globals/checkVersion.go
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////
-// Copyright © 2019 Privategrity Corporation /
+// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
////////////////////////////////////////////////////////////////////////////////
diff --git a/globals/version.go b/globals/version.go
deleted file mode 100644
index 5135ae615..000000000
--- a/globals/version.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Code generated by go generate; DO NOT EDIT.
-// This file was generated by robots at
-// 2020-02-06 15:07:00.1145694 -0800 STD m=+0.048066801
-package globals
-
-const GITVERSION = `e77ca12 Merge branch 'authClient' into 'release'`
-const SEMVER = "1.1.1"
-const GLIDEDEPS = ``
diff --git a/globals/version_vars.go b/globals/version_vars.go
new file mode 100644
index 000000000..33f53eb19
--- /dev/null
+++ b/globals/version_vars.go
@@ -0,0 +1,43 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2020 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
+// Code generated by go generate; DO NOT EDIT.
+// This file was generated by robots at
+// 2020-02-17 16:31:58.196845 -0800 PST m=+0.013131072
+package globals
+
+const GITVERSION = `a23c927 Merge remote-tracking branch 'origin/patch/fixVersion' into patch/fixVersion`
+const SEMVER = "1.2.1"
+const DEPENDENCIES = `module gitlab.com/elixxir/client
+
+go 1.13
+
+require (
+ github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
+ github.com/golang/protobuf v1.3.3
+ github.com/google/go-cmp v0.4.0 // indirect
+ github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
+ github.com/kr/text v0.2.0 // indirect
+ github.com/pelletier/go-toml v1.6.0 // indirect
+ github.com/pkg/errors v0.9.1
+ github.com/smartystreets/assertions v1.0.1 // indirect
+ github.com/spf13/afero v1.2.2 // indirect
+ github.com/spf13/cast v1.3.1 // indirect
+ github.com/spf13/cobra v0.0.5
+ github.com/spf13/jwalterweatherman v1.1.0
+ github.com/spf13/pflag v1.0.5 // indirect
+ github.com/spf13/viper v1.6.2
+ gitlab.com/elixxir/comms v0.0.0-20200206201144-aa6e356b3770
+ gitlab.com/elixxir/crypto v0.0.0-20200206203107-b8926242da23
+ gitlab.com/elixxir/primitives v0.0.0-20200207225613-9a4445ddec16
+ golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6
+ golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect
+ golang.org/x/sys v0.0.0-20200217220822-9197077df867 // indirect
+ google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce // indirect
+ google.golang.org/grpc v1.27.1 // indirect
+ gopkg.in/ini.v1 v1.52.0 // indirect
+)
+`
diff --git a/go.mod b/go.mod
index d895081aa..354da3bb8 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,8 @@ require (
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
github.com/golang/protobuf v1.3.3
github.com/google/go-cmp v0.4.0 // indirect
- github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de // indirect
+ github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
+ github.com/kr/text v0.2.0 // indirect
github.com/pelletier/go-toml v1.6.0 // indirect
github.com/pkg/errors v0.9.1
github.com/smartystreets/assertions v1.0.1 // indirect
@@ -19,9 +20,10 @@ require (
gitlab.com/elixxir/comms v0.0.0-20200206201144-aa6e356b3770
gitlab.com/elixxir/crypto v0.0.0-20200206203107-b8926242da23
gitlab.com/elixxir/primitives v0.0.0-20200207225613-9a4445ddec16
- golang.org/x/crypto v0.0.0-20200210222208-86ce3cb69678
+ golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect
- google.golang.org/genproto v0.0.0-20200211111953-2dc5924e3898 // indirect
+ golang.org/x/sys v0.0.0-20200217220822-9197077df867 // indirect
+ google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce // indirect
google.golang.org/grpc v1.27.1 // indirect
gopkg.in/ini.v1 v1.52.0 // indirect
)
diff --git a/go.sum b/go.sum
index 371033d01..ff0b01f9c 100644
--- a/go.sum
+++ b/go.sum
@@ -33,6 +33,7 @@ github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/cznic/cc v0.0.0-20181122101902-d673e9b70d4d/go.mod h1:m3fD/V+XTB35Kh9zw6dzjMY+We0Q7PMf6LLIC4vuG9k=
github.com/cznic/fileutil v0.0.0-20181122101858-4d67cfea8c87/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg=
github.com/cznic/golex v0.0.0-20181122101858-9c343928389c/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc=
@@ -106,8 +107,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de h1:F7WD09S8QB4LrkEpka0dFPLSotH11HRpCsLIbIcJ7sU=
-github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
+github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
@@ -141,6 +142,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -261,10 +264,8 @@ golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 h1:+ELyKg6m8UBf0nPFSqD0mi7zUfwPyXo23HNjMnXPz7w=
golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200206161412-a0c6ece9d31a h1:aczoJ0HPNE92XKa7DrIzkNN6esOKO2TBwiiYoKcINhA=
-golang.org/x/crypto v0.0.0-20200206161412-a0c6ece9d31a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200210222208-86ce3cb69678 h1:wCWoJcFExDgyYx2m2hpHgwz8W3+FPdfldvIgzqDIhyg=
-golang.org/x/crypto v0.0.0-20200210222208-86ce3cb69678/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6 h1:Sy5bstxEqwwbYs6n0/pBuxKENqOeZUgD45Gp3Q3pqLg=
+golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
@@ -325,6 +326,8 @@ golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200217220822-9197077df867 h1:JoRuNIf+rpHl+VhScRQQvzbHed86tKkqwPMV34T8myw=
+golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -360,10 +363,8 @@ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRn
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb h1:ADPHZzpzM4tk4V4S5cnCrr5SwzvlrPRmqqCuJDB8UTs=
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200205142000-a86caf926a67 h1:MBO9fkVSrTpJ8vgHLPi5gb+ZWXEy7/auJN8yqyu9EiE=
-google.golang.org/genproto v0.0.0-20200205142000-a86caf926a67/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200211111953-2dc5924e3898 h1:bKX1IGaSj2XD9yfWNts9HKRdQRH0lOZ0S7Nb8meQSlY=
-google.golang.org/genproto v0.0.0-20200211111953-2dc5924e3898/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce h1:1mbrb1tUU+Zmt5C94IGKADBTJZjZXAd+BubWi7r9EiI=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.0 h1:G+97AoqBnmZIT91cLG/EkCoK9NSelj64P8bOHHNmGn0=
--
GitLab