Merge branch 'feat/purge-build-cache' of github.com:arduino/arduino-cli into feat/purge-build-cache

Author: Luca Bianconi

Diff for: buildcache/build_cache.go

@@ -23,25 +23,32 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-type wrapError struct {
-	wrapped error
-}
+const (
+	createDirErrCode = 1
+	fileWriteErrCode = 2
+)
 
-func (e wrapError) Error() string {
-	return e.wrapped.Error()
+type cacheError struct {
+	Code       int
+	wrappedErr error
 }
 
-func (e wrapError) Unwrap() error {
-	return e.wrapped
+func (e cacheError) Error() string {
+	return e.wrappedErr.Error()
 }
 
-type ErrCreateBaseDir struct {
-	wrapError
-}
-type ErrWriteLastUsedFile struct {
-	wrapError
+func (e cacheError) Is(target error) bool {
+	te, ok := target.(cacheError)
+	return ok && te.Code == e.Code
 }
 
+var (
+	// CreateDirErr error occurred when creating the cache directory
+	CreateDirErr = cacheError{Code: createDirErrCode}
+	// FileWriteErr error occurred when writing the placeholder file
+	FileWriteErr = cacheError{Code: fileWriteErrCode}
+)
+
 const lastUsedFileName = ".last-used"
 
 // BuildCache represents a cache of built files (sketches and cores), it's designed
@@ -56,11 +63,11 @@ type BuildCache struct {
 func (bc *BuildCache) GetOrCreate(key string) (*paths.Path, error) {
 	keyDir := bc.baseDir.Join(key)
 	if err := keyDir.MkdirAll(); err != nil {
-		return nil, &ErrCreateBaseDir{wrapError{err}}
+		return nil, cacheError{createDirErrCode, err}
 	}
 
 	if err := keyDir.Join(lastUsedFileName).WriteFile([]byte{}); err != nil {
-		return nil, &ErrWriteLastUsedFile{wrapError{err}}
+		return nil, cacheError{fileWriteErrCode, err}
 	}
 	return keyDir, nil
 }

Diff for: commands/sketch/new.go

@@ -75,14 +75,13 @@ func validateSketchName(name string) error {
 		return &arduino.CantCreateSketchError{Cause: errors.New(tr("sketch name cannot be empty"))}
 	}
 	if len(name) > sketchNameMaxLength {
-		return &arduino.CantCreateSketchError{Cause: errors.New(tr("sketch name too long (%d characters). Maximum allowed length is %d",
+		return &arduino.CantCreateSketchError{Cause: errors.New(tr("sketch name too long (%[1]d characters). Maximum allowed length is %[2]d",
 			len(name),
 			sketchNameMaxLength))}
 	}
 	if !sketchNameValidationRegex.MatchString(name) {
-		return &arduino.CantCreateSketchError{Cause: errors.New(tr("invalid sketch name \"%s\". Required pattern %s",
-			name,
-			sketchNameValidationRegex.String()))}
+		return &arduino.CantCreateSketchError{Cause: errors.New(tr(`invalid sketch name "%[1]s": the first character must be alphanumeric, the following ones can also contain "_", "-", and ".".`,
+			name))}
 	}
 	return nil
 }

Diff for: commands/sketch/new_test.go

@@ -2,6 +2,7 @@ package sketch
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
@@ -11,7 +12,6 @@ import (
 func Test_SketchNameWrongPattern(t *testing.T) {
 	invalidNames := []string{
 		"&",
-		"",
 		".hello",
 		"_hello",
 		"-hello",
@@ -24,11 +24,9 @@ func Test_SketchNameWrongPattern(t *testing.T) {
 			SketchName: name,
 			SketchDir:  t.TempDir(),
 		})
-		require.NotNil(t, err)
 
-		require.Error(t, err, `Can't create sketch: invalid sketch name "%s". Required pattern %s`,
-			name,
-			sketchNameValidationRegex)
+		require.EqualError(t, err, fmt.Sprintf(`Can't create sketch: invalid sketch name "%s": the first character must be alphanumeric, the following ones can also contain "_", "-", and ".".`,
+			name))
 	}
 }
 
@@ -38,9 +36,8 @@ func Test_SketchNameEmpty(t *testing.T) {
 		SketchName: emptyName,
 		SketchDir:  t.TempDir(),
 	})
-	require.NotNil(t, err)
 
-	require.Error(t, err, `Can't create sketch: sketch name cannot be empty`)
+	require.EqualError(t, err, `Can't create sketch: sketch name cannot be empty`)
 }
 
 func Test_SketchNameTooLong(t *testing.T) {
@@ -52,11 +49,10 @@ func Test_SketchNameTooLong(t *testing.T) {
 		SketchName: string(tooLongName),
 		SketchDir:  t.TempDir(),
 	})
-	require.NotNil(t, err)
 
-	require.Error(t, err, `Can't create sketch: sketch name too long (%d characters). Maximum allowed length is %d`,
+	require.EqualError(t, err, fmt.Sprintf(`Can't create sketch: sketch name too long (%d characters). Maximum allowed length is %d`,
 		len(tooLongName),
-		sketchNameMaxLength)
+		sketchNameMaxLength))
 }
 
 func Test_SketchNameOk(t *testing.T) {

Diff for: legacy/builder/phases/core_builder.go

@@ -100,7 +100,7 @@ func compileCore(ctx *types.Context, buildPath *paths.Path, buildCachePath *path
 		targetArchivedCore = buildCachePath.Join(archivedCoreName, "core.a")
 		_, buildCacheErr = buildcache.New(buildCachePath).GetOrCreate(archivedCoreName)
 
-		if errors.As(buildCacheErr, &buildcache.ErrCreateBaseDir{}) {
+		if errors.Is(buildCacheErr, buildcache.CreateDirErr) {
 			return nil, nil, fmt.Errorf(tr("creating core cache folder: %s", err))
 		}