Skip to content

Commit 9bd20a3

Browse files
committed
Fixed SERVICE_SUFFIX lint warning
1 parent 5ad5808 commit 9bd20a3

File tree

13 files changed

+993
-997
lines changed

13 files changed

+993
-997
lines changed

cli/daemon/daemon.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,18 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {
7272
configuration.Settings.Set("network.user_agent_ext", "daemon")
7373

7474
// register the commands service
75-
srv_commands.RegisterArduinoCoreServer(s, &daemon.ArduinoCoreServerImpl{
75+
srv_commands.RegisterArduinoCoreServiceServer(s, &daemon.ArduinoCoreServerImpl{
7676
VersionString: globals.VersionInfo.VersionString,
7777
})
7878

7979
// Register the monitors service
80-
srv_monitor.RegisterMonitorServer(s, &daemon.MonitorService{})
80+
srv_monitor.RegisterMonitorServiceServer(s, &daemon.MonitorService{})
8181

8282
// Register the settings service
83-
srv_settings.RegisterSettingsServer(s, &daemon.SettingsService{})
83+
srv_settings.RegisterSettingsServiceServer(s, &daemon.SettingsService{})
8484

8585
// Register the debug session service
86-
srv_debug.RegisterDebugServer(s, &daemon.DebugService{})
86+
srv_debug.RegisterDebugServiceServer(s, &daemon.DebugService{})
8787

8888
if !daemonize {
8989
// When parent process ends terminate also the daemon

commands/daemon/daemon.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (s *ArduinoCoreServerImpl) BoardSearch(ctx context.Context, req *rpc.BoardS
6565
}
6666

6767
// BoardListWatch FIXMEDOC
68-
func (s *ArduinoCoreServerImpl) BoardListWatch(stream rpc.ArduinoCore_BoardListWatchServer) error {
68+
func (s *ArduinoCoreServerImpl) BoardListWatch(stream rpc.ArduinoCoreService_BoardListWatchServer) error {
6969
msg, err := stream.Recv()
7070
if err == io.EOF {
7171
return nil
@@ -98,7 +98,7 @@ func (s *ArduinoCoreServerImpl) BoardListWatch(stream rpc.ArduinoCore_BoardListW
9898
}
9999

100100
// BoardAttach FIXMEDOC
101-
func (s *ArduinoCoreServerImpl) BoardAttach(req *rpc.BoardAttachReq, stream rpc.ArduinoCore_BoardAttachServer) error {
101+
func (s *ArduinoCoreServerImpl) BoardAttach(req *rpc.BoardAttachReq, stream rpc.ArduinoCoreService_BoardAttachServer) error {
102102

103103
resp, err := board.Attach(stream.Context(), req,
104104
func(p *rpc.TaskProgress) { stream.Send(&rpc.BoardAttachResp{TaskProgress: p}) },
@@ -120,7 +120,7 @@ func (s *ArduinoCoreServerImpl) Rescan(ctx context.Context, req *rpc.RescanReq)
120120
}
121121

122122
// UpdateIndex FIXMEDOC
123-
func (s *ArduinoCoreServerImpl) UpdateIndex(req *rpc.UpdateIndexReq, stream rpc.ArduinoCore_UpdateIndexServer) error {
123+
func (s *ArduinoCoreServerImpl) UpdateIndex(req *rpc.UpdateIndexReq, stream rpc.ArduinoCoreService_UpdateIndexServer) error {
124124
resp, err := commands.UpdateIndex(stream.Context(), req,
125125
func(p *rpc.DownloadProgress) { stream.Send(&rpc.UpdateIndexResp{DownloadProgress: p}) },
126126
)
@@ -131,7 +131,7 @@ func (s *ArduinoCoreServerImpl) UpdateIndex(req *rpc.UpdateIndexReq, stream rpc.
131131
}
132132

133133
// UpdateLibrariesIndex FIXMEDOC
134-
func (s *ArduinoCoreServerImpl) UpdateLibrariesIndex(req *rpc.UpdateLibrariesIndexReq, stream rpc.ArduinoCore_UpdateLibrariesIndexServer) error {
134+
func (s *ArduinoCoreServerImpl) UpdateLibrariesIndex(req *rpc.UpdateLibrariesIndexReq, stream rpc.ArduinoCoreService_UpdateLibrariesIndexServer) error {
135135
err := commands.UpdateLibrariesIndex(stream.Context(), req,
136136
func(p *rpc.DownloadProgress) { stream.Send(&rpc.UpdateLibrariesIndexResp{DownloadProgress: p}) },
137137
)
@@ -142,7 +142,7 @@ func (s *ArduinoCoreServerImpl) UpdateLibrariesIndex(req *rpc.UpdateLibrariesInd
142142
}
143143

144144
// UpdateCoreLibrariesIndex FIXMEDOC
145-
func (s *ArduinoCoreServerImpl) UpdateCoreLibrariesIndex(req *rpc.UpdateCoreLibrariesIndexReq, stream rpc.ArduinoCore_UpdateCoreLibrariesIndexServer) error {
145+
func (s *ArduinoCoreServerImpl) UpdateCoreLibrariesIndex(req *rpc.UpdateCoreLibrariesIndexReq, stream rpc.ArduinoCoreService_UpdateCoreLibrariesIndexServer) error {
146146
err := commands.UpdateCoreLibrariesIndex(stream.Context(), req,
147147
func(p *rpc.DownloadProgress) { stream.Send(&rpc.UpdateCoreLibrariesIndexResp{DownloadProgress: p}) },
148148
)
@@ -158,7 +158,7 @@ func (s *ArduinoCoreServerImpl) Outdated(ctx context.Context, req *rpc.OutdatedR
158158
}
159159

160160
// Upgrade FIXMEDOC
161-
func (s *ArduinoCoreServerImpl) Upgrade(req *rpc.UpgradeReq, stream rpc.ArduinoCore_UpgradeServer) error {
161+
func (s *ArduinoCoreServerImpl) Upgrade(req *rpc.UpgradeReq, stream rpc.ArduinoCoreService_UpgradeServer) error {
162162
err := commands.Upgrade(stream.Context(), req,
163163
func(p *rpc.DownloadProgress) {
164164
stream.Send(&rpc.UpgradeResp{
@@ -178,7 +178,7 @@ func (s *ArduinoCoreServerImpl) Upgrade(req *rpc.UpgradeReq, stream rpc.ArduinoC
178178
}
179179

180180
// Init FIXMEDOC
181-
func (s *ArduinoCoreServerImpl) Init(req *rpc.InitReq, stream rpc.ArduinoCore_InitServer) error {
181+
func (s *ArduinoCoreServerImpl) Init(req *rpc.InitReq, stream rpc.ArduinoCoreService_InitServer) error {
182182
resp, err := commands.Init(stream.Context(), req,
183183
func(p *rpc.DownloadProgress) { stream.Send(&rpc.InitResp{DownloadProgress: p}) },
184184
func(p *rpc.TaskProgress) { stream.Send(&rpc.InitResp{TaskProgress: p}) },
@@ -200,7 +200,7 @@ func (s *ArduinoCoreServerImpl) LoadSketch(ctx context.Context, req *rpc.LoadSke
200200
}
201201

202202
// Compile FIXMEDOC
203-
func (s *ArduinoCoreServerImpl) Compile(req *rpc.CompileReq, stream rpc.ArduinoCore_CompileServer) error {
203+
func (s *ArduinoCoreServerImpl) Compile(req *rpc.CompileReq, stream rpc.ArduinoCoreService_CompileServer) error {
204204
resp, err := compile.Compile(
205205
stream.Context(), req,
206206
utils.FeedStreamTo(func(data []byte) { stream.Send(&rpc.CompileResp{OutStream: data}) }),
@@ -213,7 +213,7 @@ func (s *ArduinoCoreServerImpl) Compile(req *rpc.CompileReq, stream rpc.ArduinoC
213213
}
214214

215215
// PlatformInstall FIXMEDOC
216-
func (s *ArduinoCoreServerImpl) PlatformInstall(req *rpc.PlatformInstallReq, stream rpc.ArduinoCore_PlatformInstallServer) error {
216+
func (s *ArduinoCoreServerImpl) PlatformInstall(req *rpc.PlatformInstallReq, stream rpc.ArduinoCoreService_PlatformInstallServer) error {
217217
resp, err := core.PlatformInstall(
218218
stream.Context(), req,
219219
func(p *rpc.DownloadProgress) { stream.Send(&rpc.PlatformInstallResp{Progress: p}) },
@@ -226,7 +226,7 @@ func (s *ArduinoCoreServerImpl) PlatformInstall(req *rpc.PlatformInstallReq, str
226226
}
227227

228228
// PlatformDownload FIXMEDOC
229-
func (s *ArduinoCoreServerImpl) PlatformDownload(req *rpc.PlatformDownloadReq, stream rpc.ArduinoCore_PlatformDownloadServer) error {
229+
func (s *ArduinoCoreServerImpl) PlatformDownload(req *rpc.PlatformDownloadReq, stream rpc.ArduinoCoreService_PlatformDownloadServer) error {
230230
resp, err := core.PlatformDownload(
231231
stream.Context(), req,
232232
func(p *rpc.DownloadProgress) { stream.Send(&rpc.PlatformDownloadResp{Progress: p}) },
@@ -238,7 +238,7 @@ func (s *ArduinoCoreServerImpl) PlatformDownload(req *rpc.PlatformDownloadReq, s
238238
}
239239

240240
// PlatformUninstall FIXMEDOC
241-
func (s *ArduinoCoreServerImpl) PlatformUninstall(req *rpc.PlatformUninstallReq, stream rpc.ArduinoCore_PlatformUninstallServer) error {
241+
func (s *ArduinoCoreServerImpl) PlatformUninstall(req *rpc.PlatformUninstallReq, stream rpc.ArduinoCoreService_PlatformUninstallServer) error {
242242
resp, err := core.PlatformUninstall(
243243
stream.Context(), req,
244244
func(p *rpc.TaskProgress) { stream.Send(&rpc.PlatformUninstallResp{TaskProgress: p}) },
@@ -250,7 +250,7 @@ func (s *ArduinoCoreServerImpl) PlatformUninstall(req *rpc.PlatformUninstallReq,
250250
}
251251

252252
// PlatformUpgrade FIXMEDOC
253-
func (s *ArduinoCoreServerImpl) PlatformUpgrade(req *rpc.PlatformUpgradeReq, stream rpc.ArduinoCore_PlatformUpgradeServer) error {
253+
func (s *ArduinoCoreServerImpl) PlatformUpgrade(req *rpc.PlatformUpgradeReq, stream rpc.ArduinoCoreService_PlatformUpgradeServer) error {
254254
resp, err := core.PlatformUpgrade(
255255
stream.Context(), req,
256256
func(p *rpc.DownloadProgress) { stream.Send(&rpc.PlatformUpgradeResp{Progress: p}) },
@@ -277,7 +277,7 @@ func (s *ArduinoCoreServerImpl) PlatformList(ctx context.Context, req *rpc.Platf
277277
}
278278

279279
// Upload FIXMEDOC
280-
func (s *ArduinoCoreServerImpl) Upload(req *rpc.UploadReq, stream rpc.ArduinoCore_UploadServer) error {
280+
func (s *ArduinoCoreServerImpl) Upload(req *rpc.UploadReq, stream rpc.ArduinoCoreService_UploadServer) error {
281281
resp, err := upload.Upload(
282282
stream.Context(), req,
283283
utils.FeedStreamTo(func(data []byte) { stream.Send(&rpc.UploadResp{OutStream: data}) }),
@@ -290,7 +290,7 @@ func (s *ArduinoCoreServerImpl) Upload(req *rpc.UploadReq, stream rpc.ArduinoCor
290290
}
291291

292292
// UploadUsingProgrammer FIXMEDOC
293-
func (s *ArduinoCoreServerImpl) UploadUsingProgrammer(req *rpc.UploadUsingProgrammerReq, stream rpc.ArduinoCore_UploadUsingProgrammerServer) error {
293+
func (s *ArduinoCoreServerImpl) UploadUsingProgrammer(req *rpc.UploadUsingProgrammerReq, stream rpc.ArduinoCoreService_UploadUsingProgrammerServer) error {
294294
resp, err := upload.UsingProgrammer(
295295
stream.Context(), req,
296296
utils.FeedStreamTo(func(data []byte) { stream.Send(&rpc.UploadUsingProgrammerResp{OutStream: data}) }),
@@ -303,7 +303,7 @@ func (s *ArduinoCoreServerImpl) UploadUsingProgrammer(req *rpc.UploadUsingProgra
303303
}
304304

305305
// BurnBootloader FIXMEDOC
306-
func (s *ArduinoCoreServerImpl) BurnBootloader(req *rpc.BurnBootloaderReq, stream rpc.ArduinoCore_BurnBootloaderServer) error {
306+
func (s *ArduinoCoreServerImpl) BurnBootloader(req *rpc.BurnBootloaderReq, stream rpc.ArduinoCoreService_BurnBootloaderServer) error {
307307
resp, err := upload.BurnBootloader(
308308
stream.Context(), req,
309309
utils.FeedStreamTo(func(data []byte) { stream.Send(&rpc.BurnBootloaderResp{OutStream: data}) }),
@@ -321,7 +321,7 @@ func (s *ArduinoCoreServerImpl) ListProgrammersAvailableForUpload(ctx context.Co
321321
}
322322

323323
// LibraryDownload FIXMEDOC
324-
func (s *ArduinoCoreServerImpl) LibraryDownload(req *rpc.LibraryDownloadReq, stream rpc.ArduinoCore_LibraryDownloadServer) error {
324+
func (s *ArduinoCoreServerImpl) LibraryDownload(req *rpc.LibraryDownloadReq, stream rpc.ArduinoCoreService_LibraryDownloadServer) error {
325325
resp, err := lib.LibraryDownload(
326326
stream.Context(), req,
327327
func(p *rpc.DownloadProgress) { stream.Send(&rpc.LibraryDownloadResp{Progress: p}) },
@@ -333,7 +333,7 @@ func (s *ArduinoCoreServerImpl) LibraryDownload(req *rpc.LibraryDownloadReq, str
333333
}
334334

335335
// LibraryInstall FIXMEDOC
336-
func (s *ArduinoCoreServerImpl) LibraryInstall(req *rpc.LibraryInstallReq, stream rpc.ArduinoCore_LibraryInstallServer) error {
336+
func (s *ArduinoCoreServerImpl) LibraryInstall(req *rpc.LibraryInstallReq, stream rpc.ArduinoCoreService_LibraryInstallServer) error {
337337
err := lib.LibraryInstall(
338338
stream.Context(), req,
339339
func(p *rpc.DownloadProgress) { stream.Send(&rpc.LibraryInstallResp{Progress: p}) },
@@ -346,7 +346,7 @@ func (s *ArduinoCoreServerImpl) LibraryInstall(req *rpc.LibraryInstallReq, strea
346346
}
347347

348348
// LibraryUninstall FIXMEDOC
349-
func (s *ArduinoCoreServerImpl) LibraryUninstall(req *rpc.LibraryUninstallReq, stream rpc.ArduinoCore_LibraryUninstallServer) error {
349+
func (s *ArduinoCoreServerImpl) LibraryUninstall(req *rpc.LibraryUninstallReq, stream rpc.ArduinoCoreService_LibraryUninstallServer) error {
350350
err := lib.LibraryUninstall(stream.Context(), req,
351351
func(p *rpc.TaskProgress) { stream.Send(&rpc.LibraryUninstallResp{TaskProgress: p}) },
352352
)
@@ -357,7 +357,7 @@ func (s *ArduinoCoreServerImpl) LibraryUninstall(req *rpc.LibraryUninstallReq, s
357357
}
358358

359359
// LibraryUpgradeAll FIXMEDOC
360-
func (s *ArduinoCoreServerImpl) LibraryUpgradeAll(req *rpc.LibraryUpgradeAllReq, stream rpc.ArduinoCore_LibraryUpgradeAllServer) error {
360+
func (s *ArduinoCoreServerImpl) LibraryUpgradeAll(req *rpc.LibraryUpgradeAllReq, stream rpc.ArduinoCoreService_LibraryUpgradeAllServer) error {
361361
err := lib.LibraryUpgradeAll(req.GetInstance().GetId(),
362362
func(p *rpc.DownloadProgress) { stream.Send(&rpc.LibraryUpgradeAllResp{Progress: p}) },
363363
func(p *rpc.TaskProgress) { stream.Send(&rpc.LibraryUpgradeAllResp{TaskProgress: p}) },
@@ -389,7 +389,7 @@ func (s *ArduinoCoreServerImpl) ArchiveSketch(ctx context.Context, req *rpc.Arch
389389
}
390390

391391
//ZipLibraryInstall FIXMEDOC
392-
func (s *ArduinoCoreServerImpl) ZipLibraryInstall(req *rpc.ZipLibraryInstallReq, stream rpc.ArduinoCore_ZipLibraryInstallServer) error {
392+
func (s *ArduinoCoreServerImpl) ZipLibraryInstall(req *rpc.ZipLibraryInstallReq, stream rpc.ArduinoCoreService_ZipLibraryInstallServer) error {
393393
err := lib.ZipLibraryInstall(
394394
stream.Context(), req,
395395
func(p *rpc.TaskProgress) { stream.Send(&rpc.ZipLibraryInstallResp{TaskProgress: p}) },
@@ -401,7 +401,7 @@ func (s *ArduinoCoreServerImpl) ZipLibraryInstall(req *rpc.ZipLibraryInstallReq,
401401
}
402402

403403
//GitLibraryInstall FIXMEDOC
404-
func (s *ArduinoCoreServerImpl) GitLibraryInstall(req *rpc.GitLibraryInstallReq, stream rpc.ArduinoCore_GitLibraryInstallServer) error {
404+
func (s *ArduinoCoreServerImpl) GitLibraryInstall(req *rpc.GitLibraryInstallReq, stream rpc.ArduinoCoreService_GitLibraryInstallServer) error {
405405
err := lib.GitLibraryInstall(
406406
stream.Context(), req,
407407
func(p *rpc.TaskProgress) { stream.Send(&rpc.GitLibraryInstallResp{TaskProgress: p}) },

commands/daemon/debug.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type DebugService struct{}
3232
// Debug returns a stream response that can be used to fetch data from the
3333
// target. The first message passed through the `Debug` request must
3434
// contain DebugReq configuration params, not data.
35-
func (s *DebugService) Debug(stream dbg.Debug_DebugServer) error {
35+
func (s *DebugService) Debug(stream dbg.DebugService_DebugServer) error {
3636

3737
// Grab the first message
3838
msg, err := stream.Recv()

commands/daemon/monitor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ type MonitorService struct{}
3030
// StreamingOpen returns a stream response that can be used to fetch data from the
3131
// monitor target. The first message passed through the `StreamingOpenReq` must
3232
// contain monitor configuration params, not data.
33-
func (s *MonitorService) StreamingOpen(stream rpc.Monitor_StreamingOpenServer) error {
33+
func (s *MonitorService) StreamingOpen(stream rpc.MonitorService_StreamingOpenServer) error {
3434
// grab the first message
3535
msg, err := stream.Recv()
3636
if err != nil {

rpc/buf.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,3 @@ lint:
5353
- debug/debug.proto
5454
- monitor/monitor.proto
5555
- settings/settings.proto
56-
SERVICE_SUFFIX:
57-
- commands/commands.proto
58-
- debug/debug.proto
59-
- monitor/monitor.proto
60-
- settings/settings.proto

0 commit comments

Comments
 (0)