From ccd86d66d58cbf169611b009ae0d0795ee22c8ec Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 29 May 2023 18:28:27 +0200 Subject: [PATCH 1/7] chore: update protoc-gen-go --- .github/workflows/ci.yaml | 4 ++-- dogfood/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 563266a8bcf2e..b7bf266147386 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -179,9 +179,9 @@ jobs: run: | curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.17.2/sqlc_1.17.2_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc - name: Install protoc-gen-go - run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26 + run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 - name: Install protoc-gen-go-drpc - run: go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.26 + run: go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3 - name: Install goimports run: go install golang.org/x/tools/cmd/goimports@latest - name: Install yq diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index cdc0b35973e38..4a648c441f2c8 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -32,9 +32,9 @@ RUN mkdir --parents "$GOPATH" && \ # goimports for updating imports go install golang.org/x/tools/cmd/goimports@v0.1.7 && \ # protoc-gen-go is needed to build sysbox from source - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26 && \ + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 && \ # drpc support for v2 - go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.26 && \ + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3 && \ # migrate for migration support for v2 go install github.com/golang-migrate/migrate/v4/cmd/migrate@v4.15.1 && \ # goreleaser for compiling v2 binaries From 12ad50ed3c6b9c0ffe7990b2e10351900ba9afa1 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 29 May 2023 18:49:34 +0200 Subject: [PATCH 2/7] fix --- .github/workflows/ci.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b7bf266147386..9d9c126ddf2b1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -179,9 +179,13 @@ jobs: run: | curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.17.2/sqlc_1.17.2_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc - name: Install protoc-gen-go - run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 + run: | + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 + protoc-gen-go --version - name: Install protoc-gen-go-drpc - run: go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3 + run: | + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3 + protoc-gen-go-grpc -version - name: Install goimports run: go install golang.org/x/tools/cmd/goimports@latest - name: Install yq From 8fc6b4898d50637708a17da1fe573d21c23500f1 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 29 May 2023 18:54:19 +0200 Subject: [PATCH 3/7] back to storj --- .github/workflows/ci.yaml | 8 ++------ dogfood/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9d9c126ddf2b1..c03475b31127a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -179,13 +179,9 @@ jobs: run: | curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.17.2/sqlc_1.17.2_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc - name: Install protoc-gen-go - run: | - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 - protoc-gen-go --version + run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 - name: Install protoc-gen-go-drpc - run: | - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3 - protoc-gen-go-grpc -version + run: storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33 - name: Install goimports run: go install golang.org/x/tools/cmd/goimports@latest - name: Install yq diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 4a648c441f2c8..235602f2b44a6 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -34,7 +34,7 @@ RUN mkdir --parents "$GOPATH" && \ # protoc-gen-go is needed to build sysbox from source go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 && \ # drpc support for v2 - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3 && \ + go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33 && \ # migrate for migration support for v2 go install github.com/golang-migrate/migrate/v4/cmd/migrate@v4.15.1 && \ # goreleaser for compiling v2 binaries From 8cf519701cdeb8c51f56e2f6571ce6f5f387d0cd Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 29 May 2023 18:55:08 +0200 Subject: [PATCH 4/7] one more place --- .github/workflows/security.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 3a6f0bcf7038f..0c0f8c660b249 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -86,9 +86,9 @@ jobs: - name: Install mockgen run: go install github.com/golang/mock/mockgen@v1.6.0 - name: Install protoc-gen-go - run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26 + run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 - name: Install protoc-gen-go-drpc - run: go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.26 + run: go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.30 - name: Install Protoc run: | # protoc must be in lockstep with our dogfood Dockerfile or the From c699b4d3d3918e0fcc49de762428d8542cc6a1cd Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 29 May 2023 18:55:48 +0200 Subject: [PATCH 5/7] fix --- .github/workflows/security.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 0c0f8c660b249..f397bd6ad53c5 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -88,7 +88,7 @@ jobs: - name: Install protoc-gen-go run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 - name: Install protoc-gen-go-drpc - run: go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.30 + run: go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33 - name: Install Protoc run: | # protoc must be in lockstep with our dogfood Dockerfile or the From 20854598c3cd3ea3ab832eb9ebbb80383347fe25 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 29 May 2023 18:59:36 +0200 Subject: [PATCH 6/7] fix --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c03475b31127a..9be2aec16b6fb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -181,7 +181,7 @@ jobs: - name: Install protoc-gen-go run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 - name: Install protoc-gen-go-drpc - run: storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33 + run: go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33 - name: Install goimports run: go install golang.org/x/tools/cmd/goimports@latest - name: Install yq From 689b462ca87995ecc8e55bfb55781eaa2dae1645 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 30 May 2023 09:07:21 +0200 Subject: [PATCH 7/7] make gen --- provisionerd/proto/provisionerd.pb.go | 4 ++-- provisionerd/proto/provisionerd_drpc.pb.go | 2 +- provisionersdk/proto/provisioner.pb.go | 2 +- provisionersdk/proto/provisioner_drpc.pb.go | 10 +++++++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index 56bb0ece7a727..969bc3d4916d2 100644 --- a/provisionerd/proto/provisionerd.pb.go +++ b/provisionerd/proto/provisionerd.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0 +// protoc-gen-go v1.30.0 // protoc v3.21.5 // source: provisionerd/proto/provisionerd.proto @@ -532,7 +532,7 @@ func (x *Log) GetLevel() proto.LogLevel { if x != nil { return x.Level } - return proto.LogLevel_TRACE + return proto.LogLevel(0) } func (x *Log) GetCreatedAt() int64 { diff --git a/provisionerd/proto/provisionerd_drpc.pb.go b/provisionerd/proto/provisionerd_drpc.pb.go index 6d73176475490..ed3155fb21eaa 100644 --- a/provisionerd/proto/provisionerd_drpc.pb.go +++ b/provisionerd/proto/provisionerd_drpc.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-drpc. DO NOT EDIT. -// protoc-gen-go-drpc version: v0.0.26 +// protoc-gen-go-drpc version: v0.0.33 // source: provisionerd/proto/provisionerd.proto package proto diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go index adffb1339441c..5e4a301e39f59 100644 --- a/provisionersdk/proto/provisioner.pb.go +++ b/provisionersdk/proto/provisioner.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0 +// protoc-gen-go v1.30.0 // protoc v3.21.5 // source: provisionersdk/proto/provisioner.proto diff --git a/provisionersdk/proto/provisioner_drpc.pb.go b/provisionersdk/proto/provisioner_drpc.pb.go index c990f6f645b7f..d8b40060cd376 100644 --- a/provisionersdk/proto/provisioner_drpc.pb.go +++ b/provisionersdk/proto/provisioner_drpc.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-drpc. DO NOT EDIT. -// protoc-gen-go-drpc version: v0.0.26 +// protoc-gen-go-drpc version: v0.0.33 // source: provisionersdk/proto/provisioner.proto package proto @@ -76,6 +76,10 @@ type drpcProvisioner_ParseClient struct { drpc.Stream } +func (x *drpcProvisioner_ParseClient) GetStream() drpc.Stream { + return x.Stream +} + func (x *drpcProvisioner_ParseClient) Recv() (*Parse_Response, error) { m := new(Parse_Response) if err := x.MsgRecv(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}); err != nil { @@ -107,6 +111,10 @@ type drpcProvisioner_ProvisionClient struct { drpc.Stream } +func (x *drpcProvisioner_ProvisionClient) GetStream() drpc.Stream { + return x.Stream +} + func (x *drpcProvisioner_ProvisionClient) Send(m *Provision_Request) error { return x.MsgSend(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}) }