From e5b7569b2fcced2e3001d06394cb3d656549aa74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 20:15:30 +0000 Subject: [PATCH 01/12] Update tonic requirement from 0.6 to 0.7 Updates the requirements on [tonic](https://github.com/hyperium/tonic) to permit the latest version. - [Release notes](https://github.com/hyperium/tonic/releases) - [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/tonic/compare/v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: tonic dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b09cc8cf8..15bd658c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ prost = "0.9" prost-types = { version = "0.9", optional = true } quickcheck = { version = "1", default-features = false, optional = true } thiserror = { version = "1", optional = true } -tonic = { version = "0.6", default-features = false, features = ["prost", "codegen"] } +tonic = { version = "0.7", default-features = false, features = ["prost", "codegen"] } [build-dependencies] tonic-build = { version = "0.6", default-features = false, features = ["prost"] } From 4171005119f84227110089370d80588324dcbe4c Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Tue, 5 Apr 2022 04:15:34 +0000 Subject: [PATCH 02/12] Update prost to v0.10, etc Signed-off-by: Oliver Gould --- Cargo.toml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 15bd658c2..77c4fc0a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,9 +17,6 @@ default = [] # Generate code that is compatible with Tonic's `transport` module. transport = ["tonic-build/transport", "tonic/transport"] -# Generate code that is formatted. -rustfmt = ["tonic-build/rustfmt"] - # Enable generation of arbitrary protos with quickcheck. arbitrary = ["quickcheck"] @@ -38,11 +35,11 @@ tap = ["h2", "http_types", "net", "prost-types"] h2 = { version = "0.3", optional = true } http = { version = "0.2", optional = true } ipnet = { version = "2", optional = true } -prost = "0.9" -prost-types = { version = "0.9", optional = true } +prost = "0.10" +prost-types = { version = "0.10", optional = true } quickcheck = { version = "1", default-features = false, optional = true } thiserror = { version = "1", optional = true } tonic = { version = "0.7", default-features = false, features = ["prost", "codegen"] } [build-dependencies] -tonic-build = { version = "0.6", default-features = false, features = ["prost"] } +tonic-build = { version = "0.7", default-features = false, features = ["prost"] } From 5514e1d710eeee3d8eb4a1318727b2d912b2e2a2 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Tue, 5 Apr 2022 14:37:35 +0000 Subject: [PATCH 03/12] Update deny.toml to remove atoi exception --- deny.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deny.toml b/deny.toml index 5343ce844..b6b3b9cfd 100644 --- a/deny.toml +++ b/deny.toml @@ -32,7 +32,7 @@ multiple-versions = "deny" wildcards = "allow" highlight = "all" deny = [] -skip = [{ name = "itoa", version = "0.4" }] +skip = [] skip-tree = [] [sources] From 7e586d8bada36bd5fe7d44d0d3da5e72e5f4eb00 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Tue, 5 Apr 2022 15:39:41 +0000 Subject: [PATCH 04/12] Update devcontainer to include unzip Signed-off-by: Oliver Gould --- .devcontainer/devcontainer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7dd151c64..fb627da06 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "linkerd2-proxy-api", - "image": "ghcr.io/linkerd/dev:v7", + "image": "ghcr.io/linkerd/dev:v10", "extensions": [ "DavidAnson.vscode-markdownlint", "golang.go", @@ -16,5 +16,4 @@ ], "overrideCommand": false, "remoteUser": "code", - "mounts": [] } From 5b31e73e8f30fc50e3f6efaf0ddce0c4a7c20aa7 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Tue, 5 Apr 2022 15:54:25 +0000 Subject: [PATCH 05/12] Update protoc and configure prost to use our local protoc Signed-off-by: Oliver Gould --- Makefile | 17 +++++++++-------- go.mod | 3 ++- go.sum | 4 ++++ go/destination/destination.pb.go | 2 +- go/http_types/http_types.pb.go | 2 +- go/identity/identity.pb.go | 2 +- go/inbound/inbound.pb.go | 2 +- go/net/net.pb.go | 2 +- go/tap/tap.pb.go | 2 +- 9 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index abcedee06..90902d937 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,9 @@ GIT = git GO = go UNZIP = unzip -PROTOC_VERSION = 3.17.3 +PROTOC_VERSION = 3.20.0 PROTOC_BASE_URL = https://github.com/google/protobuf/releases/download/v$(PROTOC_VERSION) +PROTOC_NO_VENDOR = 1 PROTOC ?= target/protoc-$(PROTOC_VERSION) MODULE_NAME = github.com/linkerd/linkerd2-proxy-api @@ -36,27 +37,27 @@ endif $(PROTOC): mkdir -p $(TARGET) - $(CURL) -Lo $(PROTOC).zip $(PROTOC_URL) + $(CURL) -fsSLo $(PROTOC).zip $(PROTOC_URL) $(UNZIP) -p $(PROTOC).zip bin/protoc >$(PROTOC) rm $(PROTOC).zip chmod 755 $(PROTOC) -Cargo.lock: Cargo.toml +.PHONY: fetch +fetch: Cargo.toml $(CARGO) fetch .PHONY: rs -rs: Cargo.lock - cargo check --all-features --locked $(RELASE) +rs: fetch $(PROTOC) + cargo check --all-features --frozen $(RELASE) .PHONY: clippy -clippy: Cargo.lock +clippy: fetch $(PROTOC) for api in destination http_types identity inbound net tap ; do \ for kind in arbitrary client server ; do \ - $(CARGO) clippy --locked $(RELEASE) --features=$$api,$$kind --all-targets ; \ + $(CARGO) clippy --frozen $(RELEASE) --features=$$api,$$kind --all-targets ; \ done ; \ done - .PHONY: go go: $(PROTOC) @rm -rf go/* diff --git a/go.mod b/go.mod index b54a20a64..85ca79f36 100644 --- a/go.mod +++ b/go.mod @@ -5,5 +5,6 @@ go 1.14 require ( github.com/golang/protobuf v1.5.2 google.golang.org/grpc v1.45.0 - google.golang.org/protobuf v1.28.0 + google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect + google.golang.org/protobuf v1.27.1 ) diff --git a/go.sum b/go.sum index e75a1fd6a..cee034937 100644 --- a/go.sum +++ b/go.sum @@ -100,6 +100,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -111,6 +113,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/go/destination/destination.pb.go b/go/destination/destination.pb.go index e5286d2b8..1d1330bfb 100644 --- a/go/destination/destination.pb.go +++ b/go/destination/destination.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.17.3 +// protoc v3.20.0 // source: destination.proto package destination diff --git a/go/http_types/http_types.pb.go b/go/http_types/http_types.pb.go index fd44dfef3..b979414fc 100644 --- a/go/http_types/http_types.pb.go +++ b/go/http_types/http_types.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.17.3 +// protoc v3.20.0 // source: http_types.proto package http_types diff --git a/go/identity/identity.pb.go b/go/identity/identity.pb.go index 51a3f79bb..da81c268b 100644 --- a/go/identity/identity.pb.go +++ b/go/identity/identity.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.17.3 +// protoc v3.20.0 // source: identity.proto package identity diff --git a/go/inbound/inbound.pb.go b/go/inbound/inbound.pb.go index 0c6c94cd2..24ba84f36 100644 --- a/go/inbound/inbound.pb.go +++ b/go/inbound/inbound.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.17.3 +// protoc v3.20.0 // source: inbound.proto package inbound diff --git a/go/net/net.pb.go b/go/net/net.pb.go index c8409197d..6401a8aa5 100644 --- a/go/net/net.pb.go +++ b/go/net/net.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.17.3 +// protoc v3.20.0 // source: net.proto package net diff --git a/go/tap/tap.pb.go b/go/tap/tap.pb.go index e8a3dc7c6..9d0d9d239 100644 --- a/go/tap/tap.pb.go +++ b/go/tap/tap.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.17.3 +// protoc v3.20.0 // source: tap.proto package tap From 4a44065ec4bb3c14dd5e3313ebaf81ee9ad69141 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Wed, 6 Apr 2022 05:32:30 +0000 Subject: [PATCH 06/12] Fixup makefile Signed-off-by: Oliver Gould --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 90902d937..036f4167d 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,11 @@ GIT = git GO = go UNZIP = unzip -PROTOC_VERSION = 3.20.0 +PROTOC_VERSION := 3.20.0 PROTOC_BASE_URL = https://github.com/google/protobuf/releases/download/v$(PROTOC_VERSION) -PROTOC_NO_VENDOR = 1 PROTOC ?= target/protoc-$(PROTOC_VERSION) +export PROTOC_NO_VENDOR := 1 +export PROTOC := $(PROTOC) MODULE_NAME = github.com/linkerd/linkerd2-proxy-api @@ -48,7 +49,7 @@ fetch: Cargo.toml .PHONY: rs rs: fetch $(PROTOC) - cargo check --all-features --frozen $(RELASE) + cargo check --all-features --frozen $(RELEASE) .PHONY: clippy clippy: fetch $(PROTOC) From e9f96368b722fabba4289f28d6671f86249b8982 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Wed, 6 Apr 2022 13:12:40 +0000 Subject: [PATCH 07/12] tidy Signed-off-by: Oliver Gould --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 036f4167d..4bc516ee8 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,8 @@ UNZIP = unzip PROTOC_VERSION := 3.20.0 PROTOC_BASE_URL = https://github.com/google/protobuf/releases/download/v$(PROTOC_VERSION) -PROTOC ?= target/protoc-$(PROTOC_VERSION) +export PROTOC ?= target/protoc-$(PROTOC_VERSION) export PROTOC_NO_VENDOR := 1 -export PROTOC := $(PROTOC) MODULE_NAME = github.com/linkerd/linkerd2-proxy-api From 36db21e628b4f1390e6008471d73e6dd0075a072 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Wed, 6 Apr 2022 13:23:22 +0000 Subject: [PATCH 08/12] Fix go tooling Signed-off-by: Oliver Gould --- Makefile | 4 ++-- go.mod | 3 +-- go/destination/destination_grpc.pb.go | 4 ++++ go/identity/identity_grpc.pb.go | 4 ++++ go/inbound/inbound_grpc.pb.go | 4 ++++ go/tap/tap_grpc.pb.go | 4 ++++ 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4bc516ee8..ce43a3099 100644 --- a/Makefile +++ b/Makefile @@ -62,8 +62,8 @@ clippy: fetch $(PROTOC) go: $(PROTOC) @rm -rf go/* mkdir -p ./go/destination ./go/http_types ./go/identity ./go/inbound ./go/net ./go/tap - $(GO) get google.golang.org/protobuf/cmd/protoc-gen-go@v1.27.1 - $(GO) get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1 + $(GO) mod download + $(GO) install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 $(PROTOC) -I proto --go_out=paths=source_relative:./go/destination proto/destination.proto $(PROTOC) -I proto --go_out=paths=source_relative:./go/http_types proto/http_types.proto $(PROTOC) -I proto --go_out=paths=source_relative:./go/identity proto/identity.proto diff --git a/go.mod b/go.mod index 85ca79f36..b54a20a64 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,5 @@ go 1.14 require ( github.com/golang/protobuf v1.5.2 google.golang.org/grpc v1.45.0 - google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect - google.golang.org/protobuf v1.27.1 + google.golang.org/protobuf v1.28.0 ) diff --git a/go/destination/destination_grpc.pb.go b/go/destination/destination_grpc.pb.go index f1408dc3f..7851e7e91 100644 --- a/go/destination/destination_grpc.pb.go +++ b/go/destination/destination_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.20.0 +// source: destination.proto package destination diff --git a/go/identity/identity_grpc.pb.go b/go/identity/identity_grpc.pb.go index 517b43257..8c56f7e95 100644 --- a/go/identity/identity_grpc.pb.go +++ b/go/identity/identity_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.20.0 +// source: identity.proto package identity diff --git a/go/inbound/inbound_grpc.pb.go b/go/inbound/inbound_grpc.pb.go index 388217932..ecd311f18 100644 --- a/go/inbound/inbound_grpc.pb.go +++ b/go/inbound/inbound_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.20.0 +// source: inbound.proto package inbound diff --git a/go/tap/tap_grpc.pb.go b/go/tap/tap_grpc.pb.go index 343258453..bc66f47a7 100644 --- a/go/tap/tap_grpc.pb.go +++ b/go/tap/tap_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.20.0 +// source: tap.proto package tap From 1b71e275397d317520c6bf149ad9500d955bb996 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Thu, 7 Apr 2022 13:46:25 +0000 Subject: [PATCH 09/12] Pin go version in CI Signed-off-by: Oliver Gould --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60917dafd..76103e1cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: timeout-minutes: 5 runs-on: ubuntu-latest container: - image: docker://rust:1.56.0-buster + image: docker://rust:1.59.0-buster steps: # actions/checkout@v3 - uses: actions/checkout@v3 @@ -40,7 +40,7 @@ jobs: timeout-minutes: 5 runs-on: ubuntu-latest container: - image: docker://rust:1.56.0-buster + image: docker://rust:1.59.0-buster steps: - uses: actions/checkout@v3 - run: rustup component add clippy rustfmt @@ -50,6 +50,8 @@ jobs: name: Go build timeout-minutes: 5 runs-on: ubuntu-18.04 + container: + image: golang:1.17 steps: # actions/checkout@v3 - uses: actions/checkout@v3 From becb082255a9568d5fec3471724e831fc3cd711d Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Thu, 7 Apr 2022 13:49:32 +0000 Subject: [PATCH 10/12] Use setup-go to avoid base image dependency issues Signed-off-by: Oliver Gould --- .github/workflows/ci.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76103e1cd..13e807ed0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,6 @@ name: CI on: pull_request: {} - push: - branches: - - master jobs: rust_build: @@ -13,7 +10,6 @@ jobs: container: image: docker://rust:1.59.0-buster steps: - # actions/checkout@v3 - uses: actions/checkout@v3 - run: rustup component add rustfmt # Needed for the rustfmt feature. - run: make rs @@ -39,8 +35,6 @@ jobs: name: Rust lint timeout-minutes: 5 runs-on: ubuntu-latest - container: - image: docker://rust:1.59.0-buster steps: - uses: actions/checkout@v3 - run: rustup component add clippy rustfmt @@ -50,10 +44,10 @@ jobs: name: Go build timeout-minutes: 5 runs-on: ubuntu-18.04 - container: - image: golang:1.17 steps: - # actions/checkout@v3 + - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab + with: + go-version: '1.17' - uses: actions/checkout@v3 - name: Check go run: | From 94eaa9f418531a733ee6fc4b6253b6d4d85600cd Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Thu, 7 Apr 2022 13:58:12 +0000 Subject: [PATCH 11/12] Explicitly fetch protoc-gen-go Signed-off-by: Oliver Gould --- Makefile | 1 + go/destination/destination.pb.go | 2 +- go/http_types/http_types.pb.go | 2 +- go/identity/identity.pb.go | 2 +- go/inbound/inbound.pb.go | 2 +- go/net/net.pb.go | 2 +- go/tap/tap.pb.go | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ce43a3099..f196e4d75 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,7 @@ go: $(PROTOC) @rm -rf go/* mkdir -p ./go/destination ./go/http_types ./go/identity ./go/inbound ./go/net ./go/tap $(GO) mod download + $(GO) install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 $(GO) install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 $(PROTOC) -I proto --go_out=paths=source_relative:./go/destination proto/destination.proto $(PROTOC) -I proto --go_out=paths=source_relative:./go/http_types proto/http_types.proto diff --git a/go/destination/destination.pb.go b/go/destination/destination.pb.go index 1d1330bfb..015d52b13 100644 --- a/go/destination/destination.pb.go +++ b/go/destination/destination.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.0 // protoc v3.20.0 // source: destination.proto diff --git a/go/http_types/http_types.pb.go b/go/http_types/http_types.pb.go index b979414fc..a0f29f04c 100644 --- a/go/http_types/http_types.pb.go +++ b/go/http_types/http_types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.0 // protoc v3.20.0 // source: http_types.proto diff --git a/go/identity/identity.pb.go b/go/identity/identity.pb.go index da81c268b..4aca6a00a 100644 --- a/go/identity/identity.pb.go +++ b/go/identity/identity.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.0 // protoc v3.20.0 // source: identity.proto diff --git a/go/inbound/inbound.pb.go b/go/inbound/inbound.pb.go index 24ba84f36..d34582849 100644 --- a/go/inbound/inbound.pb.go +++ b/go/inbound/inbound.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.0 // protoc v3.20.0 // source: inbound.proto diff --git a/go/net/net.pb.go b/go/net/net.pb.go index 6401a8aa5..8417e6939 100644 --- a/go/net/net.pb.go +++ b/go/net/net.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.0 // protoc v3.20.0 // source: net.proto diff --git a/go/tap/tap.pb.go b/go/tap/tap.pb.go index 9d0d9d239..b289bbb00 100644 --- a/go/tap/tap.pb.go +++ b/go/tap/tap.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.0 // protoc v3.20.0 // source: tap.proto From 06a7d40cb57d8bcbd6d35cc1914d24627a6f656d Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Thu, 7 Apr 2022 15:15:48 +0000 Subject: [PATCH 12/12] go mod tidy Signed-off-by: Oliver Gould --- go.sum | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go.sum b/go.sum index cee034937..e75a1fd6a 100644 --- a/go.sum +++ b/go.sum @@ -100,8 +100,6 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -113,8 +111,6 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=