remove go.rice and use go:embed

Author: umbynos

cli/globals/globals.go

@@ -18,10 +18,17 @@
 
 package globals
 
-import "github.com/arduino/go-paths-helper"
+import (
+	"embed"
+
+	"github.com/arduino/go-paths-helper"
+)
 
 var (
 	PackageIndexGZURL        = "https://downloads.arduino.cc/packages/package_index.json.gz"
 	ModuleFirmwareIndexGZURL = "https://downloads.arduino.cc/arduino-fwuploader/boards/module_firmware_index.json.gz"
 	FwUploaderPath           = paths.TempDir().Join("fwuploader")
 )
+
+//go:embed keys/*
+var Keys embed.FS

…eys/module_firmware_index_public.gpg.key …eys/module_firmware_index_public.gpg.keyindexes/download/gpg_keys/module_firmware_index_public.gpg.key renamed to cli/globals/keys/module_firmware_index_public.gpg.key indexes/download/gpg_keys/module_firmware_index_public.gpg.key renamed to cli/globals/keys/module_firmware_index_public.gpg.key

@@ -6,7 +6,6 @@ require (
 	github.com/arduino/arduino-cli v0.0.0-20210603144340-aef5a54882fa
 	github.com/arduino/go-paths-helper v1.6.0
 	github.com/arduino/go-properties-orderedmap v1.3.0
-	github.com/cmaglie/go.rice v1.0.3
 	github.com/mattn/go-colorable v0.1.8
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
 	github.com/sirupsen/logrus v1.8.1
@@ -18,6 +17,7 @@ require (
 )
 
 require (
+	github.com/cmaglie/go.rice v1.0.3 // indirect
 	github.com/codeclysm/extract/v3 v3.0.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/creack/goselect v0.1.2 // indirect

go.mod

@@ -38,7 +38,6 @@ import (
 	"github.com/arduino/arduino-fwuploader/cli/globals"
 	"github.com/arduino/arduino-fwuploader/indexes/firmwareindex"
 	"github.com/arduino/go-paths-helper"
-	rice "github.com/cmaglie/go.rice"
 	"github.com/sirupsen/logrus"
 	"go.bug.st/downloader/v2"
 )
@@ -316,15 +315,12 @@ func verifyPackageIndex(indexPath, signaturePath *paths.Path) (bool, error) {
 
 // verifyModuleFirmwareIndex verify if the signature is valid for the provided module firmware index
 func verifyModuleFirmwareIndex(indexPath, signaturePath *paths.Path) (bool, error) {
-	keysBox, err := rice.FindBox("gpg_keys")
+	arduinoKeyringFile, err := globals.Keys.Open("keys/module_firmware_index_public.gpg.key")
 	if err != nil {
 		return false, fmt.Errorf("could not find bundled signature keys: %s", err)
 	}
-	key, err := keysBox.Open("module_firmware_index_public.gpg.key")
-	if err != nil {
-		return false, fmt.Errorf("could not find bundled signature keys: %s", err)
-	}
-	valid, _, err := security.VerifySignature(indexPath, signaturePath, key)
+	defer arduinoKeyringFile.Close()
+	valid, _, err := security.VerifySignature(indexPath, signaturePath, arduinoKeyringFile)
 	if err != nil {
 		return valid, nil
 	}

indexes/download/download.go

@@ -20,11 +20,12 @@ package firmwareindex
 
 import (
 	"encoding/json"
+	"fmt"
 	"runtime"
 
 	"github.com/arduino/arduino-cli/arduino/security"
+	"github.com/arduino/arduino-fwuploader/cli/globals"
 	"github.com/arduino/go-paths-helper"
-	rice "github.com/cmaglie/go.rice"
 	"github.com/sirupsen/logrus"
 	semver "go.bug.st/relaxed-semver"
 )
@@ -81,15 +82,13 @@ func LoadIndex(jsonIndexFile *paths.Path) (*Index, error) {
 	}
 
 	jsonSignatureFile := jsonIndexFile.Parent().Join(jsonIndexFile.Base() + ".sig")
-	keysBox, err := rice.FindBox("gpg_keys")
+	arduinoKeyringFile, err := globals.Keys.Open("keys/module_firmware_index_public.gpg.key")
 	if err != nil {
-		return nil, err
-	}
-	key, err := keysBox.Open("module_firmware_index_public.gpg.key")
-	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("could not find bundled signature keys: %s", err)
+
 	}
-	trusted, _, err := security.VerifySignature(jsonIndexFile, jsonSignatureFile, key)
+	defer arduinoKeyringFile.Close()
+	trusted, _, err := security.VerifySignature(jsonIndexFile, jsonSignatureFile, arduinoKeyringFile)
 	if err != nil {
 		logrus.
 			WithField("index", jsonIndexFile).