Skip to content

Commit cec629c

Browse files
matteosuppomatteosuppo
committed
Move board rpc commands in their own package
Keeping with the process of isolating features, the board commands have been moved in their own package. Nothing should change from the user perspective Signed-off-by: Matteo Suppo <[email protected]>
1 parent 4ed7183 commit cec629c

File tree

17 files changed

+205
-426
lines changed

17 files changed

+205
-426
lines changed

Diff for: ‎Taskfile.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ tasks:
55
desc: Compile protobuf definitions
66
cmds:
77
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/commands/*.proto'
8+
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/board/*.proto'
89
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/monitor/*.proto'
910
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/settings/*.proto'
1011

Diff for: ‎cli/board/attach.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli/instance"
2525
"github.com/arduino/arduino-cli/cli/output"
2626
"github.com/arduino/arduino-cli/commands/board"
27-
rpc "github.com/arduino/arduino-cli/rpc/commands"
27+
rpc "github.com/arduino/arduino-cli/rpc/board"
2828
"github.com/arduino/go-paths-helper"
2929
"github.com/sirupsen/logrus"
3030
"github.com/spf13/cobra"

Diff for: ‎cli/board/details.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/arduino/arduino-cli/cli/feedback"
2424
"github.com/arduino/arduino-cli/cli/instance"
2525
"github.com/arduino/arduino-cli/commands/board"
26-
rpc "github.com/arduino/arduino-cli/rpc/commands"
26+
rpc "github.com/arduino/arduino-cli/rpc/board"
2727
"github.com/arduino/arduino-cli/table"
2828
"github.com/fatih/color"
2929
"github.com/spf13/cobra"

Diff for: ‎cli/board/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/arduino/arduino-cli/cli/feedback"
2727
"github.com/arduino/arduino-cli/cli/instance"
2828
"github.com/arduino/arduino-cli/commands/board"
29-
rpc "github.com/arduino/arduino-cli/rpc/commands"
29+
rpc "github.com/arduino/arduino-cli/rpc/board"
3030
"github.com/arduino/arduino-cli/table"
3131
"github.com/spf13/cobra"
3232
)

Diff for: ‎cli/board/listall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli/feedback"
2525
"github.com/arduino/arduino-cli/cli/instance"
2626
"github.com/arduino/arduino-cli/commands/board"
27-
rpc "github.com/arduino/arduino-cli/rpc/commands"
27+
rpc "github.com/arduino/arduino-cli/rpc/board"
2828
"github.com/arduino/arduino-cli/table"
2929
"github.com/spf13/cobra"
3030
)

Diff for: ‎commands/board/attach.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ import (
2727
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
2828
"github.com/arduino/arduino-cli/arduino/sketches"
2929
"github.com/arduino/arduino-cli/commands"
30-
rpc "github.com/arduino/arduino-cli/rpc/commands"
30+
rpc "github.com/arduino/arduino-cli/rpc/board"
31+
commonrpc "github.com/arduino/arduino-cli/rpc/commands"
3132
discovery "github.com/arduino/board-discovery"
3233
paths "github.com/arduino/go-paths-helper"
3334
)
@@ -89,7 +90,7 @@ func Attach(ctx context.Context, req *rpc.BoardAttachReq, taskCB commands.TaskPr
8990
if board == nil {
9091
return nil, fmt.Errorf("no supported board found at %s", deviceURI.String())
9192
}
92-
taskCB(&rpc.TaskProgress{Name: "Board found: " + board.Name()})
93+
taskCB(&commonrpc.TaskProgress{Name: "Board found: " + board.Name()})
9394

9495
// TODO: should be stoped the monitor: when running as a pure CLI is released
9596
// by the OS, when run as daemon the resource's state is unknown and could be leaked.
@@ -103,7 +104,7 @@ func Attach(ctx context.Context, req *rpc.BoardAttachReq, taskCB commands.TaskPr
103104
if err != nil {
104105
return nil, fmt.Errorf("cannot export sketch metadata: %s", err)
105106
}
106-
taskCB(&rpc.TaskProgress{Name: "Selected fqbn: " + sketch.Metadata.CPU.Fqbn, Completed: true})
107+
taskCB(&commonrpc.TaskProgress{Name: "Selected fqbn: " + sketch.Metadata.CPU.Fqbn, Completed: true})
107108
return &rpc.BoardAttachResp{}, nil
108109
}
109110

Diff for: ‎commands/board/details.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/arduino/arduino-cli/arduino/cores"
2424
"github.com/arduino/arduino-cli/commands"
25-
rpc "github.com/arduino/arduino-cli/rpc/commands"
25+
rpc "github.com/arduino/arduino-cli/rpc/board"
2626
)
2727

2828
// Details FIXMEDOC

Diff for: ‎commands/board/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"github.com/arduino/arduino-cli/cli/globals"
2727
"github.com/arduino/arduino-cli/commands"
28-
rpc "github.com/arduino/arduino-cli/rpc/commands"
28+
rpc "github.com/arduino/arduino-cli/rpc/board"
2929
"github.com/pkg/errors"
3030
"github.com/sirupsen/logrus"
3131
)

Diff for: ‎commands/board/listall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
"github.com/arduino/arduino-cli/commands"
24-
rpc "github.com/arduino/arduino-cli/rpc/commands"
24+
rpc "github.com/arduino/arduino-cli/rpc/board"
2525
)
2626

2727
// ListAll FIXMEDOC

Diff for: ‎commands/daemon/daemon.go

-35
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"net/http"
2424

2525
"github.com/arduino/arduino-cli/commands"
26-
"github.com/arduino/arduino-cli/commands/board"
2726
"github.com/arduino/arduino-cli/commands/compile"
2827
"github.com/arduino/arduino-cli/commands/core"
2928
"github.com/arduino/arduino-cli/commands/lib"
@@ -37,40 +36,6 @@ type ArduinoCoreServerImpl struct {
3736
VersionString string
3837
}
3938

40-
// BoardDetails FIXMEDOC
41-
func (s *ArduinoCoreServerImpl) BoardDetails(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsResp, error) {
42-
return board.Details(ctx, req)
43-
}
44-
45-
// BoardList FIXMEDOC
46-
func (s *ArduinoCoreServerImpl) BoardList(ctx context.Context, req *rpc.BoardListReq) (*rpc.BoardListResp, error) {
47-
ports, err := board.List(req.GetInstance().GetId())
48-
if err != nil {
49-
return nil, err
50-
}
51-
52-
return &rpc.BoardListResp{
53-
Ports: ports,
54-
}, nil
55-
}
56-
57-
// BoardListAll FIXMEDOC
58-
func (s *ArduinoCoreServerImpl) BoardListAll(ctx context.Context, req *rpc.BoardListAllReq) (*rpc.BoardListAllResp, error) {
59-
return board.ListAll(ctx, req)
60-
}
61-
62-
// BoardAttach FIXMEDOC
63-
func (s *ArduinoCoreServerImpl) BoardAttach(req *rpc.BoardAttachReq, stream rpc.ArduinoCore_BoardAttachServer) error {
64-
65-
resp, err := board.Attach(stream.Context(), req,
66-
func(p *rpc.TaskProgress) { stream.Send(&rpc.BoardAttachResp{TaskProgress: p}) },
67-
)
68-
if err != nil {
69-
return err
70-
}
71-
return stream.Send(resp)
72-
}
73-
7439
// Destroy FIXMEDOC
7540
func (s *ArduinoCoreServerImpl) Destroy(ctx context.Context, req *rpc.DestroyReq) (*rpc.DestroyResp, error) {
7641
return commands.Destroy(ctx, req)

Diff for: ‎go.sum

+1
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
184184
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
185185
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg=
186186
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
187+
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A=
187188
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
188189
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
189190
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

0 commit comments

Comments
 (0)