Some static-check fixes

arduino/builder/sketch.go

@@ -162,7 +162,7 @@ func writeIfDifferent(source []byte, destPath *paths.Path) error {
 	}
 
 	// Overwrite if contents are different
-	if bytes.Compare(existingBytes, source) != 0 {
+	if !bytes.Equal(existingBytes, source) {
 		return destPath.WriteFile(source)
 	}
 

arduino/builder/sketch_test.go

@@ -131,5 +131,6 @@ func TestCopyAdditionalFiles(t *testing.T) {
 
 	// verify file hasn't changed
 	info2, err := s2.AdditionalFiles[0].Stat()
+	require.NoError(t, err)
 	require.Equal(t, info1.ModTime(), info2.ModTime())
 }

arduino/cores/board.go

@@ -118,7 +118,8 @@ func (b *Board) GetBuildProperties(userConfigs *properties.Map) (*properties.Map
 	}
 
 	// Check for residual invalid options...
-	for _, invalidOption := range userConfigs.Keys() {
+	if invalidKeys := userConfigs.Keys(); len(invalidKeys) > 0 {
+		invalidOption := invalidKeys[0]
 		if invalidOption == "" {
 			return nil, fmt.Errorf(tr("invalid empty option found"))
 		}

arduino/cores/packageindex/index.go

@@ -36,27 +36,27 @@ type Index struct {
 
 // indexPackage represents a single entry from package_index.json file.
 type indexPackage struct {
-	Name       string                  `json:"name,required"`
-	Maintainer string                  `json:"maintainer,required"`
+	Name       string                  `json:"name"`
+	Maintainer string                  `json:"maintainer"`
 	WebsiteURL string                  `json:"websiteUrl"`
 	URL        string                  `json:"Url"`
 	Email      string                  `json:"email"`
-	Platforms  []*indexPlatformRelease `json:"platforms,required"`
-	Tools      []*indexToolRelease     `json:"tools,required"`
+	Platforms  []*indexPlatformRelease `json:"platforms"`
+	Tools      []*indexToolRelease     `json:"tools"`
 	Help       indexHelp               `json:"help,omitempty"`
 }
 
 // indexPlatformRelease represents a single Core Platform from package_index.json file.
 type indexPlatformRelease struct {
-	Name                  string                     `json:"name,required"`
+	Name                  string                     `json:"name"`
 	Architecture          string                     `json:"architecture"`
-	Version               *semver.Version            `json:"version,required"`
+	Version               *semver.Version            `json:"version"`
 	Deprecated            bool                       `json:"deprecated"`
 	Category              string                     `json:"category"`
 	URL                   string                     `json:"url"`
-	ArchiveFileName       string                     `json:"archiveFileName,required"`
-	Checksum              string                     `json:"checksum,required"`
-	Size                  json.Number                `json:"size,required"`
+	ArchiveFileName       string                     `json:"archiveFileName"`
+	Checksum              string                     `json:"checksum"`
+	Size                  json.Number                `json:"size"`
 	Boards                []indexBoard               `json:"boards"`
 	Help                  indexHelp                  `json:"help,omitempty"`
 	ToolDependencies      []indexToolDependency      `json:"toolsDependencies"`
@@ -66,9 +66,9 @@ type indexPlatformRelease struct {
 
 // indexToolDependency represents a single dependency of a core from a tool.
 type indexToolDependency struct {
-	Packager string                 `json:"packager,required"`
-	Name     string                 `json:"name,required"`
-	Version  *semver.RelaxedVersion `json:"version,required"`
+	Packager string                 `json:"packager"`
+	Name     string                 `json:"name"`
+	Version  *semver.RelaxedVersion `json:"version"`
 }
 
 // indexDiscoveryDependency represents a single dependency of a core from a pluggable discovery tool.
@@ -85,18 +85,18 @@ type indexMonitorDependency struct {
 
 // indexToolRelease represents a single Tool from package_index.json file.
 type indexToolRelease struct {
-	Name    string                    `json:"name,required"`
-	Version *semver.RelaxedVersion    `json:"version,required"`
-	Systems []indexToolReleaseFlavour `json:"systems,required"`
+	Name    string                    `json:"name"`
+	Version *semver.RelaxedVersion    `json:"version"`
+	Systems []indexToolReleaseFlavour `json:"systems"`
 }
 
 // indexToolReleaseFlavour represents a single tool flavor in the package_index.json file.
 type indexToolReleaseFlavour struct {
-	OS              string      `json:"host,required"`
-	URL             string      `json:"url,required"`
-	ArchiveFileName string      `json:"archiveFileName,required"`
-	Size            json.Number `json:"size,required"`
-	Checksum        string      `json:"checksum,required"`
+	OS              string      `json:"host"`
+	URL             string      `json:"url"`
+	ArchiveFileName string      `json:"archiveFileName"`
+	Size            json.Number `json:"size"`
+	Checksum        string      `json:"checksum"`
 }
 
 // indexBoard represents a single Board as written in package_index.json file.

arduino/cores/packagemanager/package_manager.go

@@ -429,9 +429,7 @@ func (pm *PackageManager) InstalledPlatformReleases() []*cores.PlatformRelease {
 	platforms := []*cores.PlatformRelease{}
 	for _, targetPackage := range pm.Packages {
 		for _, platform := range targetPackage.Platforms {
-			for _, release := range platform.GetAllInstalled() {
-				platforms = append(platforms, release)
-			}
+			platforms = append(platforms, platform.GetAllInstalled()...)
 		}
 	}
 	return platforms

arduino/cores/status.go

@@ -187,27 +187,3 @@ func (targetPackage *Package) GetOrCreateTool(name string) *Tool {
 func (targetPackage *Package) String() string {
 	return targetPackage.Name
 }
-
-func (tdep ToolDependency) extractTool(sc Packages) (*Tool, error) {
-	pkg, exists := sc[tdep.ToolPackager]
-	if !exists {
-		return nil, errors.New(tr("package not found"))
-	}
-	tool, exists := pkg.Tools[tdep.ToolName]
-	if !exists {
-		return nil, errors.New(tr("tool not found"))
-	}
-	return tool, nil
-}
-
-func (tdep ToolDependency) extractRelease(sc Packages) (*ToolRelease, error) {
-	tool, err := tdep.extractTool(sc)
-	if err != nil {
-		return nil, err
-	}
-	release, exists := tool.Releases[tdep.ToolVersion.String()]
-	if !exists {
-		return nil, errors.New(tr("release not found"))
-	}
-	return release, nil
-}

arduino/cores/tools.go

@@ -27,22 +27,22 @@ import (
 
 // Tool represents a single Tool, part of a Package.
 type Tool struct {
-	Name     string                  `json:"name,required"` // The Name of the Tool.
-	Releases map[string]*ToolRelease `json:"releases"`      // Maps Version to Release.
+	Name     string                  `json:"name"`     // The Name of the Tool.
+	Releases map[string]*ToolRelease `json:"releases"` // Maps Version to Release.
 	Package  *Package                `json:"-"`
 }
 
 // ToolRelease represents a single release of a tool
 type ToolRelease struct {
-	Version    *semver.RelaxedVersion `json:"version,required"` // The version number of this Release.
-	Flavors    []*Flavor              `json:"systems"`          // Maps OS to Flavor
+	Version    *semver.RelaxedVersion `json:"version"` // The version number of this Release.
+	Flavors    []*Flavor              `json:"systems"` // Maps OS to Flavor
 	Tool       *Tool                  `json:"-"`
 	InstallDir *paths.Path            `json:"-"`
 }
 
 // Flavor represents a flavor of a Tool version.
 type Flavor struct {
-	OS       string `json:"os,required"` // The OS Supported by this flavor.
+	OS       string `json:"os"` // The OS Supported by this flavor.
 	Resource *resources.DownloadResource
 }
 

arduino/libraries/librariesindex/json.go

@@ -30,8 +30,8 @@ type indexJSON struct {
 }
 
 type indexRelease struct {
-	Name             string             `json:"name,required"`
-	Version          *semver.Version    `json:"version,required"`
+	Name             string             `json:"name"`
+	Version          *semver.Version    `json:"version"`
 	Author           string             `json:"author"`
 	Maintainer       string             `json:"maintainer"`
 	Sentence         string             `json:"sentence"`
@@ -138,9 +138,8 @@ func (indexDep *indexDependency) extractDependency() *Dependency {
 	var constraint semver.Constraint
 	if c, err := semver.ParseConstraint(indexDep.Version); err == nil {
 		constraint = c
-	} else {
-		// FIXME: report invalid constraint
 	}
+	// FIXME: else { report invalid constraint }
 	return &Dependency{
 		Name:              indexDep.Name,
 		VersionConstraint: constraint,

arduino/monitors/null.go

@@ -45,7 +45,7 @@ func (mon *NullMonitor) Close() error {
 // Read bytes from the port
 func (mon *NullMonitor) Read(bytes []byte) (int, error) {
 	for {
-		elapsed := time.Now().Sub(mon.started).Seconds()
+		elapsed := time.Since(mon.started).Seconds()
 		n := int(elapsed*mon.bps) - mon.sent
 		if n == 0 {
 			// Delay until the next char...

arduino/resources/checksums.go

@@ -76,7 +76,7 @@ func (r *DownloadResource) TestLocalArchiveChecksum(downloadDir *paths.Path) (bo
 		return false, fmt.Errorf(tr("computing hash: %s"), err)
 	}
 
-	if bytes.Compare(algo.Sum(nil), digest) != 0 {
+	if !bytes.Equal(algo.Sum(nil), digest) {
 		return false, fmt.Errorf(tr("archive hash differs from hash in index"))
 	}
 
@@ -152,20 +152,6 @@ func computeDirChecksum(root string) (string, error) {
 	return fmt.Sprintf("%x", hash.Sum(nil)), nil
 }
 
-func createPackageFile(root string) error {
-	checksum, err := computeDirChecksum(root)
-	if err != nil {
-		return err
-	}
-
-	packageJSON, _ := json.Marshal(packageFile{checksum})
-	err = ioutil.WriteFile(filepath.Join(root, packageFileName), packageJSON, filePermissions)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 // CheckDirChecksum reads checksum from the package.json and compares it with a recomputed value.
 func CheckDirChecksum(root string) (bool, error) {
 	packageJSON, err := ioutil.ReadFile(filepath.Join(root, packageFileName))

arduino/resources/helpers.go

@@ -62,8 +62,6 @@ func (r *DownloadResource) Download(downloadDir *paths.Path, config *downloader.
 			// File is cached, nothing to do here
 			return nil, nil
 		}
-	} else if err == nil {
-		// resume download
 	} else {
 		return nil, fmt.Errorf(tr("getting archive file info: %s"), err)
 	}

arduino/resources/helpers_test.go

@@ -16,7 +16,6 @@
 package resources
 
 import (
-	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -37,7 +36,7 @@ func (h *EchoHandler) ServeHTTP(writer http.ResponseWriter, request *http.Reques
 }
 
 func TestDownloadApplyUserAgentHeaderUsingConfig(t *testing.T) {
-	goldUserAgentValue := fmt.Sprintf("arduino-cli/0.0.0-test.preview (amd64; linux; go1.12.4) Commit:deadbeef/Build:2019-06-12 11:11:11.111")
+	goldUserAgentValue := "arduino-cli/0.0.0-test.preview (amd64; linux; go1.12.4) Commit:deadbeef/Build:2019-06-12 11:11:11.111"
 	goldUserAgentString := "User-Agent: " + goldUserAgentValue
 
 	tmp, err := paths.MkTempDir("", "")

arduino/sketch/sketch.go

@@ -48,9 +48,9 @@ type Metadata struct {
 
 // BoardMetadata represents the board metadata for the sketch
 type BoardMetadata struct {
-	Fqbn string `json:"fqbn,required"`
+	Fqbn string `json:"fqbn"`
 	Name string `json:"name,omitempty"`
-	Port string `json:"port,omitepty"`
+	Port string `json:"port,omitempty"`
 }
 
 var tr = i18n.Tr

cli/feedback/feedback.go

@@ -184,6 +184,6 @@ func (fb *Feedback) PrintResult(res Result) {
 	case YAML:
 		fb.printYAML(res.Data())
 	default:
-		fb.Print(fmt.Sprintf("%s", res))
+		fb.Print(res.String())
 	}
 }

cli/globals/globals.go

@@ -19,7 +19,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/arduino/arduino-cli/i18n"
 	"github.com/arduino/arduino-cli/version"
 )
 
@@ -28,5 +27,4 @@ var (
 	VersionInfo = version.NewInfo(filepath.Base(os.Args[0]))
 	// DefaultIndexURL is the default index url
 	DefaultIndexURL = "https://downloads.arduino.cc/packages/package_index.json"
-	tr              = i18n.Tr
 )

cli/lib/args.go

@@ -86,7 +86,7 @@ func ParseLibraryReferenceArgAndAdjustCase(instance *rpc.Instance, arg string) (
 
 	candidates := []*rpc.SearchedLibrary{}
 	for _, foundLib := range res.GetLibraries() {
-		if strings.ToLower(foundLib.GetName()) == strings.ToLower(libRef.Name) {
+		if strings.EqualFold(foundLib.GetName(), libRef.Name) {
 			candidates = append(candidates, foundLib)
 		}
 	}

cli/lib/search.go

@@ -100,11 +100,11 @@ type result struct {
 func (res result) Data() interface{} {
 	if res.namesOnly {
 		type LibName struct {
-			Name string `json:"name,required"`
+			Name string `json:"name"`
 		}
 
 		type NamesOnly struct {
-			Libraries []LibName `json:"libraries,required"`
+			Libraries []LibName `json:"libraries"`
 		}
 
 		names := []LibName{}
@@ -180,7 +180,7 @@ func (res result) String() string {
 		}
 	}
 
-	return fmt.Sprintf("%s", out.String())
+	return out.String()
 }
 
 func versionsFromSearchedLibrary(library *rpc.SearchedLibrary) []*semver.Version {