Let instance commands require an *rpc.Instance

cmaglie · cmaglie · commit 8f65d3a6c8a4 · 2023-10-18T17:18:54.000+02:00
Removed the shorthand of the InstanceCommand interface.
This makes the API more coherent among the `commands` instance handling.
diff --git a/commands/board/details.go b/commands/board/details.go
@@ -28,7 +28,7 @@ import (
 // Details returns all details for a board including tools and HW identifiers.
 // This command basically gather al the information and translates it into the required grpc struct properties
 func Details(ctx context.Context, req *rpc.BoardDetailsRequest) (*rpc.BoardDetailsResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/board/list.go b/commands/board/list.go
@@ -203,7 +203,7 @@ func identify(pme *packagemanager.Explorer, port *discovery.Port) ([]*rpc.BoardL
 // In case of errors partial results from discoveries that didn't fail
 // are returned.
 func List(req *rpc.BoardListRequest) (r []*rpc.DetectedPort, discoveryStartErrors []error, e error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, nil, &arduino.InvalidInstanceError{}
 	}
@@ -258,7 +258,7 @@ func hasMatchingBoard(b *rpc.DetectedPort, fqbnFilter *cores.FQBN) bool {
 
 // Watch returns a channel that receives boards connection and disconnection events.
 func Watch(ctx context.Context, req *rpc.BoardListWatchRequest) (<-chan *rpc.BoardListWatchResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/board/listall.go b/commands/board/listall.go
@@ -29,7 +29,7 @@ import (
 
 // ListAll FIXMEDOC
 func ListAll(ctx context.Context, req *rpc.BoardListAllRequest) (*rpc.BoardListAllResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/board/search.go b/commands/board/search.go
@@ -31,7 +31,7 @@ import (
 // installed. Note that platforms that are not installed don't include boards' FQBNs.
 // If no search argument is used all boards are returned.
 func Search(ctx context.Context, req *rpc.BoardSearchRequest) (*rpc.BoardSearchResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
@@ -57,13 +57,13 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 		exportBinaries = reqExportBinaries.Value
 	}
 
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
 	defer release()
 
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	if lm == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/core/download.go b/commands/core/download.go
@@ -29,7 +29,7 @@ var tr = i18n.Tr
 
 // PlatformDownload FIXMEDOC
 func PlatformDownload(ctx context.Context, req *rpc.PlatformDownloadRequest, downloadCB rpc.DownloadProgressCB) (*rpc.PlatformDownloadResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/core/install.go b/commands/core/install.go
@@ -28,7 +28,7 @@ import (
 // PlatformInstall FIXMEDOC
 func PlatformInstall(ctx context.Context, req *rpc.PlatformInstallRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) (*rpc.PlatformInstallResponse, error) {
 	install := func() error {
-		pme, release := commands.GetPackageManagerExplorer(req)
+		pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 		if pme == nil {
 			return &arduino.InvalidInstanceError{}
 		}
diff --git a/commands/core/list.go b/commands/core/list.go
@@ -28,7 +28,7 @@ import (
 // PlatformList returns a list of installed platforms, optionally filtered by
 // those requiring an update.
 func PlatformList(req *rpc.PlatformListRequest) (*rpc.PlatformListResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/core/search.go b/commands/core/search.go
@@ -29,7 +29,7 @@ import (
 
 // PlatformSearch FIXMEDOC
 func PlatformSearch(req *rpc.PlatformSearchRequest) (*rpc.PlatformSearchResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/core/uninstall.go b/commands/core/uninstall.go
@@ -37,7 +37,7 @@ func PlatformUninstall(ctx context.Context, req *rpc.PlatformUninstallRequest, t
 
 // platformUninstall is the implementation of platform unistaller
 func platformUninstall(ctx context.Context, req *rpc.PlatformUninstallRequest, taskCB rpc.TaskProgressCB) error {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/core/upgrade.go b/commands/core/upgrade.go
@@ -29,7 +29,7 @@ import (
 // PlatformUpgrade FIXMEDOC
 func PlatformUpgrade(ctx context.Context, req *rpc.PlatformUpgradeRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) (*rpc.PlatformUpgradeResponse, error) {
 	upgrade := func() (*cores.PlatformRelease, error) {
-		pme, release := commands.GetPackageManagerExplorer(req)
+		pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 		if pme == nil {
 			return nil, &arduino.InvalidInstanceError{}
 		}
diff --git a/commands/debug/debug.go b/commands/debug/debug.go
@@ -45,7 +45,7 @@ var tr = i18n.Tr
 func Debug(ctx context.Context, req *rpc.GetDebugConfigRequest, inStream io.Reader, out io.Writer, interrupt <-chan os.Signal) (*rpc.DebugResponse, error) {
 
 	// Get debugging command line to run debugger
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/debug/debug_info.go b/commands/debug/debug_info.go
@@ -35,7 +35,7 @@ import (
 
 // GetDebugConfig returns metadata to start debugging with the specified board
 func GetDebugConfig(ctx context.Context, req *rpc.GetDebugConfigRequest) (*rpc.GetDebugConfigResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/instances.go b/commands/instances.go
@@ -102,8 +102,8 @@ func (c *coreInstancesContainer) RemoveID(id int32) bool {
 // GetPackageManager returns a PackageManager. If the package manager is not found
 // (because the instance is invalid or has been destroyed), nil is returned.
 // Deprecated: use GetPackageManagerExplorer instead.
-func GetPackageManager(instance rpc.InstanceCommand) *packagemanager.PackageManager {
-	i := instances.GetInstance(instance.GetInstance().GetId())
+func GetPackageManager(instance *rpc.Instance) *packagemanager.PackageManager {
+	i := instances.GetInstance(instance.GetId())
 	if i == nil {
 		return nil
 	}
@@ -113,7 +113,7 @@ func GetPackageManager(instance rpc.InstanceCommand) *packagemanager.PackageMana
 // GetPackageManagerExplorer returns a new package manager Explorer. The
 // explorer holds a read lock on the underlying PackageManager and it should
 // be released by calling the returned "release" function.
-func GetPackageManagerExplorer(req rpc.InstanceCommand) (explorer *packagemanager.Explorer, release func()) {
+func GetPackageManagerExplorer(req *rpc.Instance) (explorer *packagemanager.Explorer, release func()) {
 	pm := GetPackageManager(req)
 	if pm == nil {
 		return nil, nil
@@ -122,8 +122,8 @@ func GetPackageManagerExplorer(req rpc.InstanceCommand) (explorer *packagemanage
 }
 
 // GetLibraryManager returns the library manager for the given instance.
-func GetLibraryManager(req rpc.InstanceCommand) *librariesmanager.LibrariesManager {
-	i := instances.GetInstance(req.GetInstance().GetId())
+func GetLibraryManager(req *rpc.Instance) *librariesmanager.LibrariesManager {
+	i := instances.GetInstance(req.GetId())
 	if i == nil {
 		return nil
 	}
@@ -494,7 +494,7 @@ func Destroy(ctx context.Context, req *rpc.DestroyRequest) (*rpc.DestroyResponse
 // UpdateLibrariesIndex updates the library_index.json
 func UpdateLibrariesIndex(ctx context.Context, req *rpc.UpdateLibrariesIndexRequest, downloadCB rpc.DownloadProgressCB) error {
 	logrus.Info("Updating libraries index")
-	lm := GetLibraryManager(req)
+	lm := GetLibraryManager(req.GetInstance())
 	if lm == nil {
 		return &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/lib/download.go b/commands/lib/download.go
@@ -35,7 +35,7 @@ var tr = i18n.Tr
 func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadRequest, downloadCB rpc.DownloadProgressCB) (*rpc.LibraryDownloadResponse, error) {
 	logrus.Info("Executing `arduino-cli lib download`")
 
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	if lm == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/lib/install.go b/commands/lib/install.go
@@ -32,7 +32,7 @@ import (
 
 // LibraryInstall resolves the library dependencies, then downloads and installs the libraries into the install location.
 func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	if lm == nil {
 		return &arduino.InvalidInstanceError{}
 	}
@@ -143,7 +143,7 @@ func installLibrary(lm *librariesmanager.LibrariesManager, libRelease *libraries
 
 // ZipLibraryInstall FIXMEDOC
 func ZipLibraryInstall(ctx context.Context, req *rpc.ZipLibraryInstallRequest, taskCB rpc.TaskProgressCB) error {
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	if err := lm.InstallZipLib(ctx, paths.New(req.Path), req.Overwrite); err != nil {
 		return &arduino.FailedLibraryInstallError{Cause: err}
 	}
@@ -153,7 +153,7 @@ func ZipLibraryInstall(ctx context.Context, req *rpc.ZipLibraryInstallRequest, t
 
 // GitLibraryInstall FIXMEDOC
 func GitLibraryInstall(ctx context.Context, req *rpc.GitLibraryInstallRequest, taskCB rpc.TaskProgressCB) error {
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	if err := lm.InstallGitLib(req.Url, req.Overwrite); err != nil {
 		return &arduino.FailedLibraryInstallError{Cause: err}
 	}
diff --git a/commands/lib/list.go b/commands/lib/list.go
@@ -36,13 +36,13 @@ type installedLib struct {
 
 // LibraryList FIXMEDOC
 func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.LibraryListResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
 	defer release()
 
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	if lm == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/lib/resolve_deps.go b/commands/lib/resolve_deps.go
@@ -28,7 +28,7 @@ import (
 
 // LibraryResolveDependencies FIXMEDOC
 func LibraryResolveDependencies(ctx context.Context, req *rpc.LibraryResolveDependenciesRequest) (*rpc.LibraryResolveDependenciesResponse, error) {
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	if lm == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/lib/search.go b/commands/lib/search.go
@@ -31,7 +31,7 @@ import (
 
 // LibrarySearch FIXMEDOC
 func LibrarySearch(ctx context.Context, req *rpc.LibrarySearchRequest) (*rpc.LibrarySearchResponse, error) {
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	if lm == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/lib/uninstall.go b/commands/lib/uninstall.go
@@ -27,7 +27,7 @@ import (
 
 // LibraryUninstall FIXMEDOC
 func LibraryUninstall(ctx context.Context, req *rpc.LibraryUninstallRequest, taskCB rpc.TaskProgressCB) error {
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	ref, err := createLibIndexReference(lm, req)
 	if err != nil {
 		return &arduino.InvalidLibraryError{Cause: err}
diff --git a/commands/lib/upgrade.go b/commands/lib/upgrade.go
@@ -25,7 +25,7 @@ import (
 
 // LibraryUpgradeAll upgrades all the available libraries
 func LibraryUpgradeAll(req *rpc.LibraryUpgradeAllRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	if lm == nil {
 		return &arduino.InvalidInstanceError{}
 	}
@@ -43,7 +43,7 @@ func LibraryUpgradeAll(req *rpc.LibraryUpgradeAllRequest, downloadCB rpc.Downloa
 
 // LibraryUpgrade upgrades a library
 func LibraryUpgrade(ctx context.Context, req *rpc.LibraryUpgradeRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {
-	lm := commands.GetLibraryManager(req)
+	lm := commands.GetLibraryManager(req.GetInstance())
 	if lm == nil {
 		return &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/monitor/monitor.go b/commands/monitor/monitor.go
@@ -61,7 +61,7 @@ func (p *PortProxy) Close() error {
 // Monitor opens a communication port. It returns a PortProxy to communicate with the port and a PortDescriptor
 // that describes the available configuration settings.
 func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggableMonitor.PortDescriptor, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/monitor/settings.go b/commands/monitor/settings.go
@@ -26,7 +26,7 @@ import (
 
 // EnumerateMonitorPortSettings returns a description of the configuration settings of a monitor port
 func EnumerateMonitorPortSettings(ctx context.Context, req *rpc.EnumerateMonitorPortSettingsRequest) (*rpc.EnumerateMonitorPortSettingsResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/upload/burnbootloader.go b/commands/upload/burnbootloader.go
@@ -33,7 +33,7 @@ func BurnBootloader(ctx context.Context, req *rpc.BurnBootloaderRequest, outStre
 		WithField("programmer", req.GetProgrammer()).
 		Trace("BurnBootloader started", req.GetFqbn())
 
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/upload/programmers_list.go b/commands/upload/programmers_list.go
@@ -26,7 +26,7 @@ import (
 
 // ListProgrammersAvailableForUpload FIXMEDOC
 func ListProgrammersAvailableForUpload(ctx context.Context, req *rpc.ListProgrammersAvailableForUploadRequest) (*rpc.ListProgrammersAvailableForUploadResponse, error) {
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/upload/upload.go b/commands/upload/upload.go
@@ -50,7 +50,7 @@ func SupportedUserFields(ctx context.Context, req *rpc.SupportedUserFieldsReques
 		return nil, &arduino.MissingPortProtocolError{}
 	}
 
-	pme, release := commands.GetPackageManagerExplorer(req)
+	pme, release := commands.GetPackageManagerExplorer(req.GetInstance())
 	defer release()
 
 	if pme == nil {
@@ -137,7 +137,7 @@ func Upload(ctx context.Context, req *rpc.UploadRequest, outStream io.Writer, er
 		return nil, &arduino.CantOpenSketchError{Cause: err}
 	}
 
-	pme, pmeRelease := commands.GetPackageManagerExplorer(req)
+	pme, pmeRelease := commands.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/internal/cli/arguments/completion.go b/internal/cli/arguments/completion.go
@@ -52,7 +52,7 @@ func GetInstalledProtocols() []string {
 	inst := instance.CreateAndInit()
 
 	// FIXME: We must not access PackageManager directly here but use one of the commands.* functions
-	pme, release := commands.GetPackageManagerExplorer(&rpc.BoardListAllRequest{Instance: inst})
+	pme, release := commands.GetPackageManagerExplorer(inst)
 	if pme == nil {
 		return nil // should never happen...
 	}
@@ -95,7 +95,7 @@ func GetInstalledProgrammers() []string {
 	list, _ := board.ListAll(context.Background(), listAllReq)
 
 	// FIXME: We must not access PackageManager directly here but use one of the commands.* functions
-	pme, release := commands.GetPackageManagerExplorer(listAllReq)
+	pme, release := commands.GetPackageManagerExplorer(inst)
 	if pme == nil {
 		return nil // should never happen...
 	}
diff --git a/internal/cli/arguments/port.go b/internal/cli/arguments/port.go
@@ -89,7 +89,7 @@ func (p *Port) GetPort(instance *rpc.Instance, defaultAddress, defaultProtocol s
 	logrus.WithField("port", address).Tracef("Upload port")
 
 	// FIXME: We must not access PackageManager directly here but use one of the commands.* functions
-	pme, release := commands.GetPackageManagerExplorer(&rpc.BoardListAllRequest{Instance: instance})
+	pme, release := commands.GetPackageManagerExplorer(instance)
 	if pme == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/rpc/cc/arduino/cli/commands/v1/common.go b/rpc/cc/arduino/cli/commands/v1/common.go
@@ -56,9 +56,3 @@ func (d DownloadProgressCB) End(success bool, message string) {
 
 // TaskProgressCB is a callback to receive progress messages
 type TaskProgressCB func(msg *TaskProgress)
-
-// InstanceCommand is an interface that represents a gRPC command with
-// a gRPC Instance.
-type InstanceCommand interface {
-	GetInstance() *Instance
-}

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`// Details returns all details for a board including tools and HW identifiers.`
`29`	`29`	`// This command basically gather al the information and translates it into the required grpc struct properties`
`30`	`30`	`func Details(ctx context.Context, req rpc.BoardDetailsRequest) (rpc.BoardDetailsResponse, error) {`
`31`		`- pme, release := commands.GetPackageManagerExplorer(req)`
	`31`	`+ pme, release := commands.GetPackageManagerExplorer(req.GetInstance())`
`32`	`32`	`if pme == nil {`
`33`	`33`	`return nil, &arduino.InvalidInstanceError{}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`
`30`	`30`	`// ListAll FIXMEDOC`
`31`	`31`	`func ListAll(ctx context.Context, req rpc.BoardListAllRequest) (rpc.BoardListAllResponse, error) {`
`32`		`- pme, release := commands.GetPackageManagerExplorer(req)`
	`32`	`+ pme, release := commands.GetPackageManagerExplorer(req.GetInstance())`
`33`	`33`	`if pme == nil {`
`34`	`34`	`return nil, &arduino.InvalidInstanceError{}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`// installed. Note that platforms that are not installed don't include boards' FQBNs.`
`32`	`32`	`// If no search argument is used all boards are returned.`
`33`	`33`	`func Search(ctx context.Context, req rpc.BoardSearchRequest) (rpc.BoardSearchResponse, error) {`
`34`		`- pme, release := commands.GetPackageManagerExplorer(req)`
	`34`	`+ pme, release := commands.GetPackageManagerExplorer(req.GetInstance())`
`35`	`35`	`if pme == nil {`
`36`	`36`	`return nil, &arduino.InvalidInstanceError{}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,13 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream`
`57`	`57`	`exportBinaries = reqExportBinaries.Value`
`58`	`58`	`}`
`59`	`59`
`60`		`- pme, release := commands.GetPackageManagerExplorer(req)`
	`60`	`+ pme, release := commands.GetPackageManagerExplorer(req.GetInstance())`
`61`	`61`	`if pme == nil {`
`62`	`62`	`return nil, &arduino.InvalidInstanceError{}`
`63`	`63`	`}`
`64`	`64`	`defer release()`
`65`	`65`
`66`		`- lm := commands.GetLibraryManager(req)`
	`66`	`+ lm := commands.GetLibraryManager(req.GetInstance())`
`67`	`67`	`if lm == nil {`
`68`	`68`	`return nil, &arduino.InvalidInstanceError{}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ var tr = i18n.Tr`
`29`	`29`
`30`	`30`	`// PlatformDownload FIXMEDOC`
`31`	`31`	`func PlatformDownload(ctx context.Context, req rpc.PlatformDownloadRequest, downloadCB rpc.DownloadProgressCB) (rpc.PlatformDownloadResponse, error) {`
`32`		`- pme, release := commands.GetPackageManagerExplorer(req)`
	`32`	`+ pme, release := commands.GetPackageManagerExplorer(req.GetInstance())`
`33`	`33`	`if pme == nil {`
`34`	`34`	`return nil, &arduino.InvalidInstanceError{}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func PlatformUninstall(ctx context.Context, req *rpc.PlatformUninstallRequest, t`
`37`	`37`
`38`	`38`	`// platformUninstall is the implementation of platform unistaller`
`39`	`39`	`func platformUninstall(ctx context.Context, req *rpc.PlatformUninstallRequest, taskCB rpc.TaskProgressCB) error {`
`40`		`- pme, release := commands.GetPackageManagerExplorer(req)`
	`40`	`+ pme, release := commands.GetPackageManagerExplorer(req.GetInstance())`
`41`	`41`	`if pme == nil {`
`42`	`42`	`return &arduino.InvalidInstanceError{}`
`43`	`43`	`}`