Rearrange protobuf files (#251)

* move protobuf definitions under rpc/commands

* move commands daemon into commands folder

* make client a test case

* run protoc as part of the testing pipeline

.travis.yml

@@ -4,7 +4,7 @@ go:
   - 1.12.x
 
 env:
-  - GO111MODULE=on
+  - GO111MODULE=on PATH=$HOME/protobuf/bin:$PATH
 
 # Anything in before_script that returns a nonzero exit code will flunk the
 # build and immediately stop. It's sorta like having set -e enabled in bash.
@@ -13,11 +13,18 @@ install:
   - curl -sL https://taskfile.dev/install.sh | sh
   - go get github.com/golangci/govet
   - go get golang.org/x/lint/golint
+  - go get -u github.com/golang/protobuf/protoc-gen-go
+  - |
+    mkdir -p $HOME/protobuf && pushd $HOME/protobuf &&
+    curl -LO 'https://github.com/google/protobuf/releases/download/v3.8.0/protoc-3.8.0-linux-x86_64.zip' &&
+    unzip protoc-3.8.0-linux-x86_64.zip &&
+    popd
 
 script:
   # Check if the code is formatted and run linter
   - ./bin/task check
   # Build and test
+  - ./bin/task protoc
   - ./bin/task build
   - ./bin/task test
   - ./bin/task test-legacy
@@ -25,5 +32,3 @@ script:
 after_success:
   - bash <(curl -s https://codecov.io/bash) -cF unit -f '*_unit.txt'
   - bash <(curl -s https://codecov.io/bash) -cF integ -f '*_integ.txt'
-
-

Taskfile.yml

 version: '2'
 
 tasks:
+  protoc:
+    desc: Compile protobuf definitions
+    cmds:
+      - protoc --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/commands/*.proto
+
   build:
     desc: Build the project
     cmds:
@@ -45,6 +50,11 @@ tasks:
       - test -z $(go fmt ./legacy/...)
       - go vet ./legacy/...
 
+  rpc-client:
+    desc: Run the rpc client test routine (server must be already started)
+    cmds:
+      - go test -run TestWithClientE2E ./commands/daemon
+
 vars:
   # all modules of this project except for "legacy/..." module
   DEFAULT_TARGETS:
@@ -67,4 +77,4 @@ vars:
     -X github.com/arduino/arduino-cli/version.commit={{.TEST_COMMIT}}'
 
   # check-lint vars
-  GOLINTFLAGS: "-min_confidence 0.8 -set_exit_status"
\ No newline at end of file
+  GOLINTFLAGS: "-min_confidence 0.8 -set_exit_status"

cli/board/attach.go

@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/spf13/cobra"
 )
 

cli/board/details.go

@@ -26,7 +26,7 @@ import (
 	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/output"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/spf13/cobra"
 )
 

cli/board/list.go

@@ -28,7 +28,7 @@ import (
 	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/output"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/spf13/cobra"
 )
 

cli/board/listall.go

@@ -27,7 +27,7 @@ import (
 	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/output"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/spf13/cobra"
 )
 

cli/cli.go

@@ -31,7 +31,7 @@ import (
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/configs"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/arduino/arduino-cli/version"
 	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"

cli/compile/compile.go

@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/compile"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/arduino/go-paths-helper"
 	"github.com/spf13/cobra"
 )

cli/core/download.go

@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/core"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cli/core/install.go

@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/core"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cli/core/list.go

@@ -27,7 +27,7 @@ import (
 	"github.com/arduino/arduino-cli/commands/core"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/output"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cli/core/search.go

@@ -28,7 +28,7 @@ import (
 	"github.com/arduino/arduino-cli/commands/core"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/output"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cli/core/uninstall.go

@@ -25,7 +25,7 @@ import (
 	"github.com/arduino/arduino-cli/commands/core"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/output"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cli/core/update_index.go

@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cli/core/upgrade.go

@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/core"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cli/daemon/daemon.go

@@ -25,8 +25,8 @@ import (
 	"runtime"
 
 	"github.com/arduino/arduino-cli/cli"
-	"github.com/arduino/arduino-cli/daemon"
-	"github.com/arduino/arduino-cli/rpc"
+	"github.com/arduino/arduino-cli/commands/daemon"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 )

cli/lib/download.go

@@ -25,7 +25,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/spf13/cobra"
 )
 

cli/lib/install.go

@@ -25,7 +25,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/spf13/cobra"
 )
 

cli/lib/list.go

@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/gosuri/uitable"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cli/lib/search.go

@@ -27,7 +27,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	semver "go.bug.st/relaxed-semver"

cli/lib/uninstall.go

@@ -25,7 +25,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cli/lib/update_index.go

@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/spf13/cobra"
 )
 

cli/lib/upgrade.go

@@ -23,7 +23,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/output.go

@@ -25,7 +25,7 @@ import (
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/output"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // OutputJSONOrElse outputs the JSON encoding of v if the JSON output format has been

cli/upload/upload.go

@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/upload"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/arduino/go-paths-helper"
 	"github.com/spf13/cobra"
 )

commands/board/attach.go

@@ -29,7 +29,7 @@ import (
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/sketches"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	discovery "github.com/arduino/board-discovery"
 	paths "github.com/arduino/go-paths-helper"
 )

commands/board/details.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // Details FIXMEDOC

commands/board/list.go

@@ -23,7 +23,7 @@ import (
 	"fmt"
 
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // List FIXMEDOC

commands/board/listall.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // ListAll FIXMEDOC

commands/bundled_tools.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // DownloadToolRelease downloads a ToolRelease

commands/compile/compile.go

@@ -34,7 +34,7 @@ import (
 	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	paths "github.com/arduino/go-paths-helper"
 	properties "github.com/arduino/go-properties-orderedmap"
 	"github.com/sirupsen/logrus"

commands/core/download.go

@@ -26,7 +26,7 @@ import (
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // PlatformDownload FIXMEDOC

commands/core/install.go

@@ -26,7 +26,7 @@ import (
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // PlatformInstall FIXMEDOC

commands/core/list.go

@@ -22,7 +22,7 @@ import (
 	"errors"
 
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // PlatformList FIXMEDOC

commands/core/search.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // PlatformSearch FIXMEDOC

commands/core/uninstall.go

@@ -25,7 +25,7 @@ import (
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // PlatformUninstall FIXMEDOC

commands/core/upgrade.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // PlatformUpgrade FIXMEDOC

daemon/client/client.go → commands/daemon/client_test.go

@@ -15,34 +15,40 @@
 // a commercial license, send an email to license@arduino.cc.
 //
 
-package main
+package daemon_test
 
 import (
 	"context"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
+	"testing"
+	"time"
 
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"google.golang.org/grpc"
 )
 
-func main() {
-	if len(os.Args) != 3 {
-		fmt.Println("Please specify Arduino DATA_DIR as first argument")
-		os.Exit(1)
+func TestWithClientE2E(t *testing.T) {
+	if testing.Short() {
+		t.Skip("rpc client test must be run manually, skip...")
 	}
-	datadir := os.Args[1]
 
-	fmt.Println("=== Connecting to GRPC server")
-	conn, err := grpc.Dial("127.0.0.1:50051", grpc.WithInsecure())
+	conn, err := grpc.Dial("localhost:50051", grpc.WithInsecure(), grpc.WithBlock(), grpc.WithTimeout(100*time.Millisecond))
 	if err != nil {
-		fmt.Printf("Error connecting to server: %s\n", err)
-		os.Exit(1)
+		t.Skip("error connecting to arduino-cli rpc server, skip...")
 	}
+	defer conn.Close()
+
+	datadir, err := ioutil.TempDir("", "arduino-rpc-client")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(datadir)
+
 	client := rpc.NewArduinoCoreClient(conn)
-	fmt.Println()
 
 	// VERSION
 	fmt.Println("=== calling Version")

daemon/daemon.go → commands/daemon/daemon.go

@@ -32,7 +32,7 @@ import (
 	"github.com/arduino/arduino-cli/commands/core"
 	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/arduino/arduino-cli/commands/upload"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // ArduinoCoreServerImpl FIXMEDOC

commands/instances.go

@@ -33,7 +33,7 @@ import (
 	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/configs"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
 	"go.bug.st/downloader"

commands/lib/download.go

@@ -25,7 +25,7 @@ import (
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 )
 

commands/lib/install.go

@@ -25,7 +25,7 @@ import (
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 )
 

commands/lib/list.go

@@ -24,7 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 type installedLib struct {

commands/lib/search.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // LibrarySearch FIXMEDOC

commands/lib/uninstall.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // LibraryUninstall FIXMEDOC

commands/lib/upgrade.go

@@ -23,7 +23,7 @@ import (
 	"net/http"
 
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // LibraryUpgradeAll FIXMEDOC

commands/progress.go

@@ -17,7 +17,7 @@
 
 package commands
 
-import "github.com/arduino/arduino-cli/rpc"
+import rpc "github.com/arduino/arduino-cli/rpc/commands"
 
 // DownloadProgressCB is a callback to get updates on download progress
 type DownloadProgressCB func(curr *rpc.DownloadProgress)

commands/upload/upload.go

@@ -31,7 +31,7 @@ import (
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/executils"
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	paths "github.com/arduino/go-paths-helper"
 	properties "github.com/arduino/go-properties-orderedmap"
 	"github.com/sirupsen/logrus"

output/rpc_progress.go

@@ -20,7 +20,7 @@ package output
 import (
 	"fmt"
 
-	"github.com/arduino/arduino-cli/rpc"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/cmaglie/pb"
 )
 

rpc/board.proto → rpc/commands/board.proto

@@ -17,11 +17,11 @@
 
 syntax = "proto3";
 
-package cc.arduino.core.rpc;
+package cc.arduino.cli.commands;
 
-option go_package = "github.com/arduino/arduino-cli/rpc";
+option go_package = "github.com/arduino/arduino-cli/rpc/commands";
 
-import "common.proto";
+import "commands/common.proto";
 
 message BoardDetailsReq {
   Instance instance = 1;

rpc/commands.proto → rpc/commands/commands.proto

@@ -17,16 +17,16 @@
 
 syntax = "proto3";
 
-package cc.arduino.core.rpc;
+package cc.arduino.cli.commands;
 
-option go_package = "github.com/arduino/arduino-cli/rpc";
+option go_package = "github.com/arduino/arduino-cli/rpc/commands";
 
-import "common.proto";
-import "board.proto";
-import "compile.proto";
-import "core.proto";
-import "upload.proto";
-import "lib.proto";
+import "commands/common.proto";
+import "commands/board.proto";
+import "commands/compile.proto";
+import "commands/core.proto";
+import "commands/upload.proto";
+import "commands/lib.proto";
 
 // The main Arduino Platform Service
 service ArduinoCore {

rpc/common.pb.go → rpc/commands/common.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: common.proto
+// source: commands/common.proto
 
-package rpc // import "github.com/arduino/arduino-cli/rpc"
+package commands
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +18,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Instance struct {
 	Id                   int32    `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -29,16 +31,17 @@ func (m *Instance) Reset()         { *m = Instance{} }
 func (m *Instance) String() string { return proto.CompactTextString(m) }
 func (*Instance) ProtoMessage()    {}
 func (*Instance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2f2953b7902b8ec7, []int{0}
+	return fileDescriptor_0b273be58978a133, []int{0}
 }
+
 func (m *Instance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Instance.Unmarshal(m, b)
 }
 func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
 }
-func (dst *Instance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Instance.Merge(dst, src)
+func (m *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(m, src)
 }
 func (m *Instance) XXX_Size() int {
 	return xxx_messageInfo_Instance.Size(m)
@@ -71,16 +74,17 @@ func (m *DownloadProgress) Reset()         { *m = DownloadProgress{} }
 func (m *DownloadProgress) String() string { return proto.CompactTextString(m) }
 func (*DownloadProgress) ProtoMessage()    {}
 func (*DownloadProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2f2953b7902b8ec7, []int{1}
+	return fileDescriptor_0b273be58978a133, []int{1}
 }
+
 func (m *DownloadProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DownloadProgress.Unmarshal(m, b)
 }
 func (m *DownloadProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DownloadProgress.Marshal(b, m, deterministic)
 }
-func (dst *DownloadProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DownloadProgress.Merge(dst, src)
+func (m *DownloadProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DownloadProgress.Merge(m, src)
 }
 func (m *DownloadProgress) XXX_Size() int {
 	return xxx_messageInfo_DownloadProgress.Size(m)
@@ -139,16 +143,17 @@ func (m *TaskProgress) Reset()         { *m = TaskProgress{} }
 func (m *TaskProgress) String() string { return proto.CompactTextString(m) }
 func (*TaskProgress) ProtoMessage()    {}
 func (*TaskProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2f2953b7902b8ec7, []int{2}
+	return fileDescriptor_0b273be58978a133, []int{2}
 }
+
 func (m *TaskProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TaskProgress.Unmarshal(m, b)
 }
 func (m *TaskProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TaskProgress.Marshal(b, m, deterministic)
 }
-func (dst *TaskProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TaskProgress.Merge(dst, src)
+func (m *TaskProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TaskProgress.Merge(m, src)
 }
 func (m *TaskProgress) XXX_Size() int {
 	return xxx_messageInfo_TaskProgress.Size(m)
@@ -181,29 +186,30 @@ func (m *TaskProgress) GetCompleted() bool {
 }
 
 func init() {
-	proto.RegisterType((*Instance)(nil), "cc.arduino.core.rpc.Instance")
-	proto.RegisterType((*DownloadProgress)(nil), "cc.arduino.core.rpc.DownloadProgress")
-	proto.RegisterType((*TaskProgress)(nil), "cc.arduino.core.rpc.TaskProgress")
-}
-
-func init() { proto.RegisterFile("common.proto", fileDescriptor_common_2f2953b7902b8ec7) }
-
-var fileDescriptor_common_2f2953b7902b8ec7 = []byte{
-	// 253 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x90, 0x4f, 0x4b, 0xc4, 0x30,
-	0x14, 0xc4, 0xe9, 0x76, 0x57, 0xb7, 0x8f, 0x45, 0x96, 0x78, 0x09, 0xa2, 0x22, 0xc5, 0x83, 0x17,
-	0xbb, 0x07, 0xbf, 0x81, 0x78, 0xf1, 0x26, 0xd5, 0xd3, 0x5e, 0x24, 0x9b, 0xc4, 0x1a, 0x4c, 0xf2,
-	0x4a, 0x92, 0x22, 0xf8, 0x3d, 0xfc, 0xbe, 0x3e, 0x43, 0xeb, 0x9f, 0x3d, 0x65, 0x32, 0xf3, 0x18,
-	0x7e, 0x0c, 0xac, 0x24, 0x3a, 0x87, 0xbe, 0xe9, 0x03, 0x26, 0x64, 0xc7, 0x52, 0x36, 0x22, 0xa8,
-	0xc1, 0x78, 0x6c, 0x24, 0x06, 0xdd, 0x84, 0x5e, 0xd6, 0x27, 0xb0, 0xbc, 0xf7, 0x31, 0x09, 0x2f,
-	0x35, 0x3b, 0x82, 0x99, 0x51, 0xbc, 0xb8, 0x28, 0xae, 0x16, 0x2d, 0xa9, 0xfa, 0xb3, 0x80, 0xf5,
-	0x1d, 0xbe, 0x7b, 0x8b, 0x42, 0x3d, 0x04, 0xec, 0x82, 0x8e, 0x91, 0xad, 0xa1, 0x1c, 0x82, 0xcd,
-	0x57, 0x55, 0xfb, 0x2d, 0x19, 0x83, 0xf9, 0x8b, 0xb1, 0x9a, 0xcf, 0xb2, 0x95, 0x35, 0x3b, 0x03,
-	0x48, 0x98, 0x84, 0x7d, 0x8e, 0xe6, 0x43, 0xf3, 0x92, 0x92, 0xb2, 0xad, 0xb2, 0xf3, 0x48, 0x06,
-	0x3b, 0x07, 0x50, 0x63, 0xb1, 0x56, 0x7c, 0x9e, 0xe3, 0x3f, 0x0e, 0x3b, 0x85, 0x8a, 0xd0, 0x7b,
-	0xab, 0x13, 0xc5, 0x0b, 0x8a, 0x97, 0xed, 0xaf, 0x51, 0x6f, 0x61, 0xf5, 0x24, 0xe2, 0xdb, 0x0f,
-	0x12, 0x01, 0x78, 0xe1, 0xf4, 0xc8, 0x94, 0x35, 0xe3, 0x70, 0xe8, 0x28, 0x13, 0xdd, 0xc4, 0x35,
-	0x7d, 0xff, 0x77, 0x97, 0x7b, 0xdd, 0xb7, 0x97, 0xdb, 0xba, 0x33, 0xe9, 0x75, 0xd8, 0xd1, 0x44,
-	0x6e, 0x33, 0xce, 0x35, 0xbd, 0xd7, 0xd2, 0x9a, 0x0d, 0xad, 0xb6, 0x3b, 0xc8, 0x8b, 0xde, 0x7c,
-	0x05, 0x00, 0x00, 0xff, 0xff, 0x72, 0xf8, 0x1e, 0x93, 0x61, 0x01, 0x00, 0x00,
+	proto.RegisterType((*Instance)(nil), "cc.arduino.cli.commands.Instance")
+	proto.RegisterType((*DownloadProgress)(nil), "cc.arduino.cli.commands.DownloadProgress")
+	proto.RegisterType((*TaskProgress)(nil), "cc.arduino.cli.commands.TaskProgress")
+}
+
+func init() { proto.RegisterFile("commands/common.proto", fileDescriptor_0b273be58978a133) }
+
+var fileDescriptor_0b273be58978a133 = []byte{
+	// 263 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xcd, 0x4a, 0xc4, 0x30,
+	0x14, 0x85, 0xe9, 0xcf, 0xe8, 0xf4, 0x22, 0x32, 0x04, 0xc4, 0x20, 0x2a, 0xa5, 0xab, 0x82, 0x4c,
+	0xbb, 0xf0, 0x0d, 0xc4, 0x8d, 0x3b, 0xa9, 0xae, 0x66, 0x23, 0x99, 0x24, 0xd6, 0x60, 0x9a, 0x5b,
+	0x92, 0x14, 0x61, 0xde, 0xc3, 0xf7, 0x95, 0x86, 0xc6, 0xbf, 0x55, 0x4e, 0xce, 0x3d, 0x1c, 0x0e,
+	0x1f, 0x9c, 0x71, 0x1c, 0x06, 0x66, 0x84, 0x6b, 0x67, 0x81, 0xa6, 0x19, 0x2d, 0x7a, 0x24, 0xe7,
+	0x9c, 0x37, 0xcc, 0x8a, 0x49, 0x19, 0x6c, 0xb8, 0x56, 0x4d, 0x4c, 0x55, 0x17, 0xb0, 0x7e, 0x30,
+	0xce, 0x33, 0xc3, 0x25, 0x39, 0x85, 0x54, 0x09, 0x9a, 0x94, 0x49, 0xbd, 0xea, 0x52, 0x25, 0xaa,
+	0xcf, 0x04, 0x36, 0xf7, 0xf8, 0x61, 0x34, 0x32, 0xf1, 0x68, 0xb1, 0xb7, 0xd2, 0x39, 0xb2, 0x81,
+	0x6c, 0xb2, 0x3a, 0xa4, 0x8a, 0x6e, 0x96, 0x84, 0x40, 0xfe, 0xaa, 0xb4, 0xa4, 0x69, 0xb0, 0x82,
+	0x26, 0x57, 0x00, 0x1e, 0x3d, 0xd3, 0x2f, 0x4e, 0x1d, 0x24, 0xcd, 0xca, 0xa4, 0xce, 0xba, 0x22,
+	0x38, 0x4f, 0xea, 0x20, 0xc9, 0x35, 0x80, 0x58, 0x8a, 0xa5, 0xa0, 0x79, 0x38, 0xff, 0x72, 0xc8,
+	0x25, 0x14, 0x1c, 0x87, 0x51, 0x4b, 0x2f, 0x05, 0x5d, 0x95, 0x49, 0xbd, 0xee, 0x7e, 0x8c, 0x6a,
+	0x07, 0x27, 0xcf, 0xcc, 0xbd, 0x7f, 0x4f, 0x22, 0x90, 0x1b, 0x36, 0xc8, 0x65, 0x53, 0xd0, 0x84,
+	0xc2, 0xf1, 0x20, 0x9d, 0x63, 0x7d, 0xdc, 0x15, 0xbf, 0x7f, 0xbb, 0xb3, 0x7f, 0xdd, 0x77, 0xdb,
+	0xdd, 0x4d, 0xaf, 0xfc, 0xdb, 0xb4, 0x9f, 0x11, 0xb5, 0x0b, 0xb2, 0xf8, 0x6e, 0xb9, 0x56, 0xad,
+	0x1d, 0x79, 0x1b, 0xf1, 0xed, 0x8f, 0x02, 0xde, 0xdb, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77,
+	0x28, 0x70, 0xdd, 0x77, 0x01, 0x00, 0x00,
 }

rpc/common.proto → rpc/commands/common.proto

@@ -17,9 +17,9 @@
 
 syntax = "proto3";
 
-package cc.arduino.core.rpc;
+package cc.arduino.cli.commands;
 
-option go_package = "github.com/arduino/arduino-cli/rpc";
+option go_package = "github.com/arduino/arduino-cli/rpc/commands";
 
 message Instance { int32 id = 1; }
 

rpc/compile.pb.go → rpc/commands/compile.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: compile.proto
+// source: commands/compile.proto
 
-package rpc // import "github.com/arduino/arduino-cli/rpc"
+package commands
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +18,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type CompileReq struct {
 	Instance             *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
@@ -41,16 +43,17 @@ func (m *CompileReq) Reset()         { *m = CompileReq{} }
 func (m *CompileReq) String() string { return proto.CompactTextString(m) }
 func (*CompileReq) ProtoMessage()    {}
 func (*CompileReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_compile_56a3ee3fd90c77e2, []int{0}
+	return fileDescriptor_86bc582849c76c3d, []int{0}
 }
+
 func (m *CompileReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompileReq.Unmarshal(m, b)
 }
 func (m *CompileReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompileReq.Marshal(b, m, deterministic)
 }
-func (dst *CompileReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompileReq.Merge(dst, src)
+func (m *CompileReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompileReq.Merge(m, src)
 }
 func (m *CompileReq) XXX_Size() int {
 	return xxx_messageInfo_CompileReq.Size(m)
@@ -164,16 +167,17 @@ func (m *CompileResp) Reset()         { *m = CompileResp{} }
 func (m *CompileResp) String() string { return proto.CompactTextString(m) }
 func (*CompileResp) ProtoMessage()    {}
 func (*CompileResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_compile_56a3ee3fd90c77e2, []int{1}
+	return fileDescriptor_86bc582849c76c3d, []int{1}
 }
+
 func (m *CompileResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompileResp.Unmarshal(m, b)
 }
 func (m *CompileResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompileResp.Marshal(b, m, deterministic)
 }
-func (dst *CompileResp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompileResp.Merge(dst, src)
+func (m *CompileResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompileResp.Merge(m, src)
 }
 func (m *CompileResp) XXX_Size() int {
 	return xxx_messageInfo_CompileResp.Size(m)
@@ -199,35 +203,36 @@ func (m *CompileResp) GetErrStream() []byte {
 }
 
 func init() {
-	proto.RegisterType((*CompileReq)(nil), "cc.arduino.core.rpc.CompileReq")
-	proto.RegisterType((*CompileResp)(nil), "cc.arduino.core.rpc.CompileResp")
-}
-
-func init() { proto.RegisterFile("compile.proto", fileDescriptor_compile_56a3ee3fd90c77e2) }
-
-var fileDescriptor_compile_56a3ee3fd90c77e2 = []byte{
-	// 366 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x92, 0x4f, 0x6b, 0xe3, 0x30,
-	0x10, 0xc5, 0xc9, 0x7f, 0x7b, 0x92, 0xec, 0x82, 0x76, 0x59, 0x44, 0xd8, 0x2c, 0x21, 0x2c, 0x25,
-	0x97, 0x3a, 0xd0, 0x9e, 0x7a, 0x6d, 0xa0, 0x50, 0x7a, 0x09, 0xee, 0xad, 0x97, 0x62, 0xcb, 0xd3,
-	0x58, 0x34, 0xb6, 0x1c, 0x49, 0x4e, 0xfa, 0xcd, 0xfa, 0xf5, 0x2a, 0x8f, 0xf3, 0x8f, 0xd0, 0x53,
-	0x32, 0xbf, 0xf7, 0xf4, 0x34, 0xf6, 0x33, 0x0c, 0x85, 0xca, 0x0a, 0xb9, 0xc6, 0xa0, 0xd0, 0xca,
-	0x2a, 0xf6, 0x4b, 0x88, 0x20, 0xd2, 0x49, 0x29, 0x73, 0x15, 0x08, 0xa5, 0x31, 0xd0, 0x85, 0x18,
-	0x0d, 0x9c, 0x27, 0x53, 0x79, 0x6d, 0x99, 0x7e, 0xb6, 0x00, 0x16, 0xf5, 0xa1, 0x10, 0x37, 0xec,
-	0x0e, 0x3c, 0x99, 0x1b, 0x1b, 0xe5, 0x02, 0x79, 0x63, 0xd2, 0x98, 0xf5, 0x6f, 0xc6, 0xc1, 0x37,
-	0x21, 0xc1, 0xe3, 0xde, 0x14, 0x1e, 0xed, 0x8c, 0x41, 0xfb, 0x6d, 0x13, 0xe7, 0xbc, 0xe9, 0x8e,
-	0xf9, 0x21, 0xfd, 0x67, 0xff, 0x00, 0xcc, 0x3b, 0x5a, 0x91, 0x2e, 0x23, 0x9b, 0xf2, 0x16, 0x29,
-	0x67, 0x84, 0x5d, 0xc1, 0x0f, 0x93, 0xaa, 0xdd, 0x52, 0xab, 0x02, 0xb5, 0x95, 0x68, 0x78, 0xdb,
-	0x79, 0xbc, 0xf0, 0x82, 0x56, 0x39, 0x85, 0x46, 0xb7, 0xb1, 0x40, 0x63, 0x78, 0x87, 0x3c, 0x67,
-	0xa4, 0xca, 0x89, 0x4b, 0xb9, 0x4e, 0x16, 0x91, 0x48, 0x91, 0xee, 0xea, 0xd2, 0x5d, 0x17, 0x94,
-	0xfd, 0x05, 0x9f, 0x08, 0x59, 0x7a, 0x64, 0x39, 0x01, 0x36, 0x83, 0x9f, 0xf5, 0x70, 0x5a, 0xc7,
-	0x9b, 0xb4, 0x9c, 0xe7, 0x12, 0xb3, 0x11, 0x78, 0xbb, 0x48, 0xe7, 0x32, 0x5f, 0x19, 0xee, 0x53,
-	0xcc, 0x71, 0x66, 0x1c, 0x7a, 0x5b, 0xd4, 0xb1, 0x32, 0xc8, 0x81, 0x16, 0x3d, 0x8c, 0xec, 0x37,
-	0x74, 0x36, 0xa5, 0x44, 0xcb, 0xfb, 0xc4, 0xeb, 0x81, 0xfd, 0x81, 0xee, 0x56, 0x26, 0x4b, 0x99,
-	0xf0, 0x01, 0x25, 0xed, 0xa7, 0xea, 0x99, 0xf1, 0xa3, 0x50, 0xda, 0x3e, 0xb8, 0x6e, 0xf8, 0xb0,
-	0x7e, 0x77, 0x27, 0x32, 0x7d, 0x82, 0xfe, 0xb1, 0x38, 0x53, 0xb0, 0x31, 0x80, 0x2a, 0xed, 0xab,
-	0xb1, 0x1a, 0xa3, 0x8c, 0xba, 0x1b, 0x84, 0xbe, 0x23, 0xcf, 0x04, 0x2a, 0x19, 0xb5, 0x3e, 0xc8,
-	0xcd, 0x5a, 0x76, 0xa4, 0x96, 0xef, 0xff, 0xbf, 0x4c, 0x57, 0xd2, 0xa6, 0x65, 0xec, 0x2a, 0xce,
-	0xe6, 0xfb, 0xba, 0x0f, 0xbf, 0xd7, 0x62, 0x2d, 0xe7, 0xae, 0xf5, 0xb8, 0x4b, 0xdf, 0xcc, 0xed,
-	0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x76, 0x47, 0x15, 0x51, 0x67, 0x02, 0x00, 0x00,
+	proto.RegisterType((*CompileReq)(nil), "cc.arduino.cli.commands.CompileReq")
+	proto.RegisterType((*CompileResp)(nil), "cc.arduino.cli.commands.CompileResp")
+}
+
+func init() { proto.RegisterFile("commands/compile.proto", fileDescriptor_86bc582849c76c3d) }
+
+var fileDescriptor_86bc582849c76c3d = []byte{
+	// 378 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x4f, 0x8b, 0xdb, 0x30,
+	0x14, 0xc4, 0x71, 0xfe, 0xda, 0x2f, 0x69, 0x0b, 0xa2, 0x4d, 0x45, 0x68, 0x8b, 0x9b, 0x43, 0x31,
+	0x94, 0xd8, 0xd0, 0x9e, 0x7b, 0x69, 0xa0, 0x50, 0x7a, 0x09, 0xee, 0x6d, 0x2f, 0x8b, 0x2d, 0xbf,
+	0x8d, 0xc5, 0xda, 0x92, 0x22, 0xc9, 0xc9, 0x7e, 0xb7, 0xfd, 0x72, 0x8b, 0xe5, 0x38, 0x09, 0x81,
+	0x3d, 0xd9, 0xef, 0x37, 0xa3, 0x91, 0xec, 0x11, 0x2c, 0x98, 0xac, 0xeb, 0x4c, 0x14, 0x26, 0x61,
+	0xb2, 0x56, 0xbc, 0xc2, 0x58, 0x69, 0x69, 0x25, 0xf9, 0xc8, 0x58, 0x9c, 0xe9, 0xa2, 0xe1, 0x42,
+	0xc6, 0xac, 0xe2, 0x71, 0x6f, 0x5b, 0x7e, 0xb8, 0x5e, 0x50, 0x4b, 0xd1, 0xf9, 0x57, 0xcf, 0x43,
+	0x80, 0x4d, 0x97, 0x90, 0xe2, 0x9e, 0xfc, 0x02, 0x9f, 0x0b, 0x63, 0x33, 0xc1, 0x90, 0x7a, 0xa1,
+	0x17, 0xcd, 0x7e, 0x7c, 0x8d, 0x5f, 0x49, 0x8c, 0xff, 0x9e, 0x8c, 0xe9, 0x79, 0x09, 0x21, 0x30,
+	0x7a, 0xd8, 0xe7, 0x82, 0x0e, 0x42, 0x2f, 0x0a, 0x52, 0xf7, 0x4e, 0xbe, 0x00, 0x98, 0x47, 0xb4,
+	0xac, 0xdc, 0x66, 0xb6, 0xa4, 0x43, 0xa7, 0x5c, 0x11, 0xf2, 0x0d, 0xde, 0x9a, 0x52, 0x1e, 0xb7,
+	0x5a, 0x2a, 0xd4, 0x96, 0xa3, 0xa1, 0xa3, 0xd0, 0x8b, 0xfc, 0xf4, 0x86, 0xb6, 0x39, 0x4a, 0xa3,
+	0xd2, 0x92, 0xa1, 0x31, 0x74, 0xec, 0x3c, 0x57, 0xa4, 0xcd, 0xc9, 0x1b, 0x5e, 0x15, 0x9b, 0x8c,
+	0x95, 0xe8, 0xf6, 0x9a, 0xb8, 0xbd, 0x6e, 0x28, 0xf9, 0x04, 0x81, 0x23, 0xce, 0x32, 0x75, 0x96,
+	0x0b, 0x20, 0x11, 0xbc, 0xeb, 0x86, 0xcb, 0x71, 0xfc, 0x70, 0x18, 0x05, 0xe9, 0x2d, 0x26, 0x4b,
+	0xf0, 0x8f, 0x99, 0x16, 0x5c, 0xec, 0x0c, 0x0d, 0x5c, 0xcc, 0x79, 0x26, 0x14, 0xa6, 0x07, 0xd4,
+	0xb9, 0x34, 0x48, 0xc1, 0x1d, 0xb4, 0x1f, 0xc9, 0x7b, 0x18, 0xef, 0x1b, 0x8e, 0x96, 0xce, 0x1c,
+	0xef, 0x06, 0xb2, 0x80, 0xc9, 0x81, 0x17, 0x5b, 0x5e, 0xd0, 0xb9, 0x4b, 0x3a, 0x4d, 0xed, 0x37,
+	0xe3, 0x93, 0x92, 0xda, 0xfe, 0xe1, 0x15, 0xd2, 0x37, 0xdd, 0xbf, 0xbb, 0x90, 0xd5, 0x3f, 0x98,
+	0x9d, 0xcb, 0x33, 0x8a, 0x7c, 0x06, 0x90, 0x8d, 0xbd, 0x37, 0x56, 0x63, 0x56, 0xbb, 0xfe, 0xe6,
+	0x69, 0x20, 0x1b, 0xfb, 0xdf, 0x81, 0x56, 0x46, 0xad, 0x7b, 0x79, 0xd0, 0xc9, 0xa8, 0x75, 0x27,
+	0xff, 0x5e, 0xdf, 0x7d, 0xdf, 0x71, 0x5b, 0x36, 0x79, 0x5b, 0x71, 0x72, 0xaa, 0xbc, 0x7f, 0xae,
+	0x59, 0xc5, 0x13, 0xad, 0x58, 0xd2, 0xd7, 0x9f, 0x4f, 0xdc, 0x05, 0xfa, 0xf9, 0x12, 0x00, 0x00,
+	0xff, 0xff, 0xd2, 0xee, 0xb7, 0xd0, 0x8a, 0x02, 0x00, 0x00,
 }

rpc/compile.proto → rpc/commands/compile.proto

@@ -17,11 +17,11 @@
 
 syntax = "proto3";
 
-package cc.arduino.core.rpc;
+package cc.arduino.cli.commands;
 
-option go_package = "github.com/arduino/arduino-cli/rpc";
+option go_package = "github.com/arduino/arduino-cli/rpc/commands";
 
-import "common.proto";
+import "commands/common.proto";
 
 message CompileReq {
   Instance instance = 1;

rpc/core.proto → rpc/commands/core.proto

@@ -17,11 +17,11 @@
 
 syntax = "proto3";
 
-package cc.arduino.core.rpc;
+package cc.arduino.cli.commands;
 
-option go_package = "github.com/arduino/arduino-cli/rpc";
+option go_package = "github.com/arduino/arduino-cli/rpc/commands";
 
-import "common.proto";
+import "commands/common.proto";
 
 message PlatformInstallReq {
     Instance instance = 1;

rpc/lib.proto → rpc/commands/lib.proto

@@ -17,11 +17,11 @@
 
 syntax = "proto3";
 
-package cc.arduino.core.rpc;
+package cc.arduino.cli.commands;
 
-option go_package = "github.com/arduino/arduino-cli/rpc";
+option go_package = "github.com/arduino/arduino-cli/rpc/commands";
 
-import "common.proto";
+import "commands/common.proto";
 
 message LibraryDownloadReq {
     Instance instance = 1;

rpc/upload.pb.go → rpc/commands/upload.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: upload.proto
+// source: commands/upload.proto
 
-package rpc // import "github.com/arduino/arduino-cli/rpc"
+package commands
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +18,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type UploadReq struct {
 	Instance             *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
@@ -35,16 +37,17 @@ func (m *UploadReq) Reset()         { *m = UploadReq{} }
 func (m *UploadReq) String() string { return proto.CompactTextString(m) }
 func (*UploadReq) ProtoMessage()    {}
 func (*UploadReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_upload_9ff06549022ccd97, []int{0}
+	return fileDescriptor_cd642cc079f8acdb, []int{0}
 }
+
 func (m *UploadReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UploadReq.Unmarshal(m, b)
 }
 func (m *UploadReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UploadReq.Marshal(b, m, deterministic)
 }
-func (dst *UploadReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UploadReq.Merge(dst, src)
+func (m *UploadReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadReq.Merge(m, src)
 }
 func (m *UploadReq) XXX_Size() int {
 	return xxx_messageInfo_UploadReq.Size(m)
@@ -116,16 +119,17 @@ func (m *UploadResp) Reset()         { *m = UploadResp{} }
 func (m *UploadResp) String() string { return proto.CompactTextString(m) }
 func (*UploadResp) ProtoMessage()    {}
 func (*UploadResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_upload_9ff06549022ccd97, []int{1}
+	return fileDescriptor_cd642cc079f8acdb, []int{1}
 }
+
 func (m *UploadResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UploadResp.Unmarshal(m, b)
 }
 func (m *UploadResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UploadResp.Marshal(b, m, deterministic)
 }
-func (dst *UploadResp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UploadResp.Merge(dst, src)
+func (m *UploadResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadResp.Merge(m, src)
 }
 func (m *UploadResp) XXX_Size() int {
 	return xxx_messageInfo_UploadResp.Size(m)
@@ -151,30 +155,31 @@ func (m *UploadResp) GetErrStream() []byte {
 }
 
 func init() {
-	proto.RegisterType((*UploadReq)(nil), "cc.arduino.core.rpc.UploadReq")
-	proto.RegisterType((*UploadResp)(nil), "cc.arduino.core.rpc.UploadResp")
-}
-
-func init() { proto.RegisterFile("upload.proto", fileDescriptor_upload_9ff06549022ccd97) }
-
-var fileDescriptor_upload_9ff06549022ccd97 = []byte{
-	// 279 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x90, 0x4f, 0x4b, 0xc4, 0x30,
-	0x10, 0xc5, 0xe9, 0xba, 0x76, 0xb7, 0xb3, 0x3d, 0x45, 0x90, 0x20, 0x2c, 0x4a, 0xf1, 0xe0, 0xc5,
-	0x2c, 0xe8, 0xc9, 0xab, 0x07, 0x41, 0x4f, 0x52, 0xf1, 0xe2, 0xa5, 0xb4, 0xd9, 0xd4, 0x06, 0xdb,
-	0x4e, 0x36, 0x4d, 0x05, 0xbf, 0xae, 0x9f, 0xc4, 0xfc, 0x69, 0x3d, 0xed, 0x29, 0x33, 0xbf, 0x37,
-	0x2f, 0xc3, 0x3c, 0x48, 0x47, 0xd5, 0x62, 0xb9, 0x67, 0x4a, 0xa3, 0x41, 0x72, 0xc6, 0x39, 0x2b,
-	0xf5, 0x7e, 0x94, 0x3d, 0x32, 0x8e, 0x5a, 0x30, 0xad, 0xf8, 0x45, 0xca, 0xb1, 0xeb, 0xb0, 0x0f,
-	0x23, 0xd9, 0x6f, 0x04, 0xc9, 0xbb, 0xf7, 0xe4, 0xe2, 0x40, 0x1e, 0x60, 0x2d, 0xfb, 0xc1, 0x94,
-	0x3d, 0x17, 0x34, 0xba, 0x8a, 0x6e, 0x36, 0x77, 0x5b, 0x76, 0xe4, 0x0f, 0xf6, 0x3c, 0x0d, 0xe5,
-	0xff, 0xe3, 0x84, 0xc0, 0xb2, 0x3e, 0x54, 0x3d, 0x5d, 0x58, 0x5b, 0x92, 0xfb, 0x9a, 0x5c, 0xc2,
-	0x66, 0xf8, 0x12, 0x86, 0x37, 0x85, 0x2a, 0x4d, 0x43, 0x4f, 0xbc, 0x04, 0x01, 0xbd, 0x5a, 0xe2,
-	0x4c, 0x0a, 0xb5, 0xa1, 0xcb, 0x60, 0x72, 0x35, 0xa1, 0xb0, 0xfa, 0x16, 0xba, 0xc2, 0x41, 0xd0,
-	0x53, 0x8b, 0xd7, 0xf9, 0xdc, 0x92, 0x73, 0x88, 0x6d, 0x29, 0xeb, 0x1f, 0x1a, 0x7b, 0x61, 0xea,
-	0xdc, 0x1a, 0xd9, 0x39, 0x6f, 0x51, 0xcb, 0x56, 0xd0, 0x55, 0x58, 0x13, 0xd0, 0x93, 0x25, 0xd9,
-	0x0b, 0xc0, 0x7c, 0xe3, 0xa0, 0xc8, 0x16, 0x00, 0x47, 0x53, 0x0c, 0x46, 0x8b, 0xb2, 0xf3, 0x67,
-	0xa6, 0x79, 0x62, 0xc9, 0x9b, 0x07, 0x4e, 0x16, 0x5a, 0xcf, 0xf2, 0x22, 0xc8, 0x96, 0x04, 0xf9,
-	0xf1, 0xfa, 0x23, 0xfb, 0x94, 0xa6, 0x19, 0x2b, 0x9b, 0x46, 0xb7, 0x9b, 0x92, 0x99, 0xdf, 0x5b,
-	0xde, 0xca, 0x9d, 0x0d, 0xa8, 0x8a, 0x7d, 0xba, 0xf7, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xce,
-	0xf0, 0x30, 0x54, 0x90, 0x01, 0x00, 0x00,
+	proto.RegisterType((*UploadReq)(nil), "cc.arduino.cli.commands.UploadReq")
+	proto.RegisterType((*UploadResp)(nil), "cc.arduino.cli.commands.UploadResp")
+}
+
+func init() { proto.RegisterFile("commands/upload.proto", fileDescriptor_cd642cc079f8acdb) }
+
+var fileDescriptor_cd642cc079f8acdb = []byte{
+	// 291 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x4f, 0x4b, 0xc4, 0x30,
+	0x10, 0xc5, 0xe9, 0xba, 0xee, 0x9f, 0x59, 0x4f, 0x01, 0x35, 0x08, 0xe2, 0xba, 0xa7, 0x05, 0xd9,
+	0x14, 0xf4, 0xec, 0xc5, 0x83, 0xa0, 0x27, 0xa9, 0x78, 0xf1, 0x52, 0xd2, 0x34, 0xb5, 0xc1, 0x36,
+	0xc9, 0x26, 0xe9, 0x82, 0x5f, 0xd8, 0xcf, 0x21, 0x49, 0x1a, 0x3d, 0x79, 0xca, 0x64, 0x7e, 0xef,
+	0xcd, 0x30, 0x0f, 0x4e, 0x99, 0xea, 0x7b, 0x2a, 0x6b, 0x9b, 0x0f, 0xba, 0x53, 0xb4, 0x26, 0xda,
+	0x28, 0xa7, 0xd0, 0x39, 0x63, 0x84, 0x9a, 0x7a, 0x10, 0x52, 0x11, 0xd6, 0x09, 0x92, 0x54, 0x17,
+	0x7f, 0x7a, 0x5f, 0x28, 0x19, 0xf5, 0x9b, 0xef, 0x0c, 0x96, 0x6f, 0x61, 0x40, 0xc1, 0xf7, 0xe8,
+	0x1e, 0x16, 0x42, 0x5a, 0x47, 0x25, 0xe3, 0x38, 0x5b, 0x67, 0xdb, 0xd5, 0xed, 0x35, 0xf9, 0x67,
+	0x20, 0x79, 0x1a, 0x85, 0xc5, 0xaf, 0x05, 0x21, 0x98, 0x36, 0xfb, 0x4a, 0xe2, 0xc9, 0x3a, 0xdb,
+	0x2e, 0x8b, 0x50, 0xa3, 0x2b, 0x58, 0xd9, 0x4f, 0xee, 0x58, 0x5b, 0x6a, 0xea, 0x5a, 0x7c, 0x14,
+	0x10, 0xc4, 0xd6, 0x0b, 0x75, 0xad, 0x37, 0x69, 0x65, 0x1c, 0x9e, 0x46, 0x93, 0xaf, 0x11, 0x86,
+	0xf9, 0x81, 0x9b, 0x4a, 0x59, 0x8e, 0x8f, 0xd7, 0xd9, 0x76, 0x51, 0xa4, 0x2f, 0x3a, 0x83, 0xd9,
+	0x81, 0x1b, 0xd1, 0x7c, 0xe1, 0x59, 0x00, 0xe3, 0xcf, 0xaf, 0x11, 0xbd, 0xf7, 0x96, 0x8d, 0xe8,
+	0x38, 0x9e, 0xc7, 0x35, 0xb1, 0xf5, 0x28, 0x3a, 0xbe, 0x79, 0x06, 0x48, 0x77, 0x5a, 0x8d, 0x2e,
+	0x01, 0xd4, 0xe0, 0x4a, 0xeb, 0x0c, 0xa7, 0x7d, 0x38, 0xf5, 0xa4, 0x58, 0xaa, 0xc1, 0xbd, 0x86,
+	0x86, 0xc7, 0xdc, 0x98, 0x84, 0x27, 0x11, 0x73, 0x63, 0x22, 0x7e, 0xd8, 0xbd, 0xdf, 0x7c, 0x08,
+	0xd7, 0x0e, 0x95, 0x4f, 0x23, 0x1f, 0xd3, 0x49, 0xef, 0x8e, 0x75, 0x22, 0x37, 0x9a, 0xe5, 0x29,
+	0xa9, 0x6a, 0x16, 0xa2, 0xbe, 0xfb, 0x09, 0x00, 0x00, 0xff, 0xff, 0xfc, 0xf8, 0xc5, 0x33, 0xb3,
+	0x01, 0x00, 0x00,
 }

rpc/upload.proto → rpc/commands/upload.proto

@@ -17,11 +17,11 @@
 
 syntax = "proto3";
 
-package cc.arduino.core.rpc;
+package cc.arduino.cli.commands;
 
-option go_package = "github.com/arduino/arduino-cli/rpc";
+option go_package = "github.com/arduino/arduino-cli/rpc/commands";
 
-import "common.proto";
+import "commands/common.proto";
 
 message UploadReq {
     Instance instance = 1;

rpc/rpc.go

-//
-// This file is part of arduino-cli.
-//
-// Copyright 2018 ARDUINO SA (http://www.arduino.cc/)
-//
-// This software is released under the GNU General Public License version 3,
-// which covers the main part of arduino-cli.
-// The terms of this license can be found at:
-// https://www.gnu.org/licenses/gpl-3.0.en.html
-//
-// You can be released from the requirements of the above licenses by purchasing
-// a commercial license. Buying such a license is mandatory if you want to modify or
-// otherwise use the software for commercial activities involving the Arduino
-// software without disclosing the source code of your own applications. To purchase
-// a commercial license, send an email to license@arduino.cc.
-//
-
-package rpc
-
-//go:generate protoc -I . -I .. --go_out=plugins=grpc:../../../.. board.proto
-//go:generate protoc -I . -I .. --go_out=plugins=grpc:../../../.. commands.proto
-//go:generate protoc -I . -I .. --go_out=plugins=grpc:../../../.. common.proto
-//go:generate protoc -I . -I .. --go_out=plugins=grpc:../../../.. compile.proto
-//go:generate protoc -I . -I .. --go_out=plugins=grpc:../../../.. core.proto
-//go:generate protoc -I . -I .. --go_out=plugins=grpc:../../../.. lib.proto
-//go:generate protoc -I . -I .. --go_out=plugins=grpc:../../../.. upload.proto
-
-// protoc --plugin=protoc-gen-grpc-java=path/to/protoc-gen-grpc-java --grpc-java_out=java --proto_path=. board.proto
-// find . -name "*.proto" -exec protoc -I=. --java_out=java {} \;