diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index e72fc58ddf3..9e869d7b2db 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -23,11 +23,11 @@ $(BINGO): $(BINGO_DIR)/bingo.mod @echo "(re)installing $(GOBIN)/bingo-v0.4.0" @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.4.0 "github.com/bwplotka/bingo" -BUF := $(GOBIN)/buf-v0.37.1 +BUF := $(GOBIN)/buf-v0.40.0 $(BUF): $(BINGO_DIR)/buf.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/buf-v0.37.1" - @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=buf.mod -o=$(GOBIN)/buf-v0.37.1 "github.com/bufbuild/buf/cmd/buf" + @echo "(re)installing $(GOBIN)/buf-v0.40.0" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=buf.mod -o=$(GOBIN)/buf-v0.40.0 "github.com/bufbuild/buf/cmd/buf" CALENS := $(GOBIN)/calens-v0.2.0 $(CALENS): $(BINGO_DIR)/calens.mod @@ -83,11 +83,11 @@ $(PROTOC_GEN_DOC): $(BINGO_DIR)/protoc-gen-doc.mod @echo "(re)installing $(GOBIN)/protoc-gen-doc-v1.4.1" @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-doc.mod -o=$(GOBIN)/protoc-gen-doc-v1.4.1 "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc" -PROTOC_GEN_GO := $(GOBIN)/protoc-gen-go-v1.25.0 +PROTOC_GEN_GO := $(GOBIN)/protoc-gen-go-v1.26.0 $(PROTOC_GEN_GO): $(BINGO_DIR)/protoc-gen-go.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/protoc-gen-go-v1.25.0" - @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-go.mod -o=$(GOBIN)/protoc-gen-go-v1.25.0 "google.golang.org/protobuf/cmd/protoc-gen-go" + @echo "(re)installing $(GOBIN)/protoc-gen-go-v1.26.0" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-go.mod -o=$(GOBIN)/protoc-gen-go-v1.26.0 "google.golang.org/protobuf/cmd/protoc-gen-go" PROTOC_GEN_MICRO := $(GOBIN)/protoc-gen-micro-v3.0.0-20210329103359-9b41d1bf0888 $(PROTOC_GEN_MICRO): $(BINGO_DIR)/protoc-gen-micro.mod @@ -101,11 +101,11 @@ $(PROTOC_GEN_MICROWEB): $(BINGO_DIR)/protoc-gen-microweb.mod @echo "(re)installing $(GOBIN)/protoc-gen-microweb-v0.0.0-20210224131655-d9b1137a84d4" @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-microweb.mod -o=$(GOBIN)/protoc-gen-microweb-v0.0.0-20210224131655-d9b1137a84d4 "github.com/owncloud/protoc-gen-microweb" -PROTOC_GEN_OPENAPIV2 := $(GOBIN)/protoc-gen-openapiv2-v2.2.0 +PROTOC_GEN_OPENAPIV2 := $(GOBIN)/protoc-gen-openapiv2-v2.3.0 $(PROTOC_GEN_OPENAPIV2): $(BINGO_DIR)/protoc-gen-openapiv2.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/protoc-gen-openapiv2-v2.2.0" - @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-openapiv2.mod -o=$(GOBIN)/protoc-gen-openapiv2-v2.2.0 "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2" + @echo "(re)installing $(GOBIN)/protoc-gen-openapiv2-v2.3.0" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-openapiv2.mod -o=$(GOBIN)/protoc-gen-openapiv2-v2.3.0 "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2" REFLEX := $(GOBIN)/reflex-v0.3.0 $(REFLEX): $(BINGO_DIR)/reflex.mod diff --git a/.bingo/buf.mod b/.bingo/buf.mod index 48ac6389b38..2cb56db36f7 100644 --- a/.bingo/buf.mod +++ b/.bingo/buf.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.16 -require github.com/bufbuild/buf v0.37.1 // cmd/buf +require github.com/bufbuild/buf v0.40.0 // cmd/buf diff --git a/.bingo/protoc-gen-go.mod b/.bingo/protoc-gen-go.mod index d88109744a1..657bc8df538 100644 --- a/.bingo/protoc-gen-go.mod +++ b/.bingo/protoc-gen-go.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.16 -require google.golang.org/protobuf v1.25.0 // cmd/protoc-gen-go +require google.golang.org/protobuf v1.26.0 // cmd/protoc-gen-go diff --git a/.bingo/protoc-gen-openapiv2.mod b/.bingo/protoc-gen-openapiv2.mod index 62823b821af..c75ff056271 100644 --- a/.bingo/protoc-gen-openapiv2.mod +++ b/.bingo/protoc-gen-openapiv2.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.16 -require github.com/grpc-ecosystem/grpc-gateway/v2 v2.2.0 // protoc-gen-openapiv2 +require github.com/grpc-ecosystem/grpc-gateway/v2 v2.3.0 // protoc-gen-openapiv2 diff --git a/.bingo/variables.env b/.bingo/variables.env index 48c270fbfa3..e796dc58450 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -10,7 +10,7 @@ fi BINGO="${GOBIN}/bingo-v0.4.0" -BUF="${GOBIN}/buf-v0.37.1" +BUF="${GOBIN}/buf-v0.40.0" CALENS="${GOBIN}/calens-v0.2.0" @@ -30,13 +30,13 @@ MUTAGEN="${GOBIN}/mutagen-v0.11.8" PROTOC_GEN_DOC="${GOBIN}/protoc-gen-doc-v1.4.1" -PROTOC_GEN_GO="${GOBIN}/protoc-gen-go-v1.25.0" +PROTOC_GEN_GO="${GOBIN}/protoc-gen-go-v1.26.0" PROTOC_GEN_MICRO="${GOBIN}/protoc-gen-micro-v3.0.0-20210329103359-9b41d1bf0888" PROTOC_GEN_MICROWEB="${GOBIN}/protoc-gen-microweb-v0.0.0-20210224131655-d9b1137a84d4" -PROTOC_GEN_OPENAPIV2="${GOBIN}/protoc-gen-openapiv2-v2.2.0" +PROTOC_GEN_OPENAPIV2="${GOBIN}/protoc-gen-openapiv2-v2.3.0" REFLEX="${GOBIN}/reflex-v0.3.0" diff --git a/accounts/pkg/proto/v0/accounts.pb.go b/accounts/pkg/proto/v0/accounts.pb.go index 87ed84e65af..b3fcf0b4df3 100644 --- a/accounts/pkg/proto/v0/accounts.pb.go +++ b/accounts/pkg/proto/v0/accounts.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.26.0 +// protoc v3.15.2 // source: accounts.proto package proto import ( - proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" timestamp "github.com/golang/protobuf/ptypes/timestamp" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" @@ -26,10 +25,6 @@ const ( _ = 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 - type RebuildIndexRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/settings/pkg/proto/v0/settings.pb.go b/settings/pkg/proto/v0/settings.pb.go index d8955d31849..f7cbd0b84fa 100644 --- a/settings/pkg/proto/v0/settings.pb.go +++ b/settings/pkg/proto/v0/settings.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.26.0 +// protoc v3.15.2 // source: settings.proto package proto import ( - proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -24,10 +23,6 @@ const ( _ = 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 - type Resource_Type int32 const ( diff --git a/store/pkg/proto/v0/store.pb.go b/store/pkg/proto/v0/store.pb.go index 7aba5a5dff8..f8328f7e23c 100644 --- a/store/pkg/proto/v0/store.pb.go +++ b/store/pkg/proto/v0/store.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.26.0 +// protoc v3.15.2 // source: store.proto package proto import ( - proto "github.com/golang/protobuf/proto" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -22,10 +21,6 @@ const ( _ = 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 - type Field struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/thumbnails/pkg/proto/v0/thumbnails.pb.go b/thumbnails/pkg/proto/v0/thumbnails.pb.go index b54623076b7..8c47bf255a3 100644 --- a/thumbnails/pkg/proto/v0/thumbnails.pb.go +++ b/thumbnails/pkg/proto/v0/thumbnails.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.26.0 +// protoc v3.15.2 // source: thumbnails.proto package proto import ( - proto "github.com/golang/protobuf/proto" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -22,10 +21,6 @@ const ( _ = 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 file types to which the thumbnail cna get encoded to. type GetRequest_FileType int32