From 02720647a8fe6032bf21922fe4d64a554aa105b1 Mon Sep 17 00:00:00 2001 From: Tigor Hutasuhut Date: Fri, 16 Aug 2024 11:44:31 +0700 Subject: [PATCH] buf: protobuf now used managed mode --- go/cmd/bluemage/serve/serve.go | 4 ++-- go/server/device_handlers.go | 2 +- go/server/subreddit_handlers.go | 2 +- schemas/proto/buf.gen.go.yaml | 8 ++++++++ schemas/proto/device/v1/count.proto | 2 -- schemas/proto/device/v1/create.proto | 2 -- schemas/proto/device/v1/device.proto | 2 -- schemas/proto/device/v1/exists.proto | 2 -- schemas/proto/device/v1/get.proto | 2 -- schemas/proto/device/v1/list.proto | 2 -- schemas/proto/device/v1/types.proto | 2 -- schemas/proto/device/v1/update.proto | 2 -- schemas/proto/images/v1/images.proto | 2 -- schemas/proto/images/v1/types.proto | 2 -- schemas/proto/subreddits/v1/count.proto | 2 -- schemas/proto/subreddits/v1/create.proto | 2 -- schemas/proto/subreddits/v1/delete.proto | 2 -- schemas/proto/subreddits/v1/exist.proto | 2 -- schemas/proto/subreddits/v1/get.proto | 2 -- schemas/proto/subreddits/v1/list.proto | 2 -- schemas/proto/subreddits/v1/resolve.proto | 2 -- schemas/proto/subreddits/v1/subreddits.proto | 2 -- schemas/proto/subreddits/v1/types.proto | 2 -- schemas/proto/subreddits/v1/update.proto | 2 -- 24 files changed, 12 insertions(+), 44 deletions(-) diff --git a/go/cmd/bluemage/serve/serve.go b/go/cmd/bluemage/serve/serve.go index 6a12807..eb29607 100644 --- a/go/cmd/bluemage/serve/serve.go +++ b/go/cmd/bluemage/serve/serve.go @@ -20,8 +20,8 @@ import ( "github.com/stephenafamo/bob" "github.com/tigorlazuardi/bluemage/go/api" "github.com/tigorlazuardi/bluemage/go/config" - v1DeviceConnect "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1/v1connect" - v1SubredditsConnect "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1/v1connect" + v1DeviceConnect "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1/devicev1connect" + v1SubredditsConnect "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1/subredditsv1connect" "github.com/tigorlazuardi/bluemage/go/gen/reddit" "github.com/tigorlazuardi/bluemage/go/pkg/errs" "github.com/tigorlazuardi/bluemage/go/pkg/log" diff --git a/go/server/device_handlers.go b/go/server/device_handlers.go index ed6ae87..45a4970 100644 --- a/go/server/device_handlers.go +++ b/go/server/device_handlers.go @@ -7,7 +7,7 @@ import ( "github.com/tigorlazuardi/bluemage/go/api" "github.com/tigorlazuardi/bluemage/go/gen/converter" device "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1" - "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1/v1connect" + v1connect "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1/devicev1connect" "github.com/tigorlazuardi/bluemage/go/pkg/errs" ) diff --git a/go/server/subreddit_handlers.go b/go/server/subreddit_handlers.go index c86b579..0801cb6 100644 --- a/go/server/subreddit_handlers.go +++ b/go/server/subreddit_handlers.go @@ -8,7 +8,7 @@ import ( "github.com/tigorlazuardi/bluemage/go/api" "github.com/tigorlazuardi/bluemage/go/gen/converter" subreddits "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1" - "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1/v1connect" + v1connect "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1/subredditsv1connect" "github.com/tigorlazuardi/bluemage/go/pkg/errs" ) diff --git a/schemas/proto/buf.gen.go.yaml b/schemas/proto/buf.gen.go.yaml index 5446af9..96dc3ae 100644 --- a/schemas/proto/buf.gen.go.yaml +++ b/schemas/proto/buf.gen.go.yaml @@ -1,4 +1,12 @@ version: v2 +managed: + enabled: true + disable: + - module: buf.build/bufbuild/protovalidate + + override: + - file_option: go_package_prefix + value: github.com/tigorlazuardi/bluemage/go/gen/proto plugins: - local: protoc-gen-go out: ../../go/gen/proto diff --git a/schemas/proto/device/v1/count.proto b/schemas/proto/device/v1/count.proto index 2c2edf1..8c3f797 100644 --- a/schemas/proto/device/v1/count.proto +++ b/schemas/proto/device/v1/count.proto @@ -4,8 +4,6 @@ package device.v1; import "device/v1/list.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1"; - message CountDevicesRequest { // Limits the counts to devices that contains the given name. // case insensitive. diff --git a/schemas/proto/device/v1/create.proto b/schemas/proto/device/v1/create.proto index 0d9e5e7..6a3f174 100644 --- a/schemas/proto/device/v1/create.proto +++ b/schemas/proto/device/v1/create.proto @@ -4,8 +4,6 @@ package device.v1; import "buf/validate/validate.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1"; - message CreateDeviceRequest { // The `slug` is a unique identifier for the device, used to identify the device within the system. // Each `slug` must be unique across all devices. diff --git a/schemas/proto/device/v1/device.proto b/schemas/proto/device/v1/device.proto index 1e8b365..1c25078 100644 --- a/schemas/proto/device/v1/device.proto +++ b/schemas/proto/device/v1/device.proto @@ -9,8 +9,6 @@ import "device/v1/get.proto"; import "device/v1/list.proto"; import "device/v1/update.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1"; - service DeviceService { // GetDevice fetches a device by its slug. // diff --git a/schemas/proto/device/v1/exists.proto b/schemas/proto/device/v1/exists.proto index 1b65057..2d4bc4b 100644 --- a/schemas/proto/device/v1/exists.proto +++ b/schemas/proto/device/v1/exists.proto @@ -4,8 +4,6 @@ package device.v1; import "buf/validate/validate.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1"; - message DeviceExistsRequest { // The `slug` is a unique identifier for the device. string slug = 1 [(buf.validate.field).string.min_len = 1]; diff --git a/schemas/proto/device/v1/get.proto b/schemas/proto/device/v1/get.proto index 6043194..7721bcc 100644 --- a/schemas/proto/device/v1/get.proto +++ b/schemas/proto/device/v1/get.proto @@ -5,8 +5,6 @@ package device.v1; import "buf/validate/validate.proto"; import "device/v1/types.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1"; - message GetDeviceRequest { // The `slug` is a unique identifier for the device. string slug = 1 [(buf.validate.field).string.min_len = 1]; diff --git a/schemas/proto/device/v1/list.proto b/schemas/proto/device/v1/list.proto index de47141..335f4ed 100644 --- a/schemas/proto/device/v1/list.proto +++ b/schemas/proto/device/v1/list.proto @@ -4,8 +4,6 @@ package device.v1; import "device/v1/types.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1"; - message ListDevicesRequest { // searches the name and slug of the devices. // case insensitive. diff --git a/schemas/proto/device/v1/types.proto b/schemas/proto/device/v1/types.proto index 369a20f..076cc24 100644 --- a/schemas/proto/device/v1/types.proto +++ b/schemas/proto/device/v1/types.proto @@ -2,8 +2,6 @@ syntax = "proto3"; package device.v1; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1"; - message Device { string slug = 1; bool disabled = 2; diff --git a/schemas/proto/device/v1/update.proto b/schemas/proto/device/v1/update.proto index b3f6367..1178cd0 100644 --- a/schemas/proto/device/v1/update.proto +++ b/schemas/proto/device/v1/update.proto @@ -4,8 +4,6 @@ package device.v1; import "buf/validate/validate.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/device/v1"; - message UpdateDeviceRequest { string slug = 1 [(buf.validate.field).string.min_len = 1]; DeviceSetter set = 2; diff --git a/schemas/proto/images/v1/images.proto b/schemas/proto/images/v1/images.proto index 321a8e0..2d0d78f 100644 --- a/schemas/proto/images/v1/images.proto +++ b/schemas/proto/images/v1/images.proto @@ -5,8 +5,6 @@ package images.v1; import "buf/validate/validate.proto"; import "images/v1/types.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/images/v1"; - service ImageService { rpc RecentlyAddedImages(RecentlyAddedImagesRequest) returns (RecentlyAddedImagesResponse) {} } diff --git a/schemas/proto/images/v1/types.proto b/schemas/proto/images/v1/types.proto index 3fd5a25..ff05efd 100644 --- a/schemas/proto/images/v1/types.proto +++ b/schemas/proto/images/v1/types.proto @@ -2,8 +2,6 @@ syntax = "proto3"; package images.v1; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/images/v1"; - message Image { int32 id = 1; string subreddit = 2; diff --git a/schemas/proto/subreddits/v1/count.proto b/schemas/proto/subreddits/v1/count.proto index 8ae1cea..9674af2 100644 --- a/schemas/proto/subreddits/v1/count.proto +++ b/schemas/proto/subreddits/v1/count.proto @@ -4,8 +4,6 @@ package subreddits.v1; import "subreddits/v1/types.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1"; - message CountSubredditsRequest { // Limits the counts to subreddits that contains the given name. // case insensitive. diff --git a/schemas/proto/subreddits/v1/create.proto b/schemas/proto/subreddits/v1/create.proto index eddf85c..cc6d1f4 100644 --- a/schemas/proto/subreddits/v1/create.proto +++ b/schemas/proto/subreddits/v1/create.proto @@ -5,8 +5,6 @@ package subreddits.v1; import "buf/validate/validate.proto"; import "subreddits/v1/types.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1"; - message CreateSubredditRequest { // name of the subreddits to insert. // diff --git a/schemas/proto/subreddits/v1/delete.proto b/schemas/proto/subreddits/v1/delete.proto index 7f76423..9c72163 100644 --- a/schemas/proto/subreddits/v1/delete.proto +++ b/schemas/proto/subreddits/v1/delete.proto @@ -4,8 +4,6 @@ package subreddits.v1; import "buf/validate/validate.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1"; - message DeleteSubredditRequest { // name of the subreddit to delete string name = 1 [(buf.validate.field).string.min_len = 1]; diff --git a/schemas/proto/subreddits/v1/exist.proto b/schemas/proto/subreddits/v1/exist.proto index 2857890..c9e9cd6 100644 --- a/schemas/proto/subreddits/v1/exist.proto +++ b/schemas/proto/subreddits/v1/exist.proto @@ -4,8 +4,6 @@ package subreddits.v1; import "buf/validate/validate.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1"; - message SubredditExistsRequest { // name of the subreddit. Case insensitive. string name = 1 [(buf.validate.field).string.min_len = 1]; diff --git a/schemas/proto/subreddits/v1/get.proto b/schemas/proto/subreddits/v1/get.proto index e8f64e9..3f503c0 100644 --- a/schemas/proto/subreddits/v1/get.proto +++ b/schemas/proto/subreddits/v1/get.proto @@ -5,8 +5,6 @@ package subreddits.v1; import "buf/validate/validate.proto"; import "subreddits/v1/types.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1"; - message GetSubredditRequest { // name of the subreddit. Case insensitive. // diff --git a/schemas/proto/subreddits/v1/list.proto b/schemas/proto/subreddits/v1/list.proto index a171e96..7ae3104 100644 --- a/schemas/proto/subreddits/v1/list.proto +++ b/schemas/proto/subreddits/v1/list.proto @@ -4,8 +4,6 @@ package subreddits.v1; import "subreddits/v1/types.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1"; - message ListSubredditsRequest { // Searches the name of the Subreddit. // case insensitive. diff --git a/schemas/proto/subreddits/v1/resolve.proto b/schemas/proto/subreddits/v1/resolve.proto index 39f2580..3930fa3 100644 --- a/schemas/proto/subreddits/v1/resolve.proto +++ b/schemas/proto/subreddits/v1/resolve.proto @@ -5,8 +5,6 @@ package subreddits.v1; import "buf/validate/validate.proto"; import "subreddits/v1/types.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1"; - message ResolveSubredditNameRequest { // name of the subreddit to resolve (check existence and casing). string name = 1 [(buf.validate.field).string.min_len = 1]; diff --git a/schemas/proto/subreddits/v1/subreddits.proto b/schemas/proto/subreddits/v1/subreddits.proto index a090e5c..c1792e6 100644 --- a/schemas/proto/subreddits/v1/subreddits.proto +++ b/schemas/proto/subreddits/v1/subreddits.proto @@ -11,8 +11,6 @@ import "subreddits/v1/list.proto"; import "subreddits/v1/resolve.proto"; import "subreddits/v1/update.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1"; - service SubredditsService { // CreateSubreddit creates a new subreddit // diff --git a/schemas/proto/subreddits/v1/types.proto b/schemas/proto/subreddits/v1/types.proto index 6700972..381f3ea 100644 --- a/schemas/proto/subreddits/v1/types.proto +++ b/schemas/proto/subreddits/v1/types.proto @@ -2,8 +2,6 @@ syntax = "proto3"; package subreddits.v1; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1"; - message Subreddit { string name = 1; bool disabled = 2; diff --git a/schemas/proto/subreddits/v1/update.proto b/schemas/proto/subreddits/v1/update.proto index 4c65510..1f7ba19 100644 --- a/schemas/proto/subreddits/v1/update.proto +++ b/schemas/proto/subreddits/v1/update.proto @@ -4,8 +4,6 @@ package subreddits.v1; import "buf/validate/validate.proto"; -option go_package = "github.com/tigorlazuardi/bluemage/go/gen/proto/subreddits/v1"; - message UpdateSubredditRequest { // The name of the subreddit to update. string name = 1 [(buf.validate.field).string.min_len = 1];