From 61e3e01e51f03c47994389dccf67e656068f1353 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 29 Aug 2022 12:55:43 +0200 Subject: [PATCH 1/2] Added Category field to Platform gRPC struct --- commands/core.go | 1 + commands/core/search_test.go | 11 +++++ rpc/cc/arduino/cli/commands/v1/common.pb.go | 55 ++++++++++++--------- rpc/cc/arduino/cli/commands/v1/common.proto | 2 + 4 files changed, 47 insertions(+), 22 deletions(-) diff --git a/commands/core.go b/commands/core.go index 44b668ad9f8..cb79a21b4ae 100644 --- a/commands/core.go +++ b/commands/core.go @@ -60,6 +60,7 @@ func PlatformReleaseToRPC(platformRelease *cores.PlatformRelease) *rpc.Platform Latest: platformRelease.Version.String(), ManuallyInstalled: platformRelease.Platform.ManuallyInstalled, Deprecated: platformRelease.Platform.Deprecated, + Category: platformRelease.Platform.Category, } return result diff --git a/commands/core/search_test.go b/commands/core/search_test.go index 4e69ef4aae6..6448bb75912 100644 --- a/commands/core/search_test.go +++ b/commands/core/search_test.go @@ -61,6 +61,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, + Category: "Contributed", }) require.Contains(t, res.SearchOutput, &rpc.Platform{ Id: "Retrokits-RK002:arm", @@ -71,6 +72,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, + Category: "Contributed", }) res, stat = PlatformSearch(&rpc.PlatformSearchRequest{ @@ -90,6 +92,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, + Category: "Contributed", }) // Search the Package Maintainer @@ -110,6 +113,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, + Category: "Contributed", }) require.Contains(t, res.SearchOutput, &rpc.Platform{ Id: "Retrokits-RK002:arm", @@ -120,6 +124,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, + Category: "Contributed", }) // Search using the Package name @@ -140,6 +145,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, + Category: "Contributed", }) require.Contains(t, res.SearchOutput, &rpc.Platform{ Id: "Retrokits-RK002:arm", @@ -150,6 +156,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, + Category: "Contributed", }) // Search using the Platform name @@ -170,6 +177,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, + Category: "Contributed", }) require.Contains(t, res.SearchOutput, &rpc.Platform{ Id: "Retrokits-RK002:arm", @@ -180,6 +188,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, + Category: "Contributed", }) // Search using a board name @@ -199,6 +208,7 @@ func TestPlatformSearch(t *testing.T) { Maintainer: "Arduino", Website: "https://www.arduino.cc/", Email: "packages@arduino.cc", + Category: "Arduino", Boards: []*rpc.Board{ {Name: "Arduino Yún"}, {Name: "Arduino Uno"}, @@ -245,6 +255,7 @@ func TestPlatformSearch(t *testing.T) { Maintainer: "Arduino", Website: "https://www.arduino.cc/", Email: "packages@arduino.cc", + Category: "Arduino", Boards: []*rpc.Board{ {Name: "Arduino Yún"}, {Name: "Arduino Uno"}, diff --git a/rpc/cc/arduino/cli/commands/v1/common.pb.go b/rpc/cc/arduino/cli/commands/v1/common.pb.go index 65c93f179f9..d6664d56387 100644 --- a/rpc/cc/arduino/cli/commands/v1/common.pb.go +++ b/rpc/cc/arduino/cli/commands/v1/common.pb.go @@ -335,6 +335,8 @@ type Platform struct { ManuallyInstalled bool `protobuf:"varint,9,opt,name=manually_installed,json=manuallyInstalled,proto3" json:"manually_installed,omitempty"` // If true this Platform has been deprecated Deprecated bool `protobuf:"varint,10,opt,name=deprecated,proto3" json:"deprecated,omitempty"` + // Category of the platform. + Category string `protobuf:"bytes,11,opt,name=category,proto3" json:"category,omitempty"` } func (x *Platform) Reset() { @@ -439,6 +441,13 @@ func (x *Platform) GetDeprecated() bool { return false } +func (x *Platform) GetCategory() string { + if x != nil { + return x.Category + } + return "" +} + type InstalledPlatformReference struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -659,7 +668,7 @@ var file_cc_arduino_cli_commands_v1_common_proto_rawDesc = []byte{ 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xbe, 0x02, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xda, 0x02, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, @@ -679,27 +688,29 @@ var file_cc_arduino_cli_commands_v1_common_proto_rawDesc = []byte{ 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x6d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x22, 0x88, - 0x01, 0x0a, 0x1a, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x50, 0x6c, 0x61, 0x74, - 0x66, 0x6f, 0x72, 0x6d, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, - 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, - 0x6c, 0x6c, 0x5f, 0x64, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, - 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x44, 0x69, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x61, 0x63, 0x6b, - 0x61, 0x67, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, - 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x55, 0x72, 0x6c, 0x22, 0x2f, 0x0a, 0x05, 0x42, 0x6f, 0x61, - 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x22, 0x31, 0x0a, 0x07, 0x50, 0x72, - 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x71, 0x62, - 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x42, 0x48, 0x5a, - 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x72, 0x64, 0x75, - 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2d, 0x63, 0x6c, 0x69, 0x2f, - 0x72, 0x70, 0x63, 0x2f, 0x63, 0x63, 0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2f, 0x63, - 0x6c, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x63, - 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x08, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x1a, + 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x88, 0x01, 0x0a, 0x1a, 0x49, + 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, + 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x5f, 0x64, + 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, + 0x6c, 0x44, 0x69, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x5f, + 0x75, 0x72, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, + 0x67, 0x65, 0x55, 0x72, 0x6c, 0x22, 0x2f, 0x0a, 0x05, 0x42, 0x6f, 0x61, 0x72, 0x64, 0x12, 0x12, + 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x22, 0x31, 0x0a, 0x07, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, + 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2f, + 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2d, 0x63, 0x6c, 0x69, 0x2f, 0x72, 0x70, 0x63, 0x2f, + 0x63, 0x63, 0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x63, + 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x61, + 0x6e, 0x64, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/rpc/cc/arduino/cli/commands/v1/common.proto b/rpc/cc/arduino/cli/commands/v1/common.proto index a94085b9e5b..3fea2b9c88d 100644 --- a/rpc/cc/arduino/cli/commands/v1/common.proto +++ b/rpc/cc/arduino/cli/commands/v1/common.proto @@ -80,6 +80,8 @@ message Platform { bool manually_installed = 9; // If true this Platform has been deprecated bool deprecated = 10; + // Category of the platform. + string category = 11; } message InstalledPlatformReference { From 2fede22c08f87b14b378afdbe718433d6ea6c49a Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 29 Aug 2022 14:04:19 +0200 Subject: [PATCH 2/2] Renamed gRPC response from Category string to Type []string --- commands/core.go | 2 +- commands/core/search_test.go | 22 ++++---- rpc/cc/arduino/cli/commands/v1/common.pb.go | 58 ++++++++++----------- rpc/cc/arduino/cli/commands/v1/common.proto | 4 +- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/commands/core.go b/commands/core.go index cb79a21b4ae..8ce74953c67 100644 --- a/commands/core.go +++ b/commands/core.go @@ -60,7 +60,7 @@ func PlatformReleaseToRPC(platformRelease *cores.PlatformRelease) *rpc.Platform Latest: platformRelease.Version.String(), ManuallyInstalled: platformRelease.Platform.ManuallyInstalled, Deprecated: platformRelease.Platform.Deprecated, - Category: platformRelease.Platform.Category, + Type: []string{platformRelease.Platform.Category}, } return result diff --git a/commands/core/search_test.go b/commands/core/search_test.go index 6448bb75912..40c7b8a52eb 100644 --- a/commands/core/search_test.go +++ b/commands/core/search_test.go @@ -61,7 +61,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, - Category: "Contributed", + Type: []string{"Contributed"}, }) require.Contains(t, res.SearchOutput, &rpc.Platform{ Id: "Retrokits-RK002:arm", @@ -72,7 +72,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, - Category: "Contributed", + Type: []string{"Contributed"}, }) res, stat = PlatformSearch(&rpc.PlatformSearchRequest{ @@ -92,7 +92,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, - Category: "Contributed", + Type: []string{"Contributed"}, }) // Search the Package Maintainer @@ -113,7 +113,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, - Category: "Contributed", + Type: []string{"Contributed"}, }) require.Contains(t, res.SearchOutput, &rpc.Platform{ Id: "Retrokits-RK002:arm", @@ -124,7 +124,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, - Category: "Contributed", + Type: []string{"Contributed"}, }) // Search using the Package name @@ -145,7 +145,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, - Category: "Contributed", + Type: []string{"Contributed"}, }) require.Contains(t, res.SearchOutput, &rpc.Platform{ Id: "Retrokits-RK002:arm", @@ -156,7 +156,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, - Category: "Contributed", + Type: []string{"Contributed"}, }) // Search using the Platform name @@ -177,7 +177,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, - Category: "Contributed", + Type: []string{"Contributed"}, }) require.Contains(t, res.SearchOutput, &rpc.Platform{ Id: "Retrokits-RK002:arm", @@ -188,7 +188,7 @@ func TestPlatformSearch(t *testing.T) { Website: "https://www.retrokits.com", Email: "info@retrokits.com", Boards: []*rpc.Board{{Name: "RK002"}}, - Category: "Contributed", + Type: []string{"Contributed"}, }) // Search using a board name @@ -208,7 +208,7 @@ func TestPlatformSearch(t *testing.T) { Maintainer: "Arduino", Website: "https://www.arduino.cc/", Email: "packages@arduino.cc", - Category: "Arduino", + Type: []string{"Arduino"}, Boards: []*rpc.Board{ {Name: "Arduino Yún"}, {Name: "Arduino Uno"}, @@ -255,7 +255,7 @@ func TestPlatformSearch(t *testing.T) { Maintainer: "Arduino", Website: "https://www.arduino.cc/", Email: "packages@arduino.cc", - Category: "Arduino", + Type: []string{"Arduino"}, Boards: []*rpc.Board{ {Name: "Arduino Yún"}, {Name: "Arduino Uno"}, diff --git a/rpc/cc/arduino/cli/commands/v1/common.pb.go b/rpc/cc/arduino/cli/commands/v1/common.pb.go index d6664d56387..349ec7ae3c9 100644 --- a/rpc/cc/arduino/cli/commands/v1/common.pb.go +++ b/rpc/cc/arduino/cli/commands/v1/common.pb.go @@ -335,8 +335,8 @@ type Platform struct { ManuallyInstalled bool `protobuf:"varint,9,opt,name=manually_installed,json=manuallyInstalled,proto3" json:"manually_installed,omitempty"` // If true this Platform has been deprecated Deprecated bool `protobuf:"varint,10,opt,name=deprecated,proto3" json:"deprecated,omitempty"` - // Category of the platform. - Category string `protobuf:"bytes,11,opt,name=category,proto3" json:"category,omitempty"` + // Type of the platform. + Type []string `protobuf:"bytes,11,rep,name=type,proto3" json:"type,omitempty"` } func (x *Platform) Reset() { @@ -441,11 +441,11 @@ func (x *Platform) GetDeprecated() bool { return false } -func (x *Platform) GetCategory() string { +func (x *Platform) GetType() []string { if x != nil { - return x.Category + return x.Type } - return "" + return nil } type InstalledPlatformReference struct { @@ -668,7 +668,7 @@ var file_cc_arduino_cli_commands_v1_common_proto_rawDesc = []byte{ 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xda, 0x02, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xd2, 0x02, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, @@ -688,29 +688,29 @@ var file_cc_arduino_cli_commands_v1_common_proto_rawDesc = []byte{ 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x6d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x1a, - 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x88, 0x01, 0x0a, 0x1a, 0x49, - 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, - 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x5f, 0x64, - 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, - 0x6c, 0x44, 0x69, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x5f, - 0x75, 0x72, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, - 0x67, 0x65, 0x55, 0x72, 0x6c, 0x22, 0x2f, 0x0a, 0x05, 0x42, 0x6f, 0x61, 0x72, 0x64, 0x12, 0x12, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x22, 0x31, 0x0a, 0x07, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, - 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2f, - 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2d, 0x63, 0x6c, 0x69, 0x2f, 0x72, 0x70, 0x63, 0x2f, - 0x63, 0x63, 0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x63, - 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x61, - 0x6e, 0x64, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x08, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x12, + 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, + 0x70, 0x65, 0x22, 0x88, 0x01, 0x0a, 0x1a, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, + 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, + 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, + 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x5f, 0x64, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x44, 0x69, 0x72, 0x12, 0x1f, 0x0a, 0x0b, + 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x55, 0x72, 0x6c, 0x22, 0x2f, 0x0a, + 0x05, 0x42, 0x6f, 0x61, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x71, + 0x62, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x71, 0x62, 0x6e, 0x22, 0x31, + 0x0a, 0x07, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, + 0x04, 0x66, 0x71, 0x62, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x71, 0x62, + 0x6e, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x2d, + 0x63, 0x6c, 0x69, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x63, 0x63, 0x2f, 0x61, 0x72, 0x64, 0x75, 0x69, + 0x6e, 0x6f, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x2f, + 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/rpc/cc/arduino/cli/commands/v1/common.proto b/rpc/cc/arduino/cli/commands/v1/common.proto index 3fea2b9c88d..ee801774be1 100644 --- a/rpc/cc/arduino/cli/commands/v1/common.proto +++ b/rpc/cc/arduino/cli/commands/v1/common.proto @@ -80,8 +80,8 @@ message Platform { bool manually_installed = 9; // If true this Platform has been deprecated bool deprecated = 10; - // Category of the platform. - string category = 11; + // Type of the platform. + repeated string type = 11; } message InstalledPlatformReference {