From c238e8f6dad65cf0d9aaa92f0f26a7edaef685af Mon Sep 17 00:00:00 2001 From: Orne Brocaar Date: Mon, 1 Apr 2024 14:37:41 +0100 Subject: [PATCH] api: Use protoc-gen-go & -go-grpc from nix. --- api/go/Makefile | 5 ----- api/go/api/application.pb.go | 2 +- api/go/api/device.pb.go | 2 +- api/go/api/device_profile.pb.go | 2 +- api/go/api/device_profile_template.pb.go | 2 +- api/go/api/gateway.pb.go | 2 +- api/go/api/internal.pb.go | 2 +- api/go/api/multicast_group.pb.go | 2 +- api/go/api/relay.pb.go | 2 +- api/go/api/tenant.pb.go | 2 +- api/go/api/user.pb.go | 2 +- api/go/common/common.pb.go | 2 +- api/go/go.mod | 3 +-- api/go/go.sum | 2 -- api/go/gw/gw.pb.go | 2 +- api/go/integration/integration.pb.go | 2 +- api/go/stream/api_request.pb.go | 2 +- api/go/stream/backend_interfaces.pb.go | 2 +- api/go/stream/frame.pb.go | 2 +- api/go/stream/meta.pb.go | 2 +- shell.nix | 2 ++ 21 files changed, 20 insertions(+), 26 deletions(-) diff --git a/api/go/Makefile b/api/go/Makefile index a6e7cea0..e1231397 100644 --- a/api/go/Makefile +++ b/api/go/Makefile @@ -4,11 +4,6 @@ PROTOC_ARGS := -I=../proto --go_out=. --go_opt=paths=source_relative --go-grpc_o all: requirements common gw api integration stream -requirements: - go mod download - go install google.golang.org/protobuf/cmd/protoc-gen-go - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc - common: protoc ${PROTOC_ARGS} common/common.proto diff --git a/api/go/api/application.pb.go b/api/go/api/application.pb.go index 7aa35456..2feed6fc 100644 --- a/api/go/api/application.pb.go +++ b/api/go/api/application.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: api/application.proto diff --git a/api/go/api/device.pb.go b/api/go/api/device.pb.go index f6f7e529..8c1a90c4 100644 --- a/api/go/api/device.pb.go +++ b/api/go/api/device.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: api/device.proto diff --git a/api/go/api/device_profile.pb.go b/api/go/api/device_profile.pb.go index 88ba8a3f..bad04c43 100644 --- a/api/go/api/device_profile.pb.go +++ b/api/go/api/device_profile.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: api/device_profile.proto diff --git a/api/go/api/device_profile_template.pb.go b/api/go/api/device_profile_template.pb.go index f5cca6ca..980fc4e8 100644 --- a/api/go/api/device_profile_template.pb.go +++ b/api/go/api/device_profile_template.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: api/device_profile_template.proto diff --git a/api/go/api/gateway.pb.go b/api/go/api/gateway.pb.go index 702195df..1c2625a1 100644 --- a/api/go/api/gateway.pb.go +++ b/api/go/api/gateway.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: api/gateway.proto diff --git a/api/go/api/internal.pb.go b/api/go/api/internal.pb.go index d895e320..b0cea84a 100644 --- a/api/go/api/internal.pb.go +++ b/api/go/api/internal.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: api/internal.proto diff --git a/api/go/api/multicast_group.pb.go b/api/go/api/multicast_group.pb.go index a0d9d88e..695fdc5d 100644 --- a/api/go/api/multicast_group.pb.go +++ b/api/go/api/multicast_group.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: api/multicast_group.proto diff --git a/api/go/api/relay.pb.go b/api/go/api/relay.pb.go index 1e48bb1d..d233ec14 100644 --- a/api/go/api/relay.pb.go +++ b/api/go/api/relay.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: api/relay.proto diff --git a/api/go/api/tenant.pb.go b/api/go/api/tenant.pb.go index aa0a16ee..5b3ccb93 100644 --- a/api/go/api/tenant.pb.go +++ b/api/go/api/tenant.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: api/tenant.proto diff --git a/api/go/api/user.pb.go b/api/go/api/user.pb.go index dbe06e22..115d0c72 100644 --- a/api/go/api/user.pb.go +++ b/api/go/api/user.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: api/user.proto diff --git a/api/go/common/common.pb.go b/api/go/common/common.pb.go index 6df354e8..3c5ff626 100644 --- a/api/go/common/common.pb.go +++ b/api/go/common/common.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: common/common.proto diff --git a/api/go/go.mod b/api/go/go.mod index 2d1b7688..625bc783 100644 --- a/api/go/go.mod +++ b/api/go/go.mod @@ -1,6 +1,6 @@ module github.com/chirpstack/chirpstack/api/go/v4 -go 1.18 +go 1.21 require ( google.golang.org/genproto/googleapis/api v0.0.0-20240325203815-454cdb8f5daa @@ -14,5 +14,4 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect - google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 // indirect ) diff --git a/api/go/go.sum b/api/go/go.sum index 750bb2f0..f6f95e32 100644 --- a/api/go/go.sum +++ b/api/go/go.sum @@ -13,7 +13,5 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 h1:rNBFJjBCOgVr9pWD7rs/knKL4FRTKgpZmsRfV214zcA= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0/go.mod h1:Dk1tviKTvMCz5tvh7t+fh94dhmQVHuCt2OzJB3CTW9Y= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= diff --git a/api/go/gw/gw.pb.go b/api/go/gw/gw.pb.go index fc9950a0..17a3d903 100644 --- a/api/go/gw/gw.pb.go +++ b/api/go/gw/gw.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: gw/gw.proto diff --git a/api/go/integration/integration.pb.go b/api/go/integration/integration.pb.go index 96fe84c7..d019355a 100644 --- a/api/go/integration/integration.pb.go +++ b/api/go/integration/integration.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: integration/integration.proto diff --git a/api/go/stream/api_request.pb.go b/api/go/stream/api_request.pb.go index 838d66ca..5b6700a4 100644 --- a/api/go/stream/api_request.pb.go +++ b/api/go/stream/api_request.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: stream/api_request.proto diff --git a/api/go/stream/backend_interfaces.pb.go b/api/go/stream/backend_interfaces.pb.go index d82c8e2b..0b7513ea 100644 --- a/api/go/stream/backend_interfaces.pb.go +++ b/api/go/stream/backend_interfaces.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: stream/backend_interfaces.proto diff --git a/api/go/stream/frame.pb.go b/api/go/stream/frame.pb.go index 4f5207dd..d04c2f89 100644 --- a/api/go/stream/frame.pb.go +++ b/api/go/stream/frame.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: stream/frame.proto diff --git a/api/go/stream/meta.pb.go b/api/go/stream/meta.pb.go index 9b9e27fe..63d458e2 100644 --- a/api/go/stream/meta.pb.go +++ b/api/go/stream/meta.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.31.0 // protoc v4.24.4 // source: stream/meta.proto diff --git a/shell.nix b/shell.nix index 540c712f..8bd53caf 100644 --- a/shell.nix +++ b/shell.nix @@ -16,6 +16,8 @@ pkgs.mkShell { pkgs.nodejs # js api + ui pkgs.yarn pkgs.protoc-gen-grpc-web # grpc-web api + pkgs.protoc-gen-go # go api + pkgs.protoc-gen-go-grpc ]; LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib"; BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.llvmPackages.libclang.lib}/lib/clang/${pkgs.llvmPackages.libclang.version}/include";