Cosmetics

Author: Roberto Sora

repertory/repertory.go

@@ -1,40 +1,71 @@
+// This file is part of arduino-cli.
+//
+// Copyright 2020 ARDUINO SA (http://www.arduino.cc/)
+//
+// This software is released under the GNU General Public License version 3,
+// which covers the main part of arduino-cli.
+// The terms of this license can be found at:
+// https://www.gnu.org/licenses/gpl-3.0.en.html
+//
+// You can be released from the requirements of the above licenses by purchasing
+// a commercial license. Buying such a license is mandatory if you want to
+// modify or otherwise use the software for commercial activities involving the
+// Arduino software without disclosing the source code of your own applications.
+// To purchase a commercial license, send an email to license@arduino.cc.
+
 package repertory
 
 import (
+	"path/filepath"
+
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/arduino-cli/configuration"
 	"github.com/gofrs/uuid"
 	"github.com/spf13/viper"
-	"os"
 )
 
 // Store is the Read Only config storage
 var Store = viper.New()
 
+var (
+	Type = "yaml"
+	Name = "repertory" + "." + Type
+)
+
 // Configure configures the Read Only config storage
 func Init() {
 	configPath := configuration.GetDefaultArduinoDataDir()
-	Store.SetConfigType("yaml")
-	Store.SetConfigName("repertory.yaml")
+	Store.SetConfigName(Name)
+	Store.SetConfigType(Type)
 	Store.AddConfigPath(configPath)
+	configFilePath := filepath.Join(configPath, Name)
 	// Attempt to read config file
 	if err := Store.ReadInConfig(); err != nil {
 		// ConfigFileNotFoundError is acceptable, anything else
 		// should be reported to the user
 		if _, ok := err.(viper.ConfigFileNotFoundError); ok {
-			// FIXME: how should I treat this error?
-			installationID, _ := uuid.NewV4()
-			Store.SetDefault("installation.id", installationID.String())
-			installationSecret, _ := uuid.NewV4()
-			Store.SetDefault("installation.secret", installationSecret.String())
-			if err = Store.SafeWriteConfigAs(configPath); err != nil {
-				if os.IsNotExist(err) {
-					err = Store.WriteConfigAs(configPath)
-				}
+			generateInstallationData()
+			err := Store.WriteConfigAs(configFilePath)
+			if err != nil {
+				feedback.Errorf("Error writing repertory file: %v", err)
 			}
 		} else {
 			feedback.Errorf("Error reading repertory file: %v", err)
-
 		}
 	}
 }
+
+func generateInstallationData() {
+
+	installationID, err := uuid.NewV4()
+	if err != nil {
+		feedback.Errorf("Error generating installation.id: %v", err)
+	}
+	Store.Set("installation.id", installationID.String())
+
+	installationSecret, err := uuid.NewV4()
+	if err != nil {
+		feedback.Errorf("Error generating installation.secret: %v", err)
+	}
+	Store.Set("installation.secret", installationSecret.String())
+}

telemetry/telemetry.go

@@ -19,10 +19,10 @@ import (
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/hex"
-	"github.com/arduino/arduino-cli/repertory"
 	"net/http"
 	"path/filepath"
 
+	"github.com/arduino/arduino-cli/repertory"
 	"github.com/segmentio/stats/v4"
 	"github.com/segmentio/stats/v4/prometheus"
 	"github.com/sirupsen/logrus"
@@ -51,8 +51,8 @@ func Activate(metricPrefix string) {
 
 }
 
-// SanitizeSketchPath uses config generated UUID (installation.secret) as an HMAC secret to sanitize and anonymize the sketch
-// name maintaining it distinguishable from a different sketch from the same Installation
+// SanitizeSketchPath uses config generated UUID (installation.secret) as an HMAC secret to sanitize and anonymize
+// the sketch name maintaining it distinguishable from a different sketch from the same Installation
 func SanitizeSketchPath(sketchPath string) string {
 	logrus.Infof("repertory.Store.ConfigFileUsed() %s", repertory.Store.ConfigFileUsed())
 	installationSecret := repertory.Store.GetString("installation.secret")