From d5e4416aa84a94df59e8e8d6d19b51fbc756ac31 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 6 Dec 2023 16:01:15 +0100 Subject: [PATCH 01/11] Made 'configuration' package internal --- arduino/cores/packagemanager/loader.go | 2 +- arduino/cores/packagemanager/package_manager_test.go | 2 +- arduino/cores/packagemanager/profiles.go | 2 +- arduino/httpclient/httpclient.go | 2 +- commands/board/list_test.go | 2 +- commands/compile/compile.go | 2 +- commands/core/search_test.go | 2 +- commands/daemon/settings.go | 2 +- commands/daemon/settings_test.go | 2 +- commands/instances.go | 2 +- commands/internal/instances/instances.go | 2 +- commands/sketch/new.go | 2 +- docs/UPGRADING.md | 1 + docsgen/main.go | 2 +- internal/cli/arguments/pre_post_script.go | 2 +- internal/cli/arguments/reference_test.go | 2 +- internal/cli/cache/clean.go | 2 +- internal/cli/cli.go | 2 +- internal/cli/compile/compile.go | 2 +- internal/cli/config/add.go | 2 +- internal/cli/config/config.go | 2 +- internal/cli/config/delete.go | 2 +- internal/cli/config/dump.go | 2 +- internal/cli/config/init.go | 2 +- internal/cli/config/remove.go | 2 +- internal/cli/config/set.go | 2 +- {configuration => internal/cli/configuration}/configuration.go | 0 .../cli/configuration}/configuration.schema.json | 0 .../cli/configuration}/configuration_schema_test.go | 0 .../cli/configuration}/configuration_test.go | 0 {configuration => internal/cli/configuration}/defaults.go | 0 {configuration => internal/cli/configuration}/directories.go | 0 {configuration => internal/cli/configuration}/network.go | 0 {configuration => internal/cli/configuration}/term.go | 0 internal/cli/core/search.go | 2 +- internal/cli/daemon/daemon.go | 2 +- internal/cli/lib/install.go | 2 +- internal/cli/lib/search.go | 2 +- internal/cli/monitor/monitor.go | 2 +- internal/cli/updater/updater.go | 2 +- main.go | 2 +- 41 files changed, 33 insertions(+), 32 deletions(-) rename {configuration => internal/cli/configuration}/configuration.go (100%) rename {configuration => internal/cli/configuration}/configuration.schema.json (100%) rename {configuration => internal/cli/configuration}/configuration_schema_test.go (100%) rename {configuration => internal/cli/configuration}/configuration_test.go (100%) rename {configuration => internal/cli/configuration}/defaults.go (100%) rename {configuration => internal/cli/configuration}/directories.go (100%) rename {configuration => internal/cli/configuration}/network.go (100%) rename {configuration => internal/cli/configuration}/term.go (100%) diff --git a/arduino/cores/packagemanager/loader.go b/arduino/cores/packagemanager/loader.go index 8d5cfe76da0..464d027b7ec 100644 --- a/arduino/cores/packagemanager/loader.go +++ b/arduino/cores/packagemanager/loader.go @@ -26,7 +26,7 @@ import ( "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/arduino/cores" "github.com/arduino/arduino-cli/arduino/discovery" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" "github.com/pkg/errors" diff --git a/arduino/cores/packagemanager/package_manager_test.go b/arduino/cores/packagemanager/package_manager_test.go index 8a5fc877850..65c1452c791 100644 --- a/arduino/cores/packagemanager/package_manager_test.go +++ b/arduino/cores/packagemanager/package_manager_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" "github.com/stretchr/testify/require" diff --git a/arduino/cores/packagemanager/profiles.go b/arduino/cores/packagemanager/profiles.go index a8f12789521..a7c16fb7f70 100644 --- a/arduino/cores/packagemanager/profiles.go +++ b/arduino/cores/packagemanager/profiles.go @@ -24,7 +24,7 @@ import ( "github.com/arduino/arduino-cli/arduino/globals" "github.com/arduino/arduino-cli/arduino/resources" "github.com/arduino/arduino-cli/arduino/sketch" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" diff --git a/arduino/httpclient/httpclient.go b/arduino/httpclient/httpclient.go index 4969ab2cb46..991eacc9ce4 100644 --- a/arduino/httpclient/httpclient.go +++ b/arduino/httpclient/httpclient.go @@ -21,8 +21,8 @@ import ( "time" "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" diff --git a/commands/board/list_test.go b/commands/board/list_test.go index aaf6b3bec5e..75bd96c324c 100644 --- a/commands/board/list_test.go +++ b/commands/board/list_test.go @@ -23,7 +23,7 @@ import ( "github.com/arduino/arduino-cli/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/arduino/discovery" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" "github.com/stretchr/testify/require" diff --git a/commands/compile/compile.go b/commands/compile/compile.go index 81d77a38774..2a969926de1 100644 --- a/commands/compile/compile.go +++ b/commands/compile/compile.go @@ -30,9 +30,9 @@ import ( "github.com/arduino/arduino-cli/arduino/sketch" "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/buildcache" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/inventory" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" diff --git a/commands/core/search_test.go b/commands/core/search_test.go index 9234f92809e..e67c07c7e95 100644 --- a/commands/core/search_test.go +++ b/commands/core/search_test.go @@ -18,7 +18,7 @@ package core import ( "testing" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/instance" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" diff --git a/commands/daemon/settings.go b/commands/daemon/settings.go index 0043c8859c0..151ce9da61a 100644 --- a/commands/daemon/settings.go +++ b/commands/daemon/settings.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/daemon/settings_test.go b/commands/daemon/settings_test.go index f51ab6dc3e3..c5366e179b5 100644 --- a/commands/daemon/settings_test.go +++ b/commands/daemon/settings_test.go @@ -21,7 +21,7 @@ import ( "path/filepath" "testing" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/stretchr/testify/require" diff --git a/commands/instances.go b/commands/instances.go index ea1a42b45e8..a04ab4d6899 100644 --- a/commands/instances.go +++ b/commands/instances.go @@ -34,8 +34,8 @@ import ( "github.com/arduino/arduino-cli/arduino/sketch" "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" diff --git a/commands/internal/instances/instances.go b/commands/internal/instances/instances.go index 7b13f77234d..4d7e4b38073 100644 --- a/commands/internal/instances/instances.go +++ b/commands/internal/instances/instances.go @@ -6,8 +6,8 @@ import ( "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/arduino-cli/version" ) diff --git a/commands/sketch/new.go b/commands/sketch/new.go index e73f90a996a..16086cf4206 100644 --- a/commands/sketch/new.go +++ b/commands/sketch/new.go @@ -22,7 +22,7 @@ import ( "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/arduino/globals" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" ) diff --git a/docs/UPGRADING.md b/docs/UPGRADING.md index bd6f633019c..3fda8770199 100644 --- a/docs/UPGRADING.md +++ b/docs/UPGRADING.md @@ -9,6 +9,7 @@ Here you can find a list of migration guides to handle breaking changes between The following golang modules are no longer available as public API: - `github.com/arduino/arduino-cli/buildcache` +- `github.com/arduino/arduino-cli/configuration` - `github.com/arduino/arduino-cli/executils` - `github.com/arduino/arduino-cli/table` diff --git a/docsgen/main.go b/docsgen/main.go index 5bb4a3fcc4b..47a62f14a04 100644 --- a/docsgen/main.go +++ b/docsgen/main.go @@ -18,8 +18,8 @@ package main import ( "os" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/internal/cli" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/spf13/cobra/doc" ) diff --git a/internal/cli/arguments/pre_post_script.go b/internal/cli/arguments/pre_post_script.go index 99a54e02d94..eb36dd64be8 100644 --- a/internal/cli/arguments/pre_post_script.go +++ b/internal/cli/arguments/pre_post_script.go @@ -16,7 +16,7 @@ package arguments import ( - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/internal/cli/arguments/reference_test.go b/internal/cli/arguments/reference_test.go index 29f20300c78..047d3fc9e5c 100644 --- a/internal/cli/arguments/reference_test.go +++ b/internal/cli/arguments/reference_test.go @@ -18,8 +18,8 @@ package arguments_test import ( "testing" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/internal/cli/arguments" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/cli/cache/clean.go b/internal/cli/cache/clean.go index f5fbb18c4ec..c4c37a1cf1e 100644 --- a/internal/cli/cache/clean.go +++ b/internal/cli/cache/clean.go @@ -18,7 +18,7 @@ package cache import ( "os" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/internal/cli/cli.go b/internal/cli/cli.go index ad5fb2e9964..024847ff273 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -21,7 +21,6 @@ import ( "os" "strings" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/board" "github.com/arduino/arduino-cli/internal/cli/burnbootloader" @@ -29,6 +28,7 @@ import ( "github.com/arduino/arduino-cli/internal/cli/compile" "github.com/arduino/arduino-cli/internal/cli/completion" "github.com/arduino/arduino-cli/internal/cli/config" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/core" "github.com/arduino/arduino-cli/internal/cli/daemon" "github.com/arduino/arduino-cli/internal/cli/debug" diff --git a/internal/cli/compile/compile.go b/internal/cli/compile/compile.go index 81ef0a01765..17e99f2801c 100644 --- a/internal/cli/compile/compile.go +++ b/internal/cli/compile/compile.go @@ -29,9 +29,9 @@ import ( "github.com/arduino/arduino-cli/commands/core" "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/commands/upload" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/arguments" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" "github.com/arduino/arduino-cli/internal/cli/feedback/table" diff --git a/internal/cli/config/add.go b/internal/cli/config/add.go index fe853df467e..5018b0440de 100644 --- a/internal/cli/config/add.go +++ b/internal/cli/config/add.go @@ -19,7 +19,7 @@ import ( "os" "reflect" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/internal/cli/config/config.go b/internal/cli/config/config.go index ee0e8922852..9d03c64b7e6 100644 --- a/internal/cli/config/config.go +++ b/internal/cli/config/config.go @@ -19,8 +19,8 @@ import ( "os" "reflect" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/spf13/cobra" ) diff --git a/internal/cli/config/delete.go b/internal/cli/config/delete.go index e950153a393..ae5bd7976b5 100644 --- a/internal/cli/config/delete.go +++ b/internal/cli/config/delete.go @@ -19,7 +19,7 @@ import ( "os" "github.com/arduino/arduino-cli/commands/daemon" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" diff --git a/internal/cli/config/dump.go b/internal/cli/config/dump.go index b7636f68c4a..9e10bf34f9b 100644 --- a/internal/cli/config/dump.go +++ b/internal/cli/config/dump.go @@ -18,7 +18,7 @@ package config import ( "os" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/internal/cli/config/init.go b/internal/cli/config/init.go index f2ef1effa46..afb05f74279 100644 --- a/internal/cli/config/init.go +++ b/internal/cli/config/init.go @@ -19,8 +19,8 @@ import ( "os" "strings" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/internal/cli/arguments" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" diff --git a/internal/cli/config/remove.go b/internal/cli/config/remove.go index 1be518448e4..d7870172b0c 100644 --- a/internal/cli/config/remove.go +++ b/internal/cli/config/remove.go @@ -19,7 +19,7 @@ import ( "os" "reflect" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/internal/cli/config/set.go b/internal/cli/config/set.go index 339128c38f1..8fd002277da 100644 --- a/internal/cli/config/set.go +++ b/internal/cli/config/set.go @@ -20,7 +20,7 @@ import ( "reflect" "strconv" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/configuration/configuration.go b/internal/cli/configuration/configuration.go similarity index 100% rename from configuration/configuration.go rename to internal/cli/configuration/configuration.go diff --git a/configuration/configuration.schema.json b/internal/cli/configuration/configuration.schema.json similarity index 100% rename from configuration/configuration.schema.json rename to internal/cli/configuration/configuration.schema.json diff --git a/configuration/configuration_schema_test.go b/internal/cli/configuration/configuration_schema_test.go similarity index 100% rename from configuration/configuration_schema_test.go rename to internal/cli/configuration/configuration_schema_test.go diff --git a/configuration/configuration_test.go b/internal/cli/configuration/configuration_test.go similarity index 100% rename from configuration/configuration_test.go rename to internal/cli/configuration/configuration_test.go diff --git a/configuration/defaults.go b/internal/cli/configuration/defaults.go similarity index 100% rename from configuration/defaults.go rename to internal/cli/configuration/defaults.go diff --git a/configuration/directories.go b/internal/cli/configuration/directories.go similarity index 100% rename from configuration/directories.go rename to internal/cli/configuration/directories.go diff --git a/configuration/network.go b/internal/cli/configuration/network.go similarity index 100% rename from configuration/network.go rename to internal/cli/configuration/network.go diff --git a/configuration/term.go b/internal/cli/configuration/term.go similarity index 100% rename from configuration/term.go rename to internal/cli/configuration/term.go diff --git a/internal/cli/core/search.go b/internal/cli/core/search.go index ed2a007f888..6122b649ec7 100644 --- a/internal/cli/core/search.go +++ b/internal/cli/core/search.go @@ -27,7 +27,7 @@ import ( "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/core" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" "github.com/arduino/arduino-cli/internal/cli/feedback/table" diff --git a/internal/cli/daemon/daemon.go b/internal/cli/daemon/daemon.go index 5dfeef7da80..2331e8005ca 100644 --- a/internal/cli/daemon/daemon.go +++ b/internal/cli/daemon/daemon.go @@ -25,8 +25,8 @@ import ( "syscall" "github.com/arduino/arduino-cli/commands/daemon" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" srv_commands "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/arduino-cli/version" diff --git a/internal/cli/lib/install.go b/internal/cli/lib/install.go index 549f4d7c328..72a2a0592f9 100644 --- a/internal/cli/lib/install.go +++ b/internal/cli/lib/install.go @@ -22,8 +22,8 @@ import ( "strings" "github.com/arduino/arduino-cli/commands/lib" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/internal/cli/arguments" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/instance" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" diff --git a/internal/cli/lib/search.go b/internal/cli/lib/search.go index da666bdc579..d0f0e329081 100644 --- a/internal/cli/lib/search.go +++ b/internal/cli/lib/search.go @@ -24,7 +24,7 @@ import ( "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/lib" - "github.com/arduino/arduino-cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" "github.com/arduino/arduino-cli/internal/cli/instance" diff --git a/internal/cli/monitor/monitor.go b/internal/cli/monitor/monitor.go index fb499ba326c..6381d773983 100644 --- a/internal/cli/monitor/monitor.go +++ b/internal/cli/monitor/monitor.go @@ -28,9 +28,9 @@ import ( "github.com/arduino/arduino-cli/commands/monitor" sk "github.com/arduino/arduino-cli/commands/sketch" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/arguments" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" "github.com/arduino/arduino-cli/internal/cli/feedback/table" diff --git a/internal/cli/updater/updater.go b/internal/cli/updater/updater.go index 77e73785de7..185e8a5051f 100644 --- a/internal/cli/updater/updater.go +++ b/internal/cli/updater/updater.go @@ -22,8 +22,8 @@ import ( "time" "github.com/arduino/arduino-cli/arduino/httpclient" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/inventory" "github.com/arduino/arduino-cli/version" diff --git a/main.go b/main.go index 55f139c5ca1..677dfd7bdf8 100644 --- a/main.go +++ b/main.go @@ -18,9 +18,9 @@ package main import ( "os" - "github.com/arduino/arduino-cli/configuration" "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli" + "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" ) From 30dd6b20c5cfec57c2282643223894ae3e913401 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 6 Dec 2023 17:23:08 +0100 Subject: [PATCH 02/11] Made 'arduino' package internal --- commands/board/details.go | 6 ++--- commands/board/list.go | 10 ++++---- commands/board/list_test.go | 4 ++-- commands/board/listall.go | 6 ++--- commands/board/search.go | 4 ++-- commands/compile/compile.go | 12 +++++----- commands/core.go | 2 +- commands/core/download.go | 4 ++-- commands/core/install.go | 4 ++-- commands/core/search.go | 6 ++--- commands/core/uninstall.go | 4 ++-- commands/core/upgrade.go | 6 ++--- commands/daemon/daemon.go | 2 +- commands/debug/debug.go | 4 ++-- commands/debug/debug_info.go | 8 +++---- commands/debug/debug_test.go | 2 +- commands/instances.go | 22 +++++++++--------- commands/internal/instances/instances.go | 6 ++--- commands/lib/download.go | 8 +++---- commands/lib/install.go | 8 +++---- commands/lib/list.go | 12 +++++----- commands/lib/resolve_deps.go | 6 ++--- commands/lib/search.go | 6 ++--- commands/lib/search_matcher.go | 4 ++-- commands/lib/search_test.go | 2 +- commands/lib/uninstall.go | 4 ++-- commands/lib/upgrade.go | 2 +- commands/lib/utils.go | 6 ++--- commands/monitor/monitor.go | 8 +++---- commands/monitor/settings.go | 4 ++-- commands/sketch/archive.go | 4 ++-- commands/sketch/load.go | 4 ++-- commands/sketch/new.go | 4 ++-- commands/sketch/set_defaults.go | 4 ++-- commands/sketch/warn_deprecated.go | 2 +- commands/upload/burnbootloader.go | 2 +- commands/upload/programmers_list.go | 4 ++-- commands/upload/upload.go | 14 +++++------ commands/upload/upload_test.go | 6 ++--- .../builder/archive_compiled_files.go | 0 .../arduino}/builder/build_options_manager.go | 6 ++--- .../arduino}/builder/builder.go | 20 ++++++++-------- .../arduino}/builder/compilation.go | 4 ++-- {arduino => internal/arduino}/builder/core.go | 4 ++-- .../arduino}/builder/cpp/cpp.go | 0 .../arduino}/builder/cpp/cpp_test.go | 2 +- .../arduino}/builder/export_cmake.go | 6 ++--- .../builder/internal/compilation/database.go | 0 .../internal/compilation/database_test.go | 0 .../builder/internal/detector/detector.go | 18 +++++++------- .../internal/detector/detector_test.go | 2 +- .../diagnostics/compiler_detection.go | 0 .../diagnostics/compiler_detection_test.go | 0 .../builder/internal/diagnostics/parser.go | 0 .../internal/diagnostics/parser_gcc.go | 0 .../internal/diagnostics/parser_test.go | 0 .../testdata/compiler_outputs/test001.txt | 0 .../compiler_outputs/test001.txt.json | 0 .../testdata/compiler_outputs/test002.txt | 0 .../compiler_outputs/test002.txt.json | 0 .../testdata/compiler_outputs/test003.txt | 0 .../compiler_outputs/test003.txt.json | 0 .../testdata/compiler_outputs/test004.txt | 0 .../compiler_outputs/test004.txt.json | 0 .../builder/internal/logger/logger.go | 0 .../preprocessor/arduino_preprocessor.go | 4 ++-- .../builder/internal/preprocessor/ctags.go | 6 ++--- .../builder/internal/preprocessor/gcc.go | 2 +- .../internal/ctags/ctags_has_issues.go | 0 .../internal/ctags/ctags_parser.go | 0 .../internal/ctags/ctags_parser_test.go | 0 .../internal/ctags/ctags_to_prototypes.go | 0 .../ctags/ctags_to_prototypes_test.go | 0 ...tCTagsParserClassMembersAreFilteredOut.txt | 0 .../TestCTagsParserDefaultArguments.txt | 0 .../TestCTagsParserFunctionPointer.txt | 0 .../TestCTagsParserFunctionPointers.txt | 0 ...tCTagsParserFunctionPointersNoIndirect.txt | 0 .../testdata/TestCTagsParserNamespace.txt | 0 ...uldDealFunctionWithDifferentSignatures.txt | 0 .../TestCTagsParserShouldDealWithClasses.txt | 0 .../TestCTagsParserShouldDealWithMacros.txt | 0 .../TestCTagsParserShouldDealWithStructs.txt | 0 .../TestCTagsParserShouldListPrototypes.txt | 0 .../TestCTagsParserShouldListTemplates.txt | 0 .../TestCTagsParserShouldListTemplates2.txt | 0 .../ctags/testdata/TestCTagsParserStatic.txt | 0 .../TestCTagsParserStructWithFunctions.txt | 0 ...TestCTagsRunnerSketchWithClassFunction.txt | 0 .../TestCTagsRunnerSketchWithMultifile.txt | 0 .../builder/internal/progress/progress.go | 0 .../internal/progress/progress_test.go | 0 .../arduino}/builder/internal/utils/utils.go | 0 .../builder/internal/utils/utils_test.go | 0 .../arduino}/builder/libraries.go | 4 ++-- .../arduino}/builder/linker.go | 0 .../arduino}/builder/preprocess_sketch.go | 2 +- .../arduino}/builder/recipe.go | 0 .../arduino}/builder/sizer.go | 2 +- .../arduino}/builder/sizer_test.go | 0 .../arduino}/builder/sketch.go | 2 +- .../arduino}/builder/sketch_test.go | 2 +- .../TestCopyAdditionalFiles.ino | 0 .../TestCopyAdditionalFiles/include/foo.h | 0 .../testloadsketchcasemismatch.ino | 0 .../TestLoadSketchFolder/.#sketch.ino | 0 .../TestLoadSketchFolder.ino | 0 .../testdata/TestLoadSketchFolder/doc.txt | 0 .../testdata/TestLoadSketchFolder/header.h | 0 .../testdata/TestLoadSketchFolder/old.pde | 0 .../testdata/TestLoadSketchFolder/other.ino | 0 .../testdata/TestLoadSketchFolder/s_file.S | 0 .../TestLoadSketchFolder/src/dont_load_me.ino | 0 .../TestLoadSketchFolder/src/helper.h | 0 .../.#sketch.ino | 0 .../TestLoadSketchFolderBothInoAndPde.ino | 0 .../TestLoadSketchFolderBothInoAndPde.pde | 0 .../TestLoadSketchFolderBothInoAndPde/doc.txt | 0 .../header.h | 0 .../TestLoadSketchFolderBothInoAndPde/old.pde | 0 .../other.ino | 0 .../s_file.S | 0 .../src/dont_load_me.ino | 0 .../src/helper.h | 0 .../TestLoadSketchFolder.ino | 0 .../TestLoadSketchFolderPde/.#sketch.ino | 0 .../TestLoadSketchFolderPde.pde | 0 .../testdata/TestLoadSketchFolderPde/doc.txt | 0 .../testdata/TestLoadSketchFolderPde/header.h | 0 .../testdata/TestLoadSketchFolderPde/old.pde | 0 .../TestLoadSketchFolderPde/other.ino | 0 .../testdata/TestLoadSketchFolderPde/s_file.S | 0 .../src/dont_load_me.ino | 0 .../TestLoadSketchFolderPde/src/helper.h | 0 .../.#sketch.ino | 0 .../TestLoadSketchFolderSymlink.ino | 0 .../TestLoadSketchFolderSymlinkSrc/doc.txt | 0 .../TestLoadSketchFolderSymlinkSrc/header.h | 0 .../TestLoadSketchFolderSymlinkSrc/old.pde | 0 .../TestLoadSketchFolderSymlinkSrc/other.ino | 0 .../TestLoadSketchFolderSymlinkSrc/s_file.S | 0 .../src/dont_load_me.ino | 0 .../src/helper.h | 0 .../TestLoadSketchFolderWrongMain/main.ino | 0 .../testdata/TestMergeSketchSources.txt | 0 .../TestMergeSketchSourcesArduinoIncluded.ino | 0 .../testdata/TestMergeSketchSources_win.txt | 0 .../builder/testdata/TestSaveSketch.ino | 0 .../TestSketchWithIppFile.ino | 0 .../TestSketchWithIppFile/template.ipp | 0 .../TestSketchWithMarkdownAsciidocJson.ino | 0 .../foo.adoc | 0 .../foo.json | 0 .../TestSketchWithMarkdownAsciidocJson/foo.md | 0 .../TestSketchWithTppFile.ino | 0 .../TestSketchWithTppFile/template.tpp | 0 {arduino => internal/arduino}/cores/board.go | 0 .../arduino}/cores/board_test.go | 0 {arduino => internal/arduino}/cores/cores.go | 6 ++--- .../arduino}/cores/cores_test.go | 0 {arduino => internal/arduino}/cores/fqbn.go | 0 .../arduino}/cores/fqbn_test.go | 0 .../arduino}/cores/packageindex/index.go | 6 ++--- .../cores/packageindex/index_easyjson.go | 0 .../arduino}/cores/packageindex/index_test.go | 4 ++-- .../cores/packageindex/testdata/links | 0 .../testdata/package_LowPowerLab_index.json | 0 .../package_MCUdude_MegaCore_index.json | 0 .../package_MCUdude_MegaCore_index.json.1 | 0 .../package_MCUdude_MicroCore_index.json | 0 .../package_MCUdude_MightyCore_index.json | 0 .../package_MCUdude_MightyCore_index.json.1 | 0 .../package_MCUdude_MiniCore_index.json | 0 .../testdata/package_MattairTech_index.json | 0 .../package_NicoHood_HoodLoader2_index.json | 0 .../package_XMegaForArduino_index.json | 0 .../testdata/package_Zoubworld_index.json | 0 .../testdata/package_adafruit_index.json | 0 .../testdata/package_akafugu_index.json | 0 .../testdata/package_aloriumtech_index.json | 0 ...package_arachnidlabs.com_boards_index.json | 0 .../testdata/package_ardhat_index.json | 0 .../testdata/package_arduboy_index.json | 0 .../testdata/package_arrow_index.json | 0 .../testdata/package_atflash_index.json | 0 .../testdata/package_avdweb_nl_index.json | 0 .../testdata/package_canique_index.json | 0 .../package_carlosefr_atmega_index.json | 0 .../testdata/package_chipkit_index.json | 0 .../testdata/package_chipkit_index.json.1 | 0 .../testdata/package_clkdiv8_index.json | 0 ...codebendercc_ariadne-bootloader_index.json | 0 .../testdata/package_cosa_index.json | 0 .../testdata/package_cytron_index.json | 0 .../package_damellis_attiny_index.json | 0 .../package_dfrobot_index.json.invalid | 0 ...package_dfrobot_iot_mainboard.json.invalid | 0 .../testdata/package_digistump_index.json | 0 .../testdata/package_drazzy.com_index.json | 0 .../package_dwengo.org_dwenguino_index.json | 0 ...kage_elektor-labs.com_ide-1.6.5_index.json | 0 ...kage_elektor-labs.com_ide-1.6.6_index.json | 0 .../package_engimusing_modules_index.json | 0 .../testdata/package_esp32_index.json | 0 .../testdata/package_esp32_index.json.1 | 0 .../testdata/package_esp32_index.json.2 | 0 .../testdata/package_esp8266com_index.json | 0 .../package_femtocow_attiny_index.json | 0 .../testdata/package_ftduino_index.json | 0 .../testdata/package_goldilocks_index.json | 0 .../testdata/package_hidnseek_boot_index.json | 0 .../testdata/package_infineon_index.json | 0 .../testdata/package_intorobot_index.json | 0 .../testdata/package_iot2000_index.json | 0 .../package_iotcore_ide-1.6.6_index.json | 0 .../testdata/package_ioteam_index.json | 0 .../package_iteaduino_lite_index.json | 0 .../testdata/package_konekt_index.json | 0 .../testdata/package_lattuino_index.json | 0 .../package_lauszus_sanguino_index.json | 0 .../package_leonardomiliani.com_index.json | 0 .../testdata/package_macchina_index.json | 0 .../testdata/package_maxim_index.json | 0 .../testdata/package_mkr1000_index.json | 0 .../testdata/package_mtk_linkit_index.json | 0 .../package_mtk_linkit_smart_7688_index.json | 0 .../testdata/package_nRF5_boards_index.json | 0 .../testdata/package_navspark_index.json | 0 .../testdata/package_olimex_avr_index.json | 0 .../testdata/package_olimex_pic_index.json | 0 .../testdata/package_olimex_stm_index.json | 0 .../testdata/package_omc_index.json | 0 .../testdata/package_openpanzer_index.json | 0 .../testdata/package_opentracker_index.json | 0 .../package_oshlab_breadboard_index.json | 0 .../testdata/package_panstamp_index.json | 0 .../package_per1234_wirino_index.json | 0 .../package_project_laika.com_index.json | 0 .../testdata/package_quirkbot.com_index.json | 0 .../package_radino_radino32_index.json | 0 .../package_realtek.com_ameba_index.json | 0 .../package_redbear_index.json.tobefixed | 0 .../testdata/package_redbearlab_index.json | 0 .../testdata/package_rfduino_index.json | 0 .../testdata/package_rig_index.json | 0 .../testdata/package_rnc_index.json | 0 .../testdata/package_seeeduino_index.json | 0 .../testdata/package_simba_avr_index.json | 0 .../testdata/package_simba_esp_index.json | 0 .../testdata/package_simba_sam_index.json | 0 .../testdata/package_sodaq_index.json | 0 .../testdata/package_sodaq_samd_index.json | 0 .../testdata/package_sparkfun_index.json | 0 .../testdata/package_stm_index.json | 0 .../package_talk2.wisen.com_index.json | 0 ...package_thomasonw_ATmegaxxM1-C1_index.json | 0 .../package_tkj_balanduino_index.json | 0 .../testdata/package_tl7788_index.json | 0 .../testdata/package_udoo_index.json | 0 .../package_zevero_avr_boot_index.json | 0 .../arduino}/cores/packagemanager/download.go | 4 ++-- .../arduino}/cores/packagemanager/identify.go | 2 +- .../cores/packagemanager/install_uninstall.go | 6 ++--- .../arduino}/cores/packagemanager/loader.go | 6 ++--- .../cores/packagemanager/loader_test.go | 0 .../cores/packagemanager/package_manager.go | 10 ++++---- .../packagemanager/package_manager_test.go | 2 +- .../arduino}/cores/packagemanager/profiles.go | 10 ++++---- .../cores/packagemanager/testdata/.gitignore | 0 .../custom_hardware/arduino/avr/boards.txt | 0 .../custom_hardware/arduino/sam/boards.txt | 0 .../custom_hardware/arduino/sam/platform.txt | 0 .../esp8266/esp8266/boards.txt | 0 .../my_avr_platform/avr/boards.txt | 0 .../stk500v2/stk500boot_v2_mega2560.hex | 0 .../my_avr_platform/avr/libraries/SPI/SPI.cpp | 0 .../my_avr_platform/avr/libraries/SPI/SPI.h | 0 .../BarometricPressureSensor.ino | 0 .../DigitalPotControl/DigitalPotControl.ino | 0 .../avr/libraries/SPI/keywords.txt | 0 .../avr/libraries/SPI/library.properties | 0 .../my_avr_platform/avr/platform.txt | 0 .../custom_hardware/test/avr/boards.txt | 0 .../custom_hardware/watterott/avr/boards.txt | 0 .../watterott/avr/platform.txt | 0 .../watterott/avr/programmers.txt | 0 .../data_dir_1/package_adafruit_index.json | 0 .../data_dir_1/package_esp32_index.json | 0 .../data_dir_1/package_esp8266com_index.json | 0 .../data_dir_1/package_test_index.json | 0 .../adafruit/hardware/samd/1.5.3/boards.txt | 0 .../adafruit/hardware/samd/1.5.3/keywords.txt | 0 .../adafruit/hardware/samd/1.5.3/platform.txt | 0 .../hardware/samd/1.5.3/programmers.txt | 0 .../arduino/hardware/avr/1.8.3/boards.txt | 0 .../arduino/hardware/avr/1.8.3/platform.txt | 0 .../hardware/avr/1.8.3/programmers.txt | 0 .../arduino/tools/CMSIS-Atmel/1.2.0/.keep | 0 .../packages/arduino/tools/CMSIS/4.5.0/.keep | 0 .../arm-none-eabi-gcc/4.8.3-2014q1/.keep | 0 .../packages/arduino/tools/bossac/1.7.0/.keep | 0 .../tools/bossac/1.8.0-48-gb176eee/.keep | 0 .../arduino/tools/openocd/0.9.0-arduino/.keep | 0 .../esp32/hardware/esp32/1.0.0/boards.txt | 0 .../esp32/hardware/esp32/1.0.0/platform.txt | 0 .../hardware/esp32/1.0.0/programmers.txt | 0 .../packages/esp32/tools/esptool/2.3.1/.keep | 0 .../packages/esp32/tools/mkspiffs/0.2.3/.keep | 0 .../1.22.0-80-g6c4433a-5.2.0/.keep | 0 .../esp8266/hardware/esp8266/3.0.2/boards.txt | 0 .../hardware/esp8266/3.0.2/platform.txt | 0 .../hardware/esp8266/3.0.2/programmers.txt | 0 .../esp8266/tools/esptool/0.4.13/.keep | 0 .../esp8266/tools/mkspiffs/0.2.0/.keep | 0 .../1.20.0-26-gb404fb9-2/.keep | 0 .../test/hardware/avr/1.1.0/boards.txt | 0 .../packages/test/tools/bossac/1.7.5/.keep | 0 .../test2/hardware/avr/1.0.0/boards.txt | 0 .../extra_hardware/referenced/avr/boards.txt | 0 .../extra_hardware/referenced/samd/boards.txt | 0 .../testdata/package_tooltest_index.json | 0 .../arduino}/cores/programmers.go | 0 {arduino => internal/arduino}/cores/status.go | 0 {arduino => internal/arduino}/cores/tools.go | 2 +- .../arduino}/cores/tools_test.go | 2 +- .../arduino}/discovery/discovery.go | 0 .../discovery/discovery_client/main.go | 4 ++-- .../arduino}/discovery/discovery_test.go | 0 .../discoverymanager/discoverymanager.go | 2 +- .../discovery/testdata/cat/.gitignore | 0 .../arduino}/discovery/testdata/cat/main.go | 0 {arduino => internal/arduino}/errors.go | 0 .../arduino}/globals/globals.go | 0 .../arduino}/httpclient/httpclient.go | 2 +- .../arduino}/httpclient/httpclient_test.go | 0 .../arduino}/libraries/libraries.go | 4 ++-- .../arduino}/libraries/libraries_layout.go | 0 .../arduino}/libraries/libraries_location.go | 0 .../arduino}/libraries/libraries_test.go | 0 .../libraries/librariesindex/index.go | 4 ++-- .../libraries/librariesindex/index_test.go | 2 +- .../arduino}/libraries/librariesindex/json.go | 2 +- .../libraries/librariesindex/json_easyjson.go | 0 .../libraries/librariesindex/reference.go | 0 .../librariesindex/testdata/invalid.json | 0 .../testdata/library_index.json | 0 .../arduino}/libraries/librarieslist.go | 0 .../libraries/librariesmanager/download.go | 0 .../libraries/librariesmanager/install.go | 10 ++++---- .../librariesmanager/install_test.go | 0 .../librariesmanager/librariesmanager.go | 6 ++--- .../librariesmanager/librariesmanager_test.go | 2 +- .../libraries/librariesresolver/cpp.go | 8 +++---- .../libraries/librariesresolver/cpp_test.go | 2 +- .../arduino}/libraries/loader.go | 2 +- .../libraries/testdata/LegacyLib/LegacyLib.h | 0 .../library.properties | 0 .../src/LibWithNonUTF8Properties.h | 0 .../testdata/TestLib/library.properties | 0 .../libraries/testdata/TestLib/src/TestLib.h | 0 .../examples/MultipleFiles/MultipleFiles.ino | 0 .../examples/MultipleFiles/MultipleFiles.pde | 0 .../examples/WrongCasing/wrongCasing.ino | 0 .../examples/simple/simple.ino | 0 .../TestLibExamples/library.properties | 0 .../testdata/TestLibExamples/src/TestLib.h | 0 .../testdata/TestLibInDev/.development | 0 .../testdata/TestLibInDev/library.properties | 0 .../testdata/TestLibInDev/src/TestLib.h | 0 .../arduino}/monitor/monitor.go | 0 .../arduino}/monitor/monitor_test.go | 0 .../arduino}/monitor/testdata/.gitignore | 0 .../arduino}/resources/checksums.go | 0 .../arduino}/resources/download.go | 2 +- .../arduino}/resources/helpers.go | 0 .../arduino}/resources/helpers_test.go | 2 +- .../arduino}/resources/index.go | 6 ++--- .../arduino}/resources/install.go | 0 .../arduino}/resources/install_test.go | 0 .../arduino}/resources/resources_test.go | 0 .../arduino}/resources/structs.go | 0 .../testdata/invalid/package_index.tar.bz2 | Bin ...latform_with_multiple_root_folders.tar.bz2 | Bin .../platform_without_root_folder.tar.bz2 | Bin .../testdata/valid/package_index.tar.bz2 | Bin ...tform_with_root_and__MACOSX_folder.tar.bz2 | Bin .../security/keys/arduino_public.gpg.key | Bin .../arduino}/security/signature_test.go | 0 .../arduino}/security/signatures.go | 0 .../testdata/module_firmware_index.json | 0 .../testdata/module_firmware_index.json.sig | Bin .../module_firmware_index_public.gpg.key | Bin .../security/testdata/package_index.json | 0 .../security/testdata/package_index.json.sig | Bin .../arduino}/serialutils/serialutils.go | 0 .../arduino}/sketch/profiles.go | 2 +- .../arduino}/sketch/profiles_test.go | 0 .../arduino}/sketch/sketch.go | 2 +- .../arduino}/sketch/sketch_test.go | 0 .../SketchBothInoAndPde.ino | 0 .../SketchBothInoAndPde.pde | 0 .../SketchCasingCorrect.ino | 0 .../SketchCasingWrong/sketchcasingwrong.ino | 0 .../SketchMultipleMainFiles.ino | 0 .../SketchMultipleMainFiles.pde | 0 .../sketch/testdata/SketchPde/SketchPde.pde | 0 .../testdata/SketchSimple/SketchSimple.ino | 0 .../sketch/testdata/SketchSimple/other.cpp | 0 .../testdata/SketchSymlinkSrc/.#sketch.ino | 0 .../SketchSymlinkSrc/SketchSymlinkSrc.ino | 0 .../sketch/testdata/SketchSymlinkSrc/doc.txt | 0 .../sketch/testdata/SketchSymlinkSrc/header.h | 0 .../sketch/testdata/SketchSymlinkSrc/old.pde | 0 .../testdata/SketchSymlinkSrc/other.ino | 0 .../sketch/testdata/SketchSymlinkSrc/s_file.S | 0 .../SketchSymlinkSrc/src/dont_load_me.ino | 0 .../testdata/SketchSymlinkSrc/src/helper.h | 0 .../SketchWithDefaultFQBNAndPort.ino | 0 .../SketchWithDefaultFQBNAndPort/sketch.yml | 0 .../SketchWithIppFile/SketchWithIppFile.ino | 0 .../testdata/SketchWithIppFile/template.ipp | 0 .../SketchWithMarkdownAsciidocJson.ino | 0 .../SketchWithMarkdownAsciidocJson/foo.adoc | 0 .../SketchWithMarkdownAsciidocJson/foo.json | 0 .../SketchWithMarkdownAsciidocJson/foo.md | 0 .../SketchWithMultipleSymlinkLoops.ino | 0 .../testdata/SketchWithProfiles/sketch.yml | 0 .../SketchWithSymlink/SketchWithSymlink.ino | 0 .../SketchWithSymlink/some_folder/helper.h | 0 .../SketchWithSymlinkLoop.ino | 0 .../some_folder/helper.h | 0 .../SketchWithTppFile/SketchWithTppFile.ino | 0 .../testdata/SketchWithTppFile/template.tpp | 0 .../testdata/SketchWithWrongMain/main.ino | 0 .../arduino}/sketch/testdata/TestNewItem.ino | 0 {arduino => internal/arduino}/sketch/yaml.go | 0 .../arduino}/sketch/yaml_test.go | 0 .../arduino}/utils/filenames.go | 0 {arduino => internal/arduino}/utils/search.go | 0 {arduino => internal/arduino}/utils/url.go | 0 .../arduino}/utils/url_test.go | 0 internal/cli/arguments/fqbn.go | 2 +- internal/cli/arguments/port.go | 2 +- internal/cli/arguments/reference.go | 2 +- internal/cli/board/list.go | 4 ++-- internal/cli/burnbootloader/burnbootloader.go | 2 +- internal/cli/compile/compile.go | 2 +- internal/cli/core/search.go | 4 ++-- internal/cli/core/upgrade.go | 2 +- internal/cli/debug/debug.go | 2 +- internal/cli/sketch/new.go | 2 +- internal/cli/updater/updater.go | 2 +- internal/cli/upload/upload.go | 2 +- .../integrationtest/compile_1/compile_test.go | 2 +- .../integrationtest/compile_4/compile_test.go | 2 +- .../integrationtest/daemon/daemon_test.go | 2 +- 456 files changed, 235 insertions(+), 235 deletions(-) rename {arduino => internal/arduino}/builder/archive_compiled_files.go (100%) rename {arduino => internal/arduino}/builder/build_options_manager.go (96%) rename {arduino => internal/arduino}/builder/builder.go (95%) rename {arduino => internal/arduino}/builder/compilation.go (97%) rename {arduino => internal/arduino}/builder/core.go (97%) rename {arduino => internal/arduino}/builder/cpp/cpp.go (100%) rename {arduino => internal/arduino}/builder/cpp/cpp_test.go (97%) rename {arduino => internal/arduino}/builder/export_cmake.go (98%) rename {arduino => internal/arduino}/builder/internal/compilation/database.go (100%) rename {arduino => internal/arduino}/builder/internal/compilation/database_test.go (100%) rename {arduino => internal/arduino}/builder/internal/detector/detector.go (97%) rename {arduino => internal/arduino}/builder/internal/detector/detector_test.go (97%) rename {arduino => internal/arduino}/builder/internal/diagnostics/compiler_detection.go (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/compiler_detection_test.go (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/parser.go (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/parser_gcc.go (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/parser_test.go (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/testdata/compiler_outputs/test001.txt (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/testdata/compiler_outputs/test001.txt.json (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/testdata/compiler_outputs/test002.txt (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/testdata/compiler_outputs/test002.txt.json (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/testdata/compiler_outputs/test003.txt (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/testdata/compiler_outputs/test003.txt.json (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/testdata/compiler_outputs/test004.txt (100%) rename {arduino => internal/arduino}/builder/internal/diagnostics/testdata/compiler_outputs/test004.txt.json (100%) rename {arduino => internal/arduino}/builder/internal/logger/logger.go (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/arduino_preprocessor.go (96%) rename {arduino => internal/arduino}/builder/internal/preprocessor/ctags.go (97%) rename {arduino => internal/arduino}/builder/internal/preprocessor/gcc.go (98%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/ctags_has_issues.go (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/ctags_parser.go (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/ctags_parser_test.go (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/ctags_to_prototypes.go (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/ctags_to_prototypes_test.go (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserClassMembersAreFilteredOut.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserDefaultArguments.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointer.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointers.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointersNoIndirect.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserNamespace.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithClasses.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithMacros.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithStructs.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListPrototypes.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListTemplates.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListTemplates2.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserStatic.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserStructWithFunctions.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsRunnerSketchWithClassFunction.txt (100%) rename {arduino => internal/arduino}/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsRunnerSketchWithMultifile.txt (100%) rename {arduino => internal/arduino}/builder/internal/progress/progress.go (100%) rename {arduino => internal/arduino}/builder/internal/progress/progress_test.go (100%) rename {arduino => internal/arduino}/builder/internal/utils/utils.go (100%) rename {arduino => internal/arduino}/builder/internal/utils/utils_test.go (100%) rename {arduino => internal/arduino}/builder/libraries.go (98%) rename {arduino => internal/arduino}/builder/linker.go (100%) rename {arduino => internal/arduino}/builder/preprocess_sketch.go (93%) rename {arduino => internal/arduino}/builder/recipe.go (100%) rename {arduino => internal/arduino}/builder/sizer.go (99%) rename {arduino => internal/arduino}/builder/sizer_test.go (100%) rename {arduino => internal/arduino}/builder/sketch.go (99%) rename {arduino => internal/arduino}/builder/sketch_test.go (98%) rename {arduino => internal/arduino}/builder/testdata/TestCopyAdditionalFiles/TestCopyAdditionalFiles.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestCopyAdditionalFiles/include/foo.h (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchCaseMismatch/testloadsketchcasemismatch.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolder/.#sketch.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolder/TestLoadSketchFolder.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolder/doc.txt (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolder/header.h (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolder/old.pde (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolder/other.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolder/s_file.S (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolder/src/dont_load_me.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolder/src/helper.h (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderBothInoAndPde/.#sketch.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderBothInoAndPde/TestLoadSketchFolderBothInoAndPde.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderBothInoAndPde/TestLoadSketchFolderBothInoAndPde.pde (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderBothInoAndPde/doc.txt (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderBothInoAndPde/header.h (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderBothInoAndPde/old.pde (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderBothInoAndPde/other.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderBothInoAndPde/s_file.S (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderBothInoAndPde/src/dont_load_me.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderBothInoAndPde/src/helper.h (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderIno/TestLoadSketchFolderIno.ino/TestLoadSketchFolder.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderPde/.#sketch.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderPde/TestLoadSketchFolderPde.pde (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderPde/doc.txt (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderPde/header.h (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderPde/old.pde (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderPde/other.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderPde/s_file.S (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderPde/src/dont_load_me.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderPde/src/helper.h (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderSymlinkSrc/.#sketch.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderSymlinkSrc/TestLoadSketchFolderSymlink.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderSymlinkSrc/doc.txt (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderSymlinkSrc/header.h (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderSymlinkSrc/old.pde (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderSymlinkSrc/other.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderSymlinkSrc/s_file.S (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/dont_load_me.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/helper.h (100%) rename {arduino => internal/arduino}/builder/testdata/TestLoadSketchFolderWrongMain/main.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestMergeSketchSources.txt (100%) rename {arduino => internal/arduino}/builder/testdata/TestMergeSketchSourcesArduinoIncluded/TestMergeSketchSourcesArduinoIncluded.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestMergeSketchSources_win.txt (100%) rename {arduino => internal/arduino}/builder/testdata/TestSaveSketch.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestSketchWithIppFile/TestSketchWithIppFile.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestSketchWithIppFile/template.ipp (100%) rename {arduino => internal/arduino}/builder/testdata/TestSketchWithMarkdownAsciidocJson/TestSketchWithMarkdownAsciidocJson.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.adoc (100%) rename {arduino => internal/arduino}/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.json (100%) rename {arduino => internal/arduino}/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.md (100%) rename {arduino => internal/arduino}/builder/testdata/TestSketchWithTppFile/TestSketchWithTppFile.ino (100%) rename {arduino => internal/arduino}/builder/testdata/TestSketchWithTppFile/template.tpp (100%) rename {arduino => internal/arduino}/cores/board.go (100%) rename {arduino => internal/arduino}/cores/board_test.go (100%) rename {arduino => internal/arduino}/cores/cores.go (98%) rename {arduino => internal/arduino}/cores/cores_test.go (100%) rename {arduino => internal/arduino}/cores/fqbn.go (100%) rename {arduino => internal/arduino}/cores/fqbn_test.go (100%) rename {arduino => internal/arduino}/cores/packageindex/index.go (98%) rename {arduino => internal/arduino}/cores/packageindex/index_easyjson.go (100%) rename {arduino => internal/arduino}/cores/packageindex/index_test.go (99%) rename {arduino => internal/arduino}/cores/packageindex/testdata/links (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_LowPowerLab_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_MCUdude_MegaCore_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_MCUdude_MegaCore_index.json.1 (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_MCUdude_MicroCore_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_MCUdude_MightyCore_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_MCUdude_MightyCore_index.json.1 (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_MCUdude_MiniCore_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_MattairTech_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_NicoHood_HoodLoader2_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_XMegaForArduino_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_Zoubworld_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_adafruit_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_akafugu_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_aloriumtech_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_arachnidlabs.com_boards_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_ardhat_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_arduboy_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_arrow_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_atflash_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_avdweb_nl_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_canique_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_carlosefr_atmega_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_chipkit_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_chipkit_index.json.1 (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_clkdiv8_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_codebendercc_ariadne-bootloader_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_cosa_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_cytron_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_damellis_attiny_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_dfrobot_index.json.invalid (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_dfrobot_iot_mainboard.json.invalid (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_digistump_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_drazzy.com_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_dwengo.org_dwenguino_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_elektor-labs.com_ide-1.6.5_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_elektor-labs.com_ide-1.6.6_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_engimusing_modules_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_esp32_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_esp32_index.json.1 (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_esp32_index.json.2 (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_esp8266com_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_femtocow_attiny_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_ftduino_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_goldilocks_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_hidnseek_boot_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_infineon_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_intorobot_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_iot2000_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_iotcore_ide-1.6.6_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_ioteam_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_iteaduino_lite_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_konekt_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_lattuino_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_lauszus_sanguino_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_leonardomiliani.com_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_macchina_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_maxim_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_mkr1000_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_mtk_linkit_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_mtk_linkit_smart_7688_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_nRF5_boards_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_navspark_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_olimex_avr_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_olimex_pic_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_olimex_stm_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_omc_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_openpanzer_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_opentracker_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_oshlab_breadboard_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_panstamp_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_per1234_wirino_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_project_laika.com_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_quirkbot.com_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_radino_radino32_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_realtek.com_ameba_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_redbear_index.json.tobefixed (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_redbearlab_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_rfduino_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_rig_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_rnc_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_seeeduino_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_simba_avr_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_simba_esp_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_simba_sam_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_sodaq_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_sodaq_samd_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_sparkfun_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_stm_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_talk2.wisen.com_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_thomasonw_ATmegaxxM1-C1_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_tkj_balanduino_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_tl7788_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_udoo_index.json (100%) rename {arduino => internal/arduino}/cores/packageindex/testdata/package_zevero_avr_boot_index.json (100%) rename {arduino => internal/arduino}/cores/packagemanager/download.go (98%) rename {arduino => internal/arduino}/cores/packagemanager/identify.go (96%) rename {arduino => internal/arduino}/cores/packagemanager/install_uninstall.go (98%) rename {arduino => internal/arduino}/cores/packagemanager/loader.go (99%) rename {arduino => internal/arduino}/cores/packagemanager/loader_test.go (100%) rename {arduino => internal/arduino}/cores/packagemanager/package_manager.go (98%) rename {arduino => internal/arduino}/cores/packagemanager/package_manager_test.go (99%) rename {arduino => internal/arduino}/cores/packagemanager/profiles.go (96%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/.gitignore (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/arduino/avr/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/arduino/sam/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/arduino/sam/platform.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/esp8266/esp8266/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/SPI.cpp (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/SPI.h (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/keywords.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/library.properties (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/platform.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/test/avr/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/watterott/avr/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/watterott/avr/platform.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/custom_hardware/watterott/avr/programmers.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/package_adafruit_index.json (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/package_esp32_index.json (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/package_esp8266com_index.json (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/package_test_index.json (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/keywords.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/platform.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/programmers.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/platform.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/programmers.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/CMSIS-Atmel/1.2.0/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/CMSIS/4.5.0/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/arm-none-eabi-gcc/4.8.3-2014q1/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/bossac/1.7.0/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/bossac/1.8.0-48-gb176eee/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/openocd/0.9.0-arduino/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/platform.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/programmers.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/esptool/2.3.1/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/mkspiffs/0.2.3/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/platform.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/programmers.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/esptool/0.4.13/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/mkspiffs/0.2.0/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/test/hardware/avr/1.1.0/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/test/tools/bossac/1.7.5/.keep (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/data_dir_1/packages/test2/hardware/avr/1.0.0/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/extra_hardware/referenced/avr/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/extra_hardware/referenced/samd/boards.txt (100%) rename {arduino => internal/arduino}/cores/packagemanager/testdata/package_tooltest_index.json (100%) rename {arduino => internal/arduino}/cores/programmers.go (100%) rename {arduino => internal/arduino}/cores/status.go (100%) rename {arduino => internal/arduino}/cores/tools.go (99%) rename {arduino => internal/arduino}/cores/tools_test.go (99%) rename {arduino => internal/arduino}/discovery/discovery.go (100%) rename {arduino => internal/arduino}/discovery/discovery_client/main.go (92%) rename {arduino => internal/arduino}/discovery/discovery_test.go (100%) rename {arduino => internal/arduino}/discovery/discoverymanager/discoverymanager.go (99%) rename {arduino => internal/arduino}/discovery/testdata/cat/.gitignore (100%) rename {arduino => internal/arduino}/discovery/testdata/cat/main.go (100%) rename {arduino => internal/arduino}/errors.go (100%) rename {arduino => internal/arduino}/globals/globals.go (100%) rename {arduino => internal/arduino}/httpclient/httpclient.go (98%) rename {arduino => internal/arduino}/httpclient/httpclient_test.go (100%) rename {arduino => internal/arduino}/libraries/libraries.go (98%) rename {arduino => internal/arduino}/libraries/libraries_layout.go (100%) rename {arduino => internal/arduino}/libraries/libraries_location.go (100%) rename {arduino => internal/arduino}/libraries/libraries_test.go (100%) rename {arduino => internal/arduino}/libraries/librariesindex/index.go (97%) rename {arduino => internal/arduino}/libraries/librariesindex/index_test.go (98%) rename {arduino => internal/arduino}/libraries/librariesindex/json.go (98%) rename {arduino => internal/arduino}/libraries/librariesindex/json_easyjson.go (100%) rename {arduino => internal/arduino}/libraries/librariesindex/reference.go (100%) rename {arduino => internal/arduino}/libraries/librariesindex/testdata/invalid.json (100%) rename {arduino => internal/arduino}/libraries/librariesindex/testdata/library_index.json (100%) rename {arduino => internal/arduino}/libraries/librarieslist.go (100%) rename {arduino => internal/arduino}/libraries/librariesmanager/download.go (100%) rename {arduino => internal/arduino}/libraries/librariesmanager/install.go (97%) rename {arduino => internal/arduino}/libraries/librariesmanager/install_test.go (100%) rename {arduino => internal/arduino}/libraries/librariesmanager/librariesmanager.go (97%) rename {arduino => internal/arduino}/libraries/librariesmanager/librariesmanager_test.go (94%) rename {arduino => internal/arduino}/libraries/librariesresolver/cpp.go (96%) rename {arduino => internal/arduino}/libraries/librariesresolver/cpp_test.go (99%) rename {arduino => internal/arduino}/libraries/loader.go (99%) rename {arduino => internal/arduino}/libraries/testdata/LegacyLib/LegacyLib.h (100%) rename {arduino => internal/arduino}/libraries/testdata/LibWithNonUTF8Properties/library.properties (100%) rename {arduino => internal/arduino}/libraries/testdata/LibWithNonUTF8Properties/src/LibWithNonUTF8Properties.h (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLib/library.properties (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLib/src/TestLib.h (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLibExamples/examples/MultipleFiles/MultipleFiles.ino (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLibExamples/examples/MultipleFiles/MultipleFiles.pde (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLibExamples/examples/WrongCasing/wrongCasing.ino (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLibExamples/examples/simple/simple.ino (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLibExamples/library.properties (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLibExamples/src/TestLib.h (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLibInDev/.development (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLibInDev/library.properties (100%) rename {arduino => internal/arduino}/libraries/testdata/TestLibInDev/src/TestLib.h (100%) rename {arduino => internal/arduino}/monitor/monitor.go (100%) rename {arduino => internal/arduino}/monitor/monitor_test.go (100%) rename {arduino => internal/arduino}/monitor/testdata/.gitignore (100%) rename {arduino => internal/arduino}/resources/checksums.go (100%) rename {arduino => internal/arduino}/resources/download.go (97%) rename {arduino => internal/arduino}/resources/helpers.go (100%) rename {arduino => internal/arduino}/resources/helpers_test.go (97%) rename {arduino => internal/arduino}/resources/index.go (97%) rename {arduino => internal/arduino}/resources/install.go (100%) rename {arduino => internal/arduino}/resources/install_test.go (100%) rename {arduino => internal/arduino}/resources/resources_test.go (100%) rename {arduino => internal/arduino}/resources/structs.go (100%) rename {arduino => internal/arduino}/resources/testdata/invalid/package_index.tar.bz2 (100%) rename {arduino => internal/arduino}/resources/testdata/invalid/platform_with_multiple_root_folders.tar.bz2 (100%) rename {arduino => internal/arduino}/resources/testdata/invalid/platform_without_root_folder.tar.bz2 (100%) rename {arduino => internal/arduino}/resources/testdata/valid/package_index.tar.bz2 (100%) rename {arduino => internal/arduino}/resources/testdata/valid/platform_with_root_and__MACOSX_folder.tar.bz2 (100%) rename {arduino => internal/arduino}/security/keys/arduino_public.gpg.key (100%) rename {arduino => internal/arduino}/security/signature_test.go (100%) rename {arduino => internal/arduino}/security/signatures.go (100%) rename {arduino => internal/arduino}/security/testdata/module_firmware_index.json (100%) rename {arduino => internal/arduino}/security/testdata/module_firmware_index.json.sig (100%) rename {arduino => internal/arduino}/security/testdata/module_firmware_index_public.gpg.key (100%) rename {arduino => internal/arduino}/security/testdata/package_index.json (100%) rename {arduino => internal/arduino}/security/testdata/package_index.json.sig (100%) rename {arduino => internal/arduino}/serialutils/serialutils.go (100%) rename {arduino => internal/arduino}/sketch/profiles.go (99%) rename {arduino => internal/arduino}/sketch/profiles_test.go (100%) rename {arduino => internal/arduino}/sketch/sketch.go (99%) rename {arduino => internal/arduino}/sketch/sketch_test.go (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchBothInoAndPde/SketchBothInoAndPde.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchBothInoAndPde/SketchBothInoAndPde.pde (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchCasingCorrect/SketchCasingCorrect.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchCasingWrong/sketchcasingwrong.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchMultipleMainFiles/SketchMultipleMainFiles.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchMultipleMainFiles/SketchMultipleMainFiles.pde (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchPde/SketchPde.pde (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSimple/SketchSimple.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSimple/other.cpp (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSymlinkSrc/.#sketch.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSymlinkSrc/SketchSymlinkSrc.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSymlinkSrc/doc.txt (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSymlinkSrc/header.h (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSymlinkSrc/old.pde (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSymlinkSrc/other.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSymlinkSrc/s_file.S (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSymlinkSrc/src/dont_load_me.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchSymlinkSrc/src/helper.h (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithDefaultFQBNAndPort/SketchWithDefaultFQBNAndPort.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithDefaultFQBNAndPort/sketch.yml (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithIppFile/SketchWithIppFile.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithIppFile/template.ipp (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithMarkdownAsciidocJson/SketchWithMarkdownAsciidocJson.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.adoc (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.json (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.md (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithMultipleSymlinkLoops/SketchWithMultipleSymlinkLoops.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithProfiles/sketch.yml (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithSymlink/SketchWithSymlink.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithSymlink/some_folder/helper.h (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithSymlinkLoop/SketchWithSymlinkLoop.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithSymlinkLoop/some_folder/helper.h (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithTppFile/SketchWithTppFile.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithTppFile/template.tpp (100%) rename {arduino => internal/arduino}/sketch/testdata/SketchWithWrongMain/main.ino (100%) rename {arduino => internal/arduino}/sketch/testdata/TestNewItem.ino (100%) rename {arduino => internal/arduino}/sketch/yaml.go (100%) rename {arduino => internal/arduino}/sketch/yaml_test.go (100%) rename {arduino => internal/arduino}/utils/filenames.go (100%) rename {arduino => internal/arduino}/utils/search.go (100%) rename {arduino => internal/arduino}/utils/url.go (100%) rename {arduino => internal/arduino}/utils/url_test.go (100%) diff --git a/commands/board/details.go b/commands/board/details.go index 50c5638aa11..7f3b1d53f7a 100644 --- a/commands/board/details.go +++ b/commands/board/details.go @@ -18,10 +18,10 @@ package board import ( "context" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/board/list.go b/commands/board/list.go index 1f39928cb2f..59630771390 100644 --- a/commands/board/list.go +++ b/commands/board/list.go @@ -26,12 +26,12 @@ import ( "strings" "time" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" - "github.com/arduino/arduino-cli/arduino/discovery" - "github.com/arduino/arduino-cli/arduino/httpclient" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" + "github.com/arduino/arduino-cli/internal/arduino/discovery" + "github.com/arduino/arduino-cli/internal/arduino/httpclient" "github.com/arduino/arduino-cli/internal/inventory" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-properties-orderedmap" diff --git a/commands/board/list_test.go b/commands/board/list_test.go index 75bd96c324c..29d342b48a9 100644 --- a/commands/board/list_test.go +++ b/commands/board/list_test.go @@ -21,8 +21,8 @@ import ( "net/http/httptest" "testing" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" - "github.com/arduino/arduino-cli/arduino/discovery" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" + "github.com/arduino/arduino-cli/internal/arduino/discovery" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" diff --git a/commands/board/listall.go b/commands/board/listall.go index 430f06cee77..17670c5c150 100644 --- a/commands/board/listall.go +++ b/commands/board/listall.go @@ -20,11 +20,11 @@ import ( "sort" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/board/search.go b/commands/board/search.go index bda9fd6cf64..79ca8b872bf 100644 --- a/commands/board/search.go +++ b/commands/board/search.go @@ -20,10 +20,10 @@ import ( "sort" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/compile/compile.go b/commands/compile/compile.go index 2a969926de1..0a36b0648d0 100644 --- a/commands/compile/compile.go +++ b/commands/compile/compile.go @@ -23,14 +23,14 @@ import ( "sort" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/builder" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" - "github.com/arduino/arduino-cli/arduino/sketch" - "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/builder" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" + "github.com/arduino/arduino-cli/internal/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino/utils" "github.com/arduino/arduino-cli/internal/buildcache" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/inventory" diff --git a/commands/core.go b/commands/core.go index 1881519ef38..e61078da1b2 100644 --- a/commands/core.go +++ b/commands/core.go @@ -16,7 +16,7 @@ package commands import ( - "github.com/arduino/arduino-cli/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/core/download.go b/commands/core/download.go index 2edfc532705..5650eaa2043 100644 --- a/commands/core/download.go +++ b/commands/core/download.go @@ -18,11 +18,11 @@ package core import ( "context" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/core/install.go b/commands/core/install.go index 3aa6043bab6..573ec891146 100644 --- a/commands/core/install.go +++ b/commands/core/install.go @@ -19,10 +19,10 @@ import ( "context" "fmt" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/core/search.go b/commands/core/search.go index 1cde667090f..8346911798b 100644 --- a/commands/core/search.go +++ b/commands/core/search.go @@ -20,11 +20,11 @@ import ( "sort" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/core/uninstall.go b/commands/core/uninstall.go index 6038b8fd89b..55740a3b581 100644 --- a/commands/core/uninstall.go +++ b/commands/core/uninstall.go @@ -18,10 +18,10 @@ package core import ( "context" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/core/upgrade.go b/commands/core/upgrade.go index b27ca6cd8ae..0f359972f5a 100644 --- a/commands/core/upgrade.go +++ b/commands/core/upgrade.go @@ -18,11 +18,11 @@ package core import ( "context" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/daemon/daemon.go b/commands/daemon/daemon.go index 64b2fc0010f..b2cbf53f879 100644 --- a/commands/daemon/daemon.go +++ b/commands/daemon/daemon.go @@ -21,7 +21,6 @@ import ( "fmt" "io" - "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/board" "github.com/arduino/arduino-cli/commands/compile" @@ -31,6 +30,7 @@ import ( "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/commands/upload" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" "google.golang.org/grpc/metadata" diff --git a/commands/debug/debug.go b/commands/debug/debug.go index 2c483bf775f..e04ba12d40f 100644 --- a/commands/debug/debug.go +++ b/commands/debug/debug.go @@ -24,10 +24,10 @@ import ( "runtime" "time" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" diff --git a/commands/debug/debug_info.go b/commands/debug/debug_info.go index 621809d4adf..536a09f9699 100644 --- a/commands/debug/debug_info.go +++ b/commands/debug/debug_info.go @@ -24,11 +24,11 @@ import ( "strconv" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" - "github.com/arduino/arduino-cli/arduino/sketch" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" + "github.com/arduino/arduino-cli/internal/arduino/sketch" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" diff --git a/commands/debug/debug_test.go b/commands/debug/debug_test.go index fbb61626144..09d4e4f6362 100644 --- a/commands/debug/debug_test.go +++ b/commands/debug/debug_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" diff --git a/commands/instances.go b/commands/instances.go index a04ab4d6899..075c2fa9e04 100644 --- a/commands/instances.go +++ b/commands/instances.go @@ -22,19 +22,19 @@ import ( "path/filepath" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/cores/packageindex" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" - "github.com/arduino/arduino-cli/arduino/globals" - "github.com/arduino/arduino-cli/arduino/libraries" - "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" - "github.com/arduino/arduino-cli/arduino/resources" - "github.com/arduino/arduino-cli/arduino/sketch" - "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores/packageindex" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" + "github.com/arduino/arduino-cli/internal/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" + "github.com/arduino/arduino-cli/internal/arduino/resources" + "github.com/arduino/arduino-cli/internal/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino/utils" "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" diff --git a/commands/internal/instances/instances.go b/commands/internal/instances/instances.go index 4d7e4b38073..90c02ff6987 100644 --- a/commands/internal/instances/instances.go +++ b/commands/internal/instances/instances.go @@ -3,11 +3,11 @@ package instances import ( "sync" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/configuration" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/arduino-cli/version" ) diff --git a/commands/lib/download.go b/commands/lib/download.go index 1d30ba1dc48..d7d66d6b9c5 100644 --- a/commands/lib/download.go +++ b/commands/lib/download.go @@ -18,12 +18,12 @@ package lib import ( "context" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/httpclient" - "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/httpclient" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" ) diff --git a/commands/lib/install.go b/commands/lib/install.go index 45129dabf77..997ddd4075a 100644 --- a/commands/lib/install.go +++ b/commands/lib/install.go @@ -20,12 +20,12 @@ import ( "errors" "fmt" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/libraries" - "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" diff --git a/commands/lib/list.go b/commands/lib/list.go index 553101620e4..9f5d645fe06 100644 --- a/commands/lib/list.go +++ b/commands/lib/list.go @@ -19,13 +19,13 @@ import ( "context" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/libraries" - "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" - "github.com/arduino/arduino-cli/arduino/libraries/librariesresolver" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesresolver" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/lib/resolve_deps.go b/commands/lib/resolve_deps.go index e502dfedf73..72e9fa4c447 100644 --- a/commands/lib/resolve_deps.go +++ b/commands/lib/resolve_deps.go @@ -20,10 +20,10 @@ import ( "errors" "sort" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/libraries" - "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" semver "go.bug.st/relaxed-semver" ) diff --git a/commands/lib/search.go b/commands/lib/search.go index e1d95914cbc..e75df05cf9a 100644 --- a/commands/lib/search.go +++ b/commands/lib/search.go @@ -20,10 +20,10 @@ import ( "sort" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" semver "go.bug.st/relaxed-semver" ) diff --git a/commands/lib/search_matcher.go b/commands/lib/search_matcher.go index 193246579ca..3eec08b4ad9 100644 --- a/commands/lib/search_matcher.go +++ b/commands/lib/search_matcher.go @@ -18,8 +18,8 @@ package lib import ( "strings" - "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" - "github.com/arduino/arduino-cli/arduino/utils" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" + "github.com/arduino/arduino-cli/internal/arduino/utils" ) // matcherTokensFromQueryString parses the query string into tokens of interest diff --git a/commands/lib/search_test.go b/commands/lib/search_test.go index df653fa36cd..e1e0b3157f2 100644 --- a/commands/lib/search_test.go +++ b/commands/lib/search_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" "github.com/stretchr/testify/assert" diff --git a/commands/lib/uninstall.go b/commands/lib/uninstall.go index 57c56e95a5a..39266569b2f 100644 --- a/commands/lib/uninstall.go +++ b/commands/lib/uninstall.go @@ -18,9 +18,9 @@ package lib import ( "context" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/libraries" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/libraries" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" ) diff --git a/commands/lib/upgrade.go b/commands/lib/upgrade.go index 6fb6f9add2b..7a1aefcd588 100644 --- a/commands/lib/upgrade.go +++ b/commands/lib/upgrade.go @@ -18,10 +18,10 @@ package lib import ( "context" - "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/internal/instances" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" + "github.com/arduino/arduino-cli/internal/arduino" ) // LibraryUpgradeAll upgrades all the available libraries diff --git a/commands/lib/utils.go b/commands/lib/utils.go index fa8290ab997..09fe71344fd 100644 --- a/commands/lib/utils.go +++ b/commands/lib/utils.go @@ -16,10 +16,10 @@ package lib import ( - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" "github.com/arduino/arduino-cli/commands" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" ) type libraryReferencer interface { diff --git a/commands/monitor/monitor.go b/commands/monitor/monitor.go index 285841f8374..f0d8549de2d 100644 --- a/commands/monitor/monitor.go +++ b/commands/monitor/monitor.go @@ -20,12 +20,12 @@ import ( "fmt" "io" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" - pluggableMonitor "github.com/arduino/arduino-cli/arduino/monitor" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" + pluggableMonitor "github.com/arduino/arduino-cli/internal/arduino/monitor" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-properties-orderedmap" "github.com/sirupsen/logrus" diff --git a/commands/monitor/settings.go b/commands/monitor/settings.go index 89976c94d77..3b9a6a48193 100644 --- a/commands/monitor/settings.go +++ b/commands/monitor/settings.go @@ -18,9 +18,9 @@ package monitor import ( "context" - "github.com/arduino/arduino-cli/arduino" - pluggableMonitor "github.com/arduino/arduino-cli/arduino/monitor" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + pluggableMonitor "github.com/arduino/arduino-cli/internal/arduino/monitor" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/sketch/archive.go b/commands/sketch/archive.go index 059ab18bd35..8221d09c306 100644 --- a/commands/sketch/archive.go +++ b/commands/sketch/archive.go @@ -22,9 +22,9 @@ import ( "path/filepath" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/sketch" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/sketch" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" ) diff --git a/commands/sketch/load.go b/commands/sketch/load.go index bd6b80e4a61..30c1a9fb66c 100644 --- a/commands/sketch/load.go +++ b/commands/sketch/load.go @@ -18,8 +18,8 @@ package sketch import ( "context" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/sketch" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" ) diff --git a/commands/sketch/new.go b/commands/sketch/new.go index 16086cf4206..abb0cfde19b 100644 --- a/commands/sketch/new.go +++ b/commands/sketch/new.go @@ -20,8 +20,8 @@ import ( "errors" "regexp" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" diff --git a/commands/sketch/set_defaults.go b/commands/sketch/set_defaults.go index 17ac01dae34..5583a6450e0 100644 --- a/commands/sketch/set_defaults.go +++ b/commands/sketch/set_defaults.go @@ -18,8 +18,8 @@ package sketch import ( "context" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/sketch" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" ) diff --git a/commands/sketch/warn_deprecated.go b/commands/sketch/warn_deprecated.go index a78f7156973..0072804c94a 100644 --- a/commands/sketch/warn_deprecated.go +++ b/commands/sketch/warn_deprecated.go @@ -18,7 +18,7 @@ package sketch import ( "fmt" - "github.com/arduino/arduino-cli/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino/sketch" paths "github.com/arduino/go-paths-helper" ) diff --git a/commands/upload/burnbootloader.go b/commands/upload/burnbootloader.go index ad98c84d7af..dc14df5f3e7 100644 --- a/commands/upload/burnbootloader.go +++ b/commands/upload/burnbootloader.go @@ -19,7 +19,7 @@ import ( "context" "io" - "github.com/arduino/arduino-cli/arduino" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/commands/internal/instances" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" diff --git a/commands/upload/programmers_list.go b/commands/upload/programmers_list.go index b7290e68f5f..30b14839044 100644 --- a/commands/upload/programmers_list.go +++ b/commands/upload/programmers_list.go @@ -18,9 +18,9 @@ package upload import ( "context" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" "github.com/arduino/arduino-cli/commands/internal/instances" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/upload/upload.go b/commands/upload/upload.go index 0969c2aabaf..34d20f339e7 100644 --- a/commands/upload/upload.go +++ b/commands/upload/upload.go @@ -23,16 +23,16 @@ import ( "strings" "time" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" - "github.com/arduino/arduino-cli/arduino/discovery" - "github.com/arduino/arduino-cli/arduino/globals" - "github.com/arduino/arduino-cli/arduino/serialutils" - "github.com/arduino/arduino-cli/arduino/sketch" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" f "github.com/arduino/arduino-cli/internal/algorithms" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" + "github.com/arduino/arduino-cli/internal/arduino/discovery" + "github.com/arduino/arduino-cli/internal/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino/serialutils" + "github.com/arduino/arduino-cli/internal/arduino/sketch" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" diff --git a/commands/upload/upload_test.go b/commands/upload/upload_test.go index d73ab6b315b..95d26de6634 100644 --- a/commands/upload/upload_test.go +++ b/commands/upload/upload_test.go @@ -21,9 +21,9 @@ import ( "strings" "testing" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/cores/packagemanager" - "github.com/arduino/arduino-cli/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" + "github.com/arduino/arduino-cli/internal/arduino/sketch" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" diff --git a/arduino/builder/archive_compiled_files.go b/internal/arduino/builder/archive_compiled_files.go similarity index 100% rename from arduino/builder/archive_compiled_files.go rename to internal/arduino/builder/archive_compiled_files.go diff --git a/arduino/builder/build_options_manager.go b/internal/arduino/builder/build_options_manager.go similarity index 96% rename from arduino/builder/build_options_manager.go rename to internal/arduino/builder/build_options_manager.go index 0ff35611934..8c958bad527 100644 --- a/arduino/builder/build_options_manager.go +++ b/internal/arduino/builder/build_options_manager.go @@ -20,9 +20,9 @@ import ( "path/filepath" "strings" - "github.com/arduino/arduino-cli/arduino/builder/internal/utils" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" "github.com/pkg/errors" diff --git a/arduino/builder/builder.go b/internal/arduino/builder/builder.go similarity index 95% rename from arduino/builder/builder.go rename to internal/arduino/builder/builder.go index 33552b35df4..871d5baefad 100644 --- a/arduino/builder/builder.go +++ b/internal/arduino/builder/builder.go @@ -23,16 +23,16 @@ import ( "path/filepath" "strings" - "github.com/arduino/arduino-cli/arduino/builder/internal/compilation" - "github.com/arduino/arduino-cli/arduino/builder/internal/detector" - "github.com/arduino/arduino-cli/arduino/builder/internal/diagnostics" - "github.com/arduino/arduino-cli/arduino/builder/internal/logger" - "github.com/arduino/arduino-cli/arduino/builder/internal/progress" - "github.com/arduino/arduino-cli/arduino/builder/internal/utils" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/libraries" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" - "github.com/arduino/arduino-cli/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/compilation" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/detector" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/diagnostics" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/logger" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/progress" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" + "github.com/arduino/arduino-cli/internal/arduino/sketch" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" diff --git a/arduino/builder/compilation.go b/internal/arduino/builder/compilation.go similarity index 97% rename from arduino/builder/compilation.go rename to internal/arduino/builder/compilation.go index 0d91f622579..89b4fa9895c 100644 --- a/arduino/builder/compilation.go +++ b/internal/arduino/builder/compilation.go @@ -22,8 +22,8 @@ import ( "strings" "sync" - "github.com/arduino/arduino-cli/arduino/builder/internal/utils" - "github.com/arduino/arduino-cli/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" + "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/go-paths-helper" "github.com/pkg/errors" ) diff --git a/arduino/builder/core.go b/internal/arduino/builder/core.go similarity index 97% rename from arduino/builder/core.go rename to internal/arduino/builder/core.go index 407dcb76b0c..76058e21c80 100644 --- a/arduino/builder/core.go +++ b/internal/arduino/builder/core.go @@ -22,9 +22,9 @@ import ( "os" "strings" - "github.com/arduino/arduino-cli/arduino/builder/cpp" - "github.com/arduino/arduino-cli/arduino/builder/internal/utils" f "github.com/arduino/arduino-cli/internal/algorithms" + "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" "github.com/arduino/arduino-cli/internal/buildcache" "github.com/arduino/go-paths-helper" "github.com/pkg/errors" diff --git a/arduino/builder/cpp/cpp.go b/internal/arduino/builder/cpp/cpp.go similarity index 100% rename from arduino/builder/cpp/cpp.go rename to internal/arduino/builder/cpp/cpp.go diff --git a/arduino/builder/cpp/cpp_test.go b/internal/arduino/builder/cpp/cpp_test.go similarity index 97% rename from arduino/builder/cpp/cpp_test.go rename to internal/arduino/builder/cpp/cpp_test.go index b6ae543f558..400e3d1f02e 100644 --- a/arduino/builder/cpp/cpp_test.go +++ b/internal/arduino/builder/cpp/cpp_test.go @@ -18,7 +18,7 @@ package cpp_test import ( "testing" - "github.com/arduino/arduino-cli/arduino/builder/cpp" + "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" "github.com/stretchr/testify/require" ) diff --git a/arduino/builder/export_cmake.go b/internal/arduino/builder/export_cmake.go similarity index 98% rename from arduino/builder/export_cmake.go rename to internal/arduino/builder/export_cmake.go index e65776b4e0b..9272879251f 100644 --- a/arduino/builder/export_cmake.go +++ b/internal/arduino/builder/export_cmake.go @@ -24,9 +24,9 @@ import ( "slices" "strings" - "github.com/arduino/arduino-cli/arduino/builder/internal/utils" - "github.com/arduino/arduino-cli/arduino/globals" - "github.com/arduino/arduino-cli/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" + "github.com/arduino/arduino-cli/internal/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" ) diff --git a/arduino/builder/internal/compilation/database.go b/internal/arduino/builder/internal/compilation/database.go similarity index 100% rename from arduino/builder/internal/compilation/database.go rename to internal/arduino/builder/internal/compilation/database.go diff --git a/arduino/builder/internal/compilation/database_test.go b/internal/arduino/builder/internal/compilation/database_test.go similarity index 100% rename from arduino/builder/internal/compilation/database_test.go rename to internal/arduino/builder/internal/compilation/database_test.go diff --git a/arduino/builder/internal/detector/detector.go b/internal/arduino/builder/internal/detector/detector.go similarity index 97% rename from arduino/builder/internal/detector/detector.go rename to internal/arduino/builder/internal/detector/detector.go index 2e46a57c686..aa8b70635fd 100644 --- a/arduino/builder/internal/detector/detector.go +++ b/internal/arduino/builder/internal/detector/detector.go @@ -25,16 +25,16 @@ import ( "strings" "time" - "github.com/arduino/arduino-cli/arduino/builder/internal/logger" - "github.com/arduino/arduino-cli/arduino/builder/internal/preprocessor" - "github.com/arduino/arduino-cli/arduino/builder/internal/utils" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/globals" - "github.com/arduino/arduino-cli/arduino/libraries" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" - "github.com/arduino/arduino-cli/arduino/libraries/librariesresolver" - "github.com/arduino/arduino-cli/arduino/sketch" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/logger" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/preprocessor" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesresolver" + "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" "github.com/pkg/errors" diff --git a/arduino/builder/internal/detector/detector_test.go b/internal/arduino/builder/internal/detector/detector_test.go similarity index 97% rename from arduino/builder/internal/detector/detector_test.go rename to internal/arduino/builder/internal/detector/detector_test.go index 2290dc02de6..6e7f72648a4 100644 --- a/arduino/builder/internal/detector/detector_test.go +++ b/internal/arduino/builder/internal/detector/detector_test.go @@ -18,7 +18,7 @@ package detector_test import ( "testing" - "github.com/arduino/arduino-cli/arduino/builder/internal/detector" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/detector" "github.com/stretchr/testify/require" ) diff --git a/arduino/builder/internal/diagnostics/compiler_detection.go b/internal/arduino/builder/internal/diagnostics/compiler_detection.go similarity index 100% rename from arduino/builder/internal/diagnostics/compiler_detection.go rename to internal/arduino/builder/internal/diagnostics/compiler_detection.go diff --git a/arduino/builder/internal/diagnostics/compiler_detection_test.go b/internal/arduino/builder/internal/diagnostics/compiler_detection_test.go similarity index 100% rename from arduino/builder/internal/diagnostics/compiler_detection_test.go rename to internal/arduino/builder/internal/diagnostics/compiler_detection_test.go diff --git a/arduino/builder/internal/diagnostics/parser.go b/internal/arduino/builder/internal/diagnostics/parser.go similarity index 100% rename from arduino/builder/internal/diagnostics/parser.go rename to internal/arduino/builder/internal/diagnostics/parser.go diff --git a/arduino/builder/internal/diagnostics/parser_gcc.go b/internal/arduino/builder/internal/diagnostics/parser_gcc.go similarity index 100% rename from arduino/builder/internal/diagnostics/parser_gcc.go rename to internal/arduino/builder/internal/diagnostics/parser_gcc.go diff --git a/arduino/builder/internal/diagnostics/parser_test.go b/internal/arduino/builder/internal/diagnostics/parser_test.go similarity index 100% rename from arduino/builder/internal/diagnostics/parser_test.go rename to internal/arduino/builder/internal/diagnostics/parser_test.go diff --git a/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test001.txt b/internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test001.txt similarity index 100% rename from arduino/builder/internal/diagnostics/testdata/compiler_outputs/test001.txt rename to internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test001.txt diff --git a/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test001.txt.json b/internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test001.txt.json similarity index 100% rename from arduino/builder/internal/diagnostics/testdata/compiler_outputs/test001.txt.json rename to internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test001.txt.json diff --git a/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test002.txt b/internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test002.txt similarity index 100% rename from arduino/builder/internal/diagnostics/testdata/compiler_outputs/test002.txt rename to internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test002.txt diff --git a/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test002.txt.json b/internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test002.txt.json similarity index 100% rename from arduino/builder/internal/diagnostics/testdata/compiler_outputs/test002.txt.json rename to internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test002.txt.json diff --git a/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test003.txt b/internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test003.txt similarity index 100% rename from arduino/builder/internal/diagnostics/testdata/compiler_outputs/test003.txt rename to internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test003.txt diff --git a/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test003.txt.json b/internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test003.txt.json similarity index 100% rename from arduino/builder/internal/diagnostics/testdata/compiler_outputs/test003.txt.json rename to internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test003.txt.json diff --git a/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test004.txt b/internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test004.txt similarity index 100% rename from arduino/builder/internal/diagnostics/testdata/compiler_outputs/test004.txt rename to internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test004.txt diff --git a/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test004.txt.json b/internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test004.txt.json similarity index 100% rename from arduino/builder/internal/diagnostics/testdata/compiler_outputs/test004.txt.json rename to internal/arduino/builder/internal/diagnostics/testdata/compiler_outputs/test004.txt.json diff --git a/arduino/builder/internal/logger/logger.go b/internal/arduino/builder/internal/logger/logger.go similarity index 100% rename from arduino/builder/internal/logger/logger.go rename to internal/arduino/builder/internal/logger/logger.go diff --git a/arduino/builder/internal/preprocessor/arduino_preprocessor.go b/internal/arduino/builder/internal/preprocessor/arduino_preprocessor.go similarity index 96% rename from arduino/builder/internal/preprocessor/arduino_preprocessor.go rename to internal/arduino/builder/internal/preprocessor/arduino_preprocessor.go index cb0164dc663..c14b3349a42 100644 --- a/arduino/builder/internal/preprocessor/arduino_preprocessor.go +++ b/internal/arduino/builder/internal/preprocessor/arduino_preprocessor.go @@ -21,8 +21,8 @@ import ( "path/filepath" "runtime" - "github.com/arduino/arduino-cli/arduino/builder/internal/utils" - "github.com/arduino/arduino-cli/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" + "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" "github.com/pkg/errors" diff --git a/arduino/builder/internal/preprocessor/ctags.go b/internal/arduino/builder/internal/preprocessor/ctags.go similarity index 97% rename from arduino/builder/internal/preprocessor/ctags.go rename to internal/arduino/builder/internal/preprocessor/ctags.go index 346fd2a6f49..c35b839f47b 100644 --- a/arduino/builder/internal/preprocessor/ctags.go +++ b/internal/arduino/builder/internal/preprocessor/ctags.go @@ -24,10 +24,10 @@ import ( "strconv" "strings" - "github.com/arduino/arduino-cli/arduino/builder/cpp" - "github.com/arduino/arduino-cli/arduino/builder/internal/preprocessor/internal/ctags" - "github.com/arduino/arduino-cli/arduino/sketch" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/preprocessor/internal/ctags" + "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" "github.com/pkg/errors" diff --git a/arduino/builder/internal/preprocessor/gcc.go b/internal/arduino/builder/internal/preprocessor/gcc.go similarity index 98% rename from arduino/builder/internal/preprocessor/gcc.go rename to internal/arduino/builder/internal/preprocessor/gcc.go index aa849c0b324..13e0e3c59c9 100644 --- a/arduino/builder/internal/preprocessor/gcc.go +++ b/internal/arduino/builder/internal/preprocessor/gcc.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/arduino/arduino-cli/arduino/builder/cpp" f "github.com/arduino/arduino-cli/internal/algorithms" + "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" "github.com/pkg/errors" diff --git a/arduino/builder/internal/preprocessor/internal/ctags/ctags_has_issues.go b/internal/arduino/builder/internal/preprocessor/internal/ctags/ctags_has_issues.go similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/ctags_has_issues.go rename to internal/arduino/builder/internal/preprocessor/internal/ctags/ctags_has_issues.go diff --git a/arduino/builder/internal/preprocessor/internal/ctags/ctags_parser.go b/internal/arduino/builder/internal/preprocessor/internal/ctags/ctags_parser.go similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/ctags_parser.go rename to internal/arduino/builder/internal/preprocessor/internal/ctags/ctags_parser.go diff --git a/arduino/builder/internal/preprocessor/internal/ctags/ctags_parser_test.go b/internal/arduino/builder/internal/preprocessor/internal/ctags/ctags_parser_test.go similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/ctags_parser_test.go rename to internal/arduino/builder/internal/preprocessor/internal/ctags/ctags_parser_test.go diff --git a/arduino/builder/internal/preprocessor/internal/ctags/ctags_to_prototypes.go b/internal/arduino/builder/internal/preprocessor/internal/ctags/ctags_to_prototypes.go similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/ctags_to_prototypes.go rename to internal/arduino/builder/internal/preprocessor/internal/ctags/ctags_to_prototypes.go diff --git a/arduino/builder/internal/preprocessor/internal/ctags/ctags_to_prototypes_test.go b/internal/arduino/builder/internal/preprocessor/internal/ctags/ctags_to_prototypes_test.go similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/ctags_to_prototypes_test.go rename to internal/arduino/builder/internal/preprocessor/internal/ctags/ctags_to_prototypes_test.go diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserClassMembersAreFilteredOut.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserClassMembersAreFilteredOut.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserClassMembersAreFilteredOut.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserClassMembersAreFilteredOut.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserDefaultArguments.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserDefaultArguments.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserDefaultArguments.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserDefaultArguments.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointer.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointer.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointer.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointer.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointers.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointers.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointers.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointers.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointersNoIndirect.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointersNoIndirect.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointersNoIndirect.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserFunctionPointersNoIndirect.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserNamespace.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserNamespace.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserNamespace.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserNamespace.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithClasses.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithClasses.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithClasses.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithClasses.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithMacros.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithMacros.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithMacros.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithMacros.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithStructs.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithStructs.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithStructs.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldDealWithStructs.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListPrototypes.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListPrototypes.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListPrototypes.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListPrototypes.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListTemplates.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListTemplates.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListTemplates.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListTemplates.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListTemplates2.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListTemplates2.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListTemplates2.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserShouldListTemplates2.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserStatic.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserStatic.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserStatic.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserStatic.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserStructWithFunctions.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserStructWithFunctions.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserStructWithFunctions.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsParserStructWithFunctions.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsRunnerSketchWithClassFunction.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsRunnerSketchWithClassFunction.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsRunnerSketchWithClassFunction.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsRunnerSketchWithClassFunction.txt diff --git a/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsRunnerSketchWithMultifile.txt b/internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsRunnerSketchWithMultifile.txt similarity index 100% rename from arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsRunnerSketchWithMultifile.txt rename to internal/arduino/builder/internal/preprocessor/internal/ctags/testdata/TestCTagsRunnerSketchWithMultifile.txt diff --git a/arduino/builder/internal/progress/progress.go b/internal/arduino/builder/internal/progress/progress.go similarity index 100% rename from arduino/builder/internal/progress/progress.go rename to internal/arduino/builder/internal/progress/progress.go diff --git a/arduino/builder/internal/progress/progress_test.go b/internal/arduino/builder/internal/progress/progress_test.go similarity index 100% rename from arduino/builder/internal/progress/progress_test.go rename to internal/arduino/builder/internal/progress/progress_test.go diff --git a/arduino/builder/internal/utils/utils.go b/internal/arduino/builder/internal/utils/utils.go similarity index 100% rename from arduino/builder/internal/utils/utils.go rename to internal/arduino/builder/internal/utils/utils.go diff --git a/arduino/builder/internal/utils/utils_test.go b/internal/arduino/builder/internal/utils/utils_test.go similarity index 100% rename from arduino/builder/internal/utils/utils_test.go rename to internal/arduino/builder/internal/utils/utils_test.go diff --git a/arduino/builder/libraries.go b/internal/arduino/builder/libraries.go similarity index 98% rename from arduino/builder/libraries.go rename to internal/arduino/builder/libraries.go index 88780ee3505..bd8a1702eb5 100644 --- a/arduino/builder/libraries.go +++ b/internal/arduino/builder/libraries.go @@ -20,9 +20,9 @@ import ( "strings" "time" - "github.com/arduino/arduino-cli/arduino/builder/cpp" - "github.com/arduino/arduino-cli/arduino/libraries" f "github.com/arduino/arduino-cli/internal/algorithms" + "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" + "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" "github.com/pkg/errors" diff --git a/arduino/builder/linker.go b/internal/arduino/builder/linker.go similarity index 100% rename from arduino/builder/linker.go rename to internal/arduino/builder/linker.go diff --git a/arduino/builder/preprocess_sketch.go b/internal/arduino/builder/preprocess_sketch.go similarity index 93% rename from arduino/builder/preprocess_sketch.go rename to internal/arduino/builder/preprocess_sketch.go index 8028d345fdf..106df3d7b40 100644 --- a/arduino/builder/preprocess_sketch.go +++ b/internal/arduino/builder/preprocess_sketch.go @@ -16,7 +16,7 @@ package builder import ( - "github.com/arduino/arduino-cli/arduino/builder/internal/preprocessor" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/preprocessor" "github.com/arduino/go-paths-helper" ) diff --git a/arduino/builder/recipe.go b/internal/arduino/builder/recipe.go similarity index 100% rename from arduino/builder/recipe.go rename to internal/arduino/builder/recipe.go diff --git a/arduino/builder/sizer.go b/internal/arduino/builder/sizer.go similarity index 99% rename from arduino/builder/sizer.go rename to internal/arduino/builder/sizer.go index a4e362f7106..1be92719914 100644 --- a/arduino/builder/sizer.go +++ b/internal/arduino/builder/sizer.go @@ -22,7 +22,7 @@ import ( "regexp" "strconv" - "github.com/arduino/arduino-cli/arduino/builder/internal/utils" + "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-properties-orderedmap" "github.com/pkg/errors" diff --git a/arduino/builder/sizer_test.go b/internal/arduino/builder/sizer_test.go similarity index 100% rename from arduino/builder/sizer_test.go rename to internal/arduino/builder/sizer_test.go diff --git a/arduino/builder/sketch.go b/internal/arduino/builder/sketch.go similarity index 99% rename from arduino/builder/sketch.go rename to internal/arduino/builder/sketch.go index 3a7c21f3ded..930fb11e2c5 100644 --- a/arduino/builder/sketch.go +++ b/internal/arduino/builder/sketch.go @@ -23,9 +23,9 @@ import ( "strconv" "strings" - "github.com/arduino/arduino-cli/arduino/builder/cpp" "github.com/arduino/arduino-cli/i18n" f "github.com/arduino/arduino-cli/internal/algorithms" + "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" "github.com/arduino/go-paths-helper" "github.com/marcinbor85/gohex" diff --git a/arduino/builder/sketch_test.go b/internal/arduino/builder/sketch_test.go similarity index 98% rename from arduino/builder/sketch_test.go rename to internal/arduino/builder/sketch_test.go index 1ae684e12ed..208efc468b0 100644 --- a/arduino/builder/sketch_test.go +++ b/internal/arduino/builder/sketch_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/arduino/arduino-cli/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/go-paths-helper" "github.com/stretchr/testify/require" ) diff --git a/arduino/builder/testdata/TestCopyAdditionalFiles/TestCopyAdditionalFiles.ino b/internal/arduino/builder/testdata/TestCopyAdditionalFiles/TestCopyAdditionalFiles.ino similarity index 100% rename from arduino/builder/testdata/TestCopyAdditionalFiles/TestCopyAdditionalFiles.ino rename to internal/arduino/builder/testdata/TestCopyAdditionalFiles/TestCopyAdditionalFiles.ino diff --git a/arduino/builder/testdata/TestCopyAdditionalFiles/include/foo.h b/internal/arduino/builder/testdata/TestCopyAdditionalFiles/include/foo.h similarity index 100% rename from arduino/builder/testdata/TestCopyAdditionalFiles/include/foo.h rename to internal/arduino/builder/testdata/TestCopyAdditionalFiles/include/foo.h diff --git a/arduino/builder/testdata/TestLoadSketchCaseMismatch/testloadsketchcasemismatch.ino b/internal/arduino/builder/testdata/TestLoadSketchCaseMismatch/testloadsketchcasemismatch.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchCaseMismatch/testloadsketchcasemismatch.ino rename to internal/arduino/builder/testdata/TestLoadSketchCaseMismatch/testloadsketchcasemismatch.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolder/.#sketch.ino b/internal/arduino/builder/testdata/TestLoadSketchFolder/.#sketch.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolder/.#sketch.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolder/.#sketch.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolder/TestLoadSketchFolder.ino b/internal/arduino/builder/testdata/TestLoadSketchFolder/TestLoadSketchFolder.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolder/TestLoadSketchFolder.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolder/TestLoadSketchFolder.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolder/doc.txt b/internal/arduino/builder/testdata/TestLoadSketchFolder/doc.txt similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolder/doc.txt rename to internal/arduino/builder/testdata/TestLoadSketchFolder/doc.txt diff --git a/arduino/builder/testdata/TestLoadSketchFolder/header.h b/internal/arduino/builder/testdata/TestLoadSketchFolder/header.h similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolder/header.h rename to internal/arduino/builder/testdata/TestLoadSketchFolder/header.h diff --git a/arduino/builder/testdata/TestLoadSketchFolder/old.pde b/internal/arduino/builder/testdata/TestLoadSketchFolder/old.pde similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolder/old.pde rename to internal/arduino/builder/testdata/TestLoadSketchFolder/old.pde diff --git a/arduino/builder/testdata/TestLoadSketchFolder/other.ino b/internal/arduino/builder/testdata/TestLoadSketchFolder/other.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolder/other.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolder/other.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolder/s_file.S b/internal/arduino/builder/testdata/TestLoadSketchFolder/s_file.S similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolder/s_file.S rename to internal/arduino/builder/testdata/TestLoadSketchFolder/s_file.S diff --git a/arduino/builder/testdata/TestLoadSketchFolder/src/dont_load_me.ino b/internal/arduino/builder/testdata/TestLoadSketchFolder/src/dont_load_me.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolder/src/dont_load_me.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolder/src/dont_load_me.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolder/src/helper.h b/internal/arduino/builder/testdata/TestLoadSketchFolder/src/helper.h similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolder/src/helper.h rename to internal/arduino/builder/testdata/TestLoadSketchFolder/src/helper.h diff --git a/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/.#sketch.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/.#sketch.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/.#sketch.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/.#sketch.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/TestLoadSketchFolderBothInoAndPde.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/TestLoadSketchFolderBothInoAndPde.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/TestLoadSketchFolderBothInoAndPde.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/TestLoadSketchFolderBothInoAndPde.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/TestLoadSketchFolderBothInoAndPde.pde b/internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/TestLoadSketchFolderBothInoAndPde.pde similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/TestLoadSketchFolderBothInoAndPde.pde rename to internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/TestLoadSketchFolderBothInoAndPde.pde diff --git a/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/doc.txt b/internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/doc.txt similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/doc.txt rename to internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/doc.txt diff --git a/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/header.h b/internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/header.h similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/header.h rename to internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/header.h diff --git a/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/old.pde b/internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/old.pde similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/old.pde rename to internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/old.pde diff --git a/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/other.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/other.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/other.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/other.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/s_file.S b/internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/s_file.S similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/s_file.S rename to internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/s_file.S diff --git a/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/src/dont_load_me.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/src/dont_load_me.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/src/dont_load_me.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/src/dont_load_me.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/src/helper.h b/internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/src/helper.h similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/src/helper.h rename to internal/arduino/builder/testdata/TestLoadSketchFolderBothInoAndPde/src/helper.h diff --git a/arduino/builder/testdata/TestLoadSketchFolderIno/TestLoadSketchFolderIno.ino/TestLoadSketchFolder.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderIno/TestLoadSketchFolderIno.ino/TestLoadSketchFolder.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderIno/TestLoadSketchFolderIno.ino/TestLoadSketchFolder.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderIno/TestLoadSketchFolderIno.ino/TestLoadSketchFolder.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderPde/.#sketch.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderPde/.#sketch.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderPde/.#sketch.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderPde/.#sketch.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderPde/TestLoadSketchFolderPde.pde b/internal/arduino/builder/testdata/TestLoadSketchFolderPde/TestLoadSketchFolderPde.pde similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderPde/TestLoadSketchFolderPde.pde rename to internal/arduino/builder/testdata/TestLoadSketchFolderPde/TestLoadSketchFolderPde.pde diff --git a/arduino/builder/testdata/TestLoadSketchFolderPde/doc.txt b/internal/arduino/builder/testdata/TestLoadSketchFolderPde/doc.txt similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderPde/doc.txt rename to internal/arduino/builder/testdata/TestLoadSketchFolderPde/doc.txt diff --git a/arduino/builder/testdata/TestLoadSketchFolderPde/header.h b/internal/arduino/builder/testdata/TestLoadSketchFolderPde/header.h similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderPde/header.h rename to internal/arduino/builder/testdata/TestLoadSketchFolderPde/header.h diff --git a/arduino/builder/testdata/TestLoadSketchFolderPde/old.pde b/internal/arduino/builder/testdata/TestLoadSketchFolderPde/old.pde similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderPde/old.pde rename to internal/arduino/builder/testdata/TestLoadSketchFolderPde/old.pde diff --git a/arduino/builder/testdata/TestLoadSketchFolderPde/other.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderPde/other.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderPde/other.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderPde/other.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderPde/s_file.S b/internal/arduino/builder/testdata/TestLoadSketchFolderPde/s_file.S similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderPde/s_file.S rename to internal/arduino/builder/testdata/TestLoadSketchFolderPde/s_file.S diff --git a/arduino/builder/testdata/TestLoadSketchFolderPde/src/dont_load_me.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderPde/src/dont_load_me.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderPde/src/dont_load_me.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderPde/src/dont_load_me.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderPde/src/helper.h b/internal/arduino/builder/testdata/TestLoadSketchFolderPde/src/helper.h similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderPde/src/helper.h rename to internal/arduino/builder/testdata/TestLoadSketchFolderPde/src/helper.h diff --git a/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/.#sketch.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/.#sketch.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/.#sketch.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/.#sketch.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/TestLoadSketchFolderSymlink.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/TestLoadSketchFolderSymlink.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/TestLoadSketchFolderSymlink.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/TestLoadSketchFolderSymlink.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/doc.txt b/internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/doc.txt similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/doc.txt rename to internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/doc.txt diff --git a/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/header.h b/internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/header.h similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/header.h rename to internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/header.h diff --git a/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/old.pde b/internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/old.pde similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/old.pde rename to internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/old.pde diff --git a/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/other.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/other.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/other.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/other.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/s_file.S b/internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/s_file.S similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/s_file.S rename to internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/s_file.S diff --git a/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/dont_load_me.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/dont_load_me.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/dont_load_me.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/dont_load_me.ino diff --git a/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/helper.h b/internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/helper.h similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/helper.h rename to internal/arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/helper.h diff --git a/arduino/builder/testdata/TestLoadSketchFolderWrongMain/main.ino b/internal/arduino/builder/testdata/TestLoadSketchFolderWrongMain/main.ino similarity index 100% rename from arduino/builder/testdata/TestLoadSketchFolderWrongMain/main.ino rename to internal/arduino/builder/testdata/TestLoadSketchFolderWrongMain/main.ino diff --git a/arduino/builder/testdata/TestMergeSketchSources.txt b/internal/arduino/builder/testdata/TestMergeSketchSources.txt similarity index 100% rename from arduino/builder/testdata/TestMergeSketchSources.txt rename to internal/arduino/builder/testdata/TestMergeSketchSources.txt diff --git a/arduino/builder/testdata/TestMergeSketchSourcesArduinoIncluded/TestMergeSketchSourcesArduinoIncluded.ino b/internal/arduino/builder/testdata/TestMergeSketchSourcesArduinoIncluded/TestMergeSketchSourcesArduinoIncluded.ino similarity index 100% rename from arduino/builder/testdata/TestMergeSketchSourcesArduinoIncluded/TestMergeSketchSourcesArduinoIncluded.ino rename to internal/arduino/builder/testdata/TestMergeSketchSourcesArduinoIncluded/TestMergeSketchSourcesArduinoIncluded.ino diff --git a/arduino/builder/testdata/TestMergeSketchSources_win.txt b/internal/arduino/builder/testdata/TestMergeSketchSources_win.txt similarity index 100% rename from arduino/builder/testdata/TestMergeSketchSources_win.txt rename to internal/arduino/builder/testdata/TestMergeSketchSources_win.txt diff --git a/arduino/builder/testdata/TestSaveSketch.ino b/internal/arduino/builder/testdata/TestSaveSketch.ino similarity index 100% rename from arduino/builder/testdata/TestSaveSketch.ino rename to internal/arduino/builder/testdata/TestSaveSketch.ino diff --git a/arduino/builder/testdata/TestSketchWithIppFile/TestSketchWithIppFile.ino b/internal/arduino/builder/testdata/TestSketchWithIppFile/TestSketchWithIppFile.ino similarity index 100% rename from arduino/builder/testdata/TestSketchWithIppFile/TestSketchWithIppFile.ino rename to internal/arduino/builder/testdata/TestSketchWithIppFile/TestSketchWithIppFile.ino diff --git a/arduino/builder/testdata/TestSketchWithIppFile/template.ipp b/internal/arduino/builder/testdata/TestSketchWithIppFile/template.ipp similarity index 100% rename from arduino/builder/testdata/TestSketchWithIppFile/template.ipp rename to internal/arduino/builder/testdata/TestSketchWithIppFile/template.ipp diff --git a/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/TestSketchWithMarkdownAsciidocJson.ino b/internal/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/TestSketchWithMarkdownAsciidocJson.ino similarity index 100% rename from arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/TestSketchWithMarkdownAsciidocJson.ino rename to internal/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/TestSketchWithMarkdownAsciidocJson.ino diff --git a/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.adoc b/internal/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.adoc similarity index 100% rename from arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.adoc rename to internal/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.adoc diff --git a/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.json b/internal/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.json similarity index 100% rename from arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.json rename to internal/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.json diff --git a/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.md b/internal/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.md similarity index 100% rename from arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.md rename to internal/arduino/builder/testdata/TestSketchWithMarkdownAsciidocJson/foo.md diff --git a/arduino/builder/testdata/TestSketchWithTppFile/TestSketchWithTppFile.ino b/internal/arduino/builder/testdata/TestSketchWithTppFile/TestSketchWithTppFile.ino similarity index 100% rename from arduino/builder/testdata/TestSketchWithTppFile/TestSketchWithTppFile.ino rename to internal/arduino/builder/testdata/TestSketchWithTppFile/TestSketchWithTppFile.ino diff --git a/arduino/builder/testdata/TestSketchWithTppFile/template.tpp b/internal/arduino/builder/testdata/TestSketchWithTppFile/template.tpp similarity index 100% rename from arduino/builder/testdata/TestSketchWithTppFile/template.tpp rename to internal/arduino/builder/testdata/TestSketchWithTppFile/template.tpp diff --git a/arduino/cores/board.go b/internal/arduino/cores/board.go similarity index 100% rename from arduino/cores/board.go rename to internal/arduino/cores/board.go diff --git a/arduino/cores/board_test.go b/internal/arduino/cores/board_test.go similarity index 100% rename from arduino/cores/board_test.go rename to internal/arduino/cores/board_test.go diff --git a/arduino/cores/cores.go b/internal/arduino/cores/cores.go similarity index 98% rename from arduino/cores/cores.go rename to internal/arduino/cores/cores.go index 96b74f182bb..a9c4cc40bd6 100644 --- a/arduino/cores/cores.go +++ b/internal/arduino/cores/cores.go @@ -25,10 +25,10 @@ import ( "sort" "strings" - "github.com/arduino/arduino-cli/arduino/globals" - "github.com/arduino/arduino-cli/arduino/resources" - "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino/resources" + "github.com/arduino/arduino-cli/internal/arduino/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" diff --git a/arduino/cores/cores_test.go b/internal/arduino/cores/cores_test.go similarity index 100% rename from arduino/cores/cores_test.go rename to internal/arduino/cores/cores_test.go diff --git a/arduino/cores/fqbn.go b/internal/arduino/cores/fqbn.go similarity index 100% rename from arduino/cores/fqbn.go rename to internal/arduino/cores/fqbn.go diff --git a/arduino/cores/fqbn_test.go b/internal/arduino/cores/fqbn_test.go similarity index 100% rename from arduino/cores/fqbn_test.go rename to internal/arduino/cores/fqbn_test.go diff --git a/arduino/cores/packageindex/index.go b/internal/arduino/cores/packageindex/index.go similarity index 98% rename from arduino/cores/packageindex/index.go rename to internal/arduino/cores/packageindex/index.go index a54776f3bba..49930e3dedd 100644 --- a/arduino/cores/packageindex/index.go +++ b/internal/arduino/cores/packageindex/index.go @@ -19,10 +19,10 @@ import ( "encoding/json" "fmt" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/resources" - "github.com/arduino/arduino-cli/arduino/security" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/resources" + "github.com/arduino/arduino-cli/internal/arduino/security" "github.com/arduino/go-paths-helper" easyjson "github.com/mailru/easyjson" "github.com/sirupsen/logrus" diff --git a/arduino/cores/packageindex/index_easyjson.go b/internal/arduino/cores/packageindex/index_easyjson.go similarity index 100% rename from arduino/cores/packageindex/index_easyjson.go rename to internal/arduino/cores/packageindex/index_easyjson.go diff --git a/arduino/cores/packageindex/index_test.go b/internal/arduino/cores/packageindex/index_test.go similarity index 99% rename from arduino/cores/packageindex/index_test.go rename to internal/arduino/cores/packageindex/index_test.go index 8a2d5474693..cdc38022f21 100644 --- a/arduino/cores/packageindex/index_test.go +++ b/internal/arduino/cores/packageindex/index_test.go @@ -18,8 +18,8 @@ package packageindex import ( "testing" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/resources" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/resources" "github.com/arduino/go-paths-helper" "github.com/stretchr/testify/require" semver "go.bug.st/relaxed-semver" diff --git a/arduino/cores/packageindex/testdata/links b/internal/arduino/cores/packageindex/testdata/links similarity index 100% rename from arduino/cores/packageindex/testdata/links rename to internal/arduino/cores/packageindex/testdata/links diff --git a/arduino/cores/packageindex/testdata/package_LowPowerLab_index.json b/internal/arduino/cores/packageindex/testdata/package_LowPowerLab_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_LowPowerLab_index.json rename to internal/arduino/cores/packageindex/testdata/package_LowPowerLab_index.json diff --git a/arduino/cores/packageindex/testdata/package_MCUdude_MegaCore_index.json b/internal/arduino/cores/packageindex/testdata/package_MCUdude_MegaCore_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_MCUdude_MegaCore_index.json rename to internal/arduino/cores/packageindex/testdata/package_MCUdude_MegaCore_index.json diff --git a/arduino/cores/packageindex/testdata/package_MCUdude_MegaCore_index.json.1 b/internal/arduino/cores/packageindex/testdata/package_MCUdude_MegaCore_index.json.1 similarity index 100% rename from arduino/cores/packageindex/testdata/package_MCUdude_MegaCore_index.json.1 rename to internal/arduino/cores/packageindex/testdata/package_MCUdude_MegaCore_index.json.1 diff --git a/arduino/cores/packageindex/testdata/package_MCUdude_MicroCore_index.json b/internal/arduino/cores/packageindex/testdata/package_MCUdude_MicroCore_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_MCUdude_MicroCore_index.json rename to internal/arduino/cores/packageindex/testdata/package_MCUdude_MicroCore_index.json diff --git a/arduino/cores/packageindex/testdata/package_MCUdude_MightyCore_index.json b/internal/arduino/cores/packageindex/testdata/package_MCUdude_MightyCore_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_MCUdude_MightyCore_index.json rename to internal/arduino/cores/packageindex/testdata/package_MCUdude_MightyCore_index.json diff --git a/arduino/cores/packageindex/testdata/package_MCUdude_MightyCore_index.json.1 b/internal/arduino/cores/packageindex/testdata/package_MCUdude_MightyCore_index.json.1 similarity index 100% rename from arduino/cores/packageindex/testdata/package_MCUdude_MightyCore_index.json.1 rename to internal/arduino/cores/packageindex/testdata/package_MCUdude_MightyCore_index.json.1 diff --git a/arduino/cores/packageindex/testdata/package_MCUdude_MiniCore_index.json b/internal/arduino/cores/packageindex/testdata/package_MCUdude_MiniCore_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_MCUdude_MiniCore_index.json rename to internal/arduino/cores/packageindex/testdata/package_MCUdude_MiniCore_index.json diff --git a/arduino/cores/packageindex/testdata/package_MattairTech_index.json b/internal/arduino/cores/packageindex/testdata/package_MattairTech_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_MattairTech_index.json rename to internal/arduino/cores/packageindex/testdata/package_MattairTech_index.json diff --git a/arduino/cores/packageindex/testdata/package_NicoHood_HoodLoader2_index.json b/internal/arduino/cores/packageindex/testdata/package_NicoHood_HoodLoader2_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_NicoHood_HoodLoader2_index.json rename to internal/arduino/cores/packageindex/testdata/package_NicoHood_HoodLoader2_index.json diff --git a/arduino/cores/packageindex/testdata/package_XMegaForArduino_index.json b/internal/arduino/cores/packageindex/testdata/package_XMegaForArduino_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_XMegaForArduino_index.json rename to internal/arduino/cores/packageindex/testdata/package_XMegaForArduino_index.json diff --git a/arduino/cores/packageindex/testdata/package_Zoubworld_index.json b/internal/arduino/cores/packageindex/testdata/package_Zoubworld_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_Zoubworld_index.json rename to internal/arduino/cores/packageindex/testdata/package_Zoubworld_index.json diff --git a/arduino/cores/packageindex/testdata/package_adafruit_index.json b/internal/arduino/cores/packageindex/testdata/package_adafruit_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_adafruit_index.json rename to internal/arduino/cores/packageindex/testdata/package_adafruit_index.json diff --git a/arduino/cores/packageindex/testdata/package_akafugu_index.json b/internal/arduino/cores/packageindex/testdata/package_akafugu_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_akafugu_index.json rename to internal/arduino/cores/packageindex/testdata/package_akafugu_index.json diff --git a/arduino/cores/packageindex/testdata/package_aloriumtech_index.json b/internal/arduino/cores/packageindex/testdata/package_aloriumtech_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_aloriumtech_index.json rename to internal/arduino/cores/packageindex/testdata/package_aloriumtech_index.json diff --git a/arduino/cores/packageindex/testdata/package_arachnidlabs.com_boards_index.json b/internal/arduino/cores/packageindex/testdata/package_arachnidlabs.com_boards_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_arachnidlabs.com_boards_index.json rename to internal/arduino/cores/packageindex/testdata/package_arachnidlabs.com_boards_index.json diff --git a/arduino/cores/packageindex/testdata/package_ardhat_index.json b/internal/arduino/cores/packageindex/testdata/package_ardhat_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_ardhat_index.json rename to internal/arduino/cores/packageindex/testdata/package_ardhat_index.json diff --git a/arduino/cores/packageindex/testdata/package_arduboy_index.json b/internal/arduino/cores/packageindex/testdata/package_arduboy_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_arduboy_index.json rename to internal/arduino/cores/packageindex/testdata/package_arduboy_index.json diff --git a/arduino/cores/packageindex/testdata/package_arrow_index.json b/internal/arduino/cores/packageindex/testdata/package_arrow_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_arrow_index.json rename to internal/arduino/cores/packageindex/testdata/package_arrow_index.json diff --git a/arduino/cores/packageindex/testdata/package_atflash_index.json b/internal/arduino/cores/packageindex/testdata/package_atflash_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_atflash_index.json rename to internal/arduino/cores/packageindex/testdata/package_atflash_index.json diff --git a/arduino/cores/packageindex/testdata/package_avdweb_nl_index.json b/internal/arduino/cores/packageindex/testdata/package_avdweb_nl_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_avdweb_nl_index.json rename to internal/arduino/cores/packageindex/testdata/package_avdweb_nl_index.json diff --git a/arduino/cores/packageindex/testdata/package_canique_index.json b/internal/arduino/cores/packageindex/testdata/package_canique_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_canique_index.json rename to internal/arduino/cores/packageindex/testdata/package_canique_index.json diff --git a/arduino/cores/packageindex/testdata/package_carlosefr_atmega_index.json b/internal/arduino/cores/packageindex/testdata/package_carlosefr_atmega_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_carlosefr_atmega_index.json rename to internal/arduino/cores/packageindex/testdata/package_carlosefr_atmega_index.json diff --git a/arduino/cores/packageindex/testdata/package_chipkit_index.json b/internal/arduino/cores/packageindex/testdata/package_chipkit_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_chipkit_index.json rename to internal/arduino/cores/packageindex/testdata/package_chipkit_index.json diff --git a/arduino/cores/packageindex/testdata/package_chipkit_index.json.1 b/internal/arduino/cores/packageindex/testdata/package_chipkit_index.json.1 similarity index 100% rename from arduino/cores/packageindex/testdata/package_chipkit_index.json.1 rename to internal/arduino/cores/packageindex/testdata/package_chipkit_index.json.1 diff --git a/arduino/cores/packageindex/testdata/package_clkdiv8_index.json b/internal/arduino/cores/packageindex/testdata/package_clkdiv8_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_clkdiv8_index.json rename to internal/arduino/cores/packageindex/testdata/package_clkdiv8_index.json diff --git a/arduino/cores/packageindex/testdata/package_codebendercc_ariadne-bootloader_index.json b/internal/arduino/cores/packageindex/testdata/package_codebendercc_ariadne-bootloader_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_codebendercc_ariadne-bootloader_index.json rename to internal/arduino/cores/packageindex/testdata/package_codebendercc_ariadne-bootloader_index.json diff --git a/arduino/cores/packageindex/testdata/package_cosa_index.json b/internal/arduino/cores/packageindex/testdata/package_cosa_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_cosa_index.json rename to internal/arduino/cores/packageindex/testdata/package_cosa_index.json diff --git a/arduino/cores/packageindex/testdata/package_cytron_index.json b/internal/arduino/cores/packageindex/testdata/package_cytron_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_cytron_index.json rename to internal/arduino/cores/packageindex/testdata/package_cytron_index.json diff --git a/arduino/cores/packageindex/testdata/package_damellis_attiny_index.json b/internal/arduino/cores/packageindex/testdata/package_damellis_attiny_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_damellis_attiny_index.json rename to internal/arduino/cores/packageindex/testdata/package_damellis_attiny_index.json diff --git a/arduino/cores/packageindex/testdata/package_dfrobot_index.json.invalid b/internal/arduino/cores/packageindex/testdata/package_dfrobot_index.json.invalid similarity index 100% rename from arduino/cores/packageindex/testdata/package_dfrobot_index.json.invalid rename to internal/arduino/cores/packageindex/testdata/package_dfrobot_index.json.invalid diff --git a/arduino/cores/packageindex/testdata/package_dfrobot_iot_mainboard.json.invalid b/internal/arduino/cores/packageindex/testdata/package_dfrobot_iot_mainboard.json.invalid similarity index 100% rename from arduino/cores/packageindex/testdata/package_dfrobot_iot_mainboard.json.invalid rename to internal/arduino/cores/packageindex/testdata/package_dfrobot_iot_mainboard.json.invalid diff --git a/arduino/cores/packageindex/testdata/package_digistump_index.json b/internal/arduino/cores/packageindex/testdata/package_digistump_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_digistump_index.json rename to internal/arduino/cores/packageindex/testdata/package_digistump_index.json diff --git a/arduino/cores/packageindex/testdata/package_drazzy.com_index.json b/internal/arduino/cores/packageindex/testdata/package_drazzy.com_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_drazzy.com_index.json rename to internal/arduino/cores/packageindex/testdata/package_drazzy.com_index.json diff --git a/arduino/cores/packageindex/testdata/package_dwengo.org_dwenguino_index.json b/internal/arduino/cores/packageindex/testdata/package_dwengo.org_dwenguino_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_dwengo.org_dwenguino_index.json rename to internal/arduino/cores/packageindex/testdata/package_dwengo.org_dwenguino_index.json diff --git a/arduino/cores/packageindex/testdata/package_elektor-labs.com_ide-1.6.5_index.json b/internal/arduino/cores/packageindex/testdata/package_elektor-labs.com_ide-1.6.5_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_elektor-labs.com_ide-1.6.5_index.json rename to internal/arduino/cores/packageindex/testdata/package_elektor-labs.com_ide-1.6.5_index.json diff --git a/arduino/cores/packageindex/testdata/package_elektor-labs.com_ide-1.6.6_index.json b/internal/arduino/cores/packageindex/testdata/package_elektor-labs.com_ide-1.6.6_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_elektor-labs.com_ide-1.6.6_index.json rename to internal/arduino/cores/packageindex/testdata/package_elektor-labs.com_ide-1.6.6_index.json diff --git a/arduino/cores/packageindex/testdata/package_engimusing_modules_index.json b/internal/arduino/cores/packageindex/testdata/package_engimusing_modules_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_engimusing_modules_index.json rename to internal/arduino/cores/packageindex/testdata/package_engimusing_modules_index.json diff --git a/arduino/cores/packageindex/testdata/package_esp32_index.json b/internal/arduino/cores/packageindex/testdata/package_esp32_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_esp32_index.json rename to internal/arduino/cores/packageindex/testdata/package_esp32_index.json diff --git a/arduino/cores/packageindex/testdata/package_esp32_index.json.1 b/internal/arduino/cores/packageindex/testdata/package_esp32_index.json.1 similarity index 100% rename from arduino/cores/packageindex/testdata/package_esp32_index.json.1 rename to internal/arduino/cores/packageindex/testdata/package_esp32_index.json.1 diff --git a/arduino/cores/packageindex/testdata/package_esp32_index.json.2 b/internal/arduino/cores/packageindex/testdata/package_esp32_index.json.2 similarity index 100% rename from arduino/cores/packageindex/testdata/package_esp32_index.json.2 rename to internal/arduino/cores/packageindex/testdata/package_esp32_index.json.2 diff --git a/arduino/cores/packageindex/testdata/package_esp8266com_index.json b/internal/arduino/cores/packageindex/testdata/package_esp8266com_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_esp8266com_index.json rename to internal/arduino/cores/packageindex/testdata/package_esp8266com_index.json diff --git a/arduino/cores/packageindex/testdata/package_femtocow_attiny_index.json b/internal/arduino/cores/packageindex/testdata/package_femtocow_attiny_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_femtocow_attiny_index.json rename to internal/arduino/cores/packageindex/testdata/package_femtocow_attiny_index.json diff --git a/arduino/cores/packageindex/testdata/package_ftduino_index.json b/internal/arduino/cores/packageindex/testdata/package_ftduino_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_ftduino_index.json rename to internal/arduino/cores/packageindex/testdata/package_ftduino_index.json diff --git a/arduino/cores/packageindex/testdata/package_goldilocks_index.json b/internal/arduino/cores/packageindex/testdata/package_goldilocks_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_goldilocks_index.json rename to internal/arduino/cores/packageindex/testdata/package_goldilocks_index.json diff --git a/arduino/cores/packageindex/testdata/package_hidnseek_boot_index.json b/internal/arduino/cores/packageindex/testdata/package_hidnseek_boot_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_hidnseek_boot_index.json rename to internal/arduino/cores/packageindex/testdata/package_hidnseek_boot_index.json diff --git a/arduino/cores/packageindex/testdata/package_infineon_index.json b/internal/arduino/cores/packageindex/testdata/package_infineon_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_infineon_index.json rename to internal/arduino/cores/packageindex/testdata/package_infineon_index.json diff --git a/arduino/cores/packageindex/testdata/package_intorobot_index.json b/internal/arduino/cores/packageindex/testdata/package_intorobot_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_intorobot_index.json rename to internal/arduino/cores/packageindex/testdata/package_intorobot_index.json diff --git a/arduino/cores/packageindex/testdata/package_iot2000_index.json b/internal/arduino/cores/packageindex/testdata/package_iot2000_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_iot2000_index.json rename to internal/arduino/cores/packageindex/testdata/package_iot2000_index.json diff --git a/arduino/cores/packageindex/testdata/package_iotcore_ide-1.6.6_index.json b/internal/arduino/cores/packageindex/testdata/package_iotcore_ide-1.6.6_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_iotcore_ide-1.6.6_index.json rename to internal/arduino/cores/packageindex/testdata/package_iotcore_ide-1.6.6_index.json diff --git a/arduino/cores/packageindex/testdata/package_ioteam_index.json b/internal/arduino/cores/packageindex/testdata/package_ioteam_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_ioteam_index.json rename to internal/arduino/cores/packageindex/testdata/package_ioteam_index.json diff --git a/arduino/cores/packageindex/testdata/package_iteaduino_lite_index.json b/internal/arduino/cores/packageindex/testdata/package_iteaduino_lite_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_iteaduino_lite_index.json rename to internal/arduino/cores/packageindex/testdata/package_iteaduino_lite_index.json diff --git a/arduino/cores/packageindex/testdata/package_konekt_index.json b/internal/arduino/cores/packageindex/testdata/package_konekt_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_konekt_index.json rename to internal/arduino/cores/packageindex/testdata/package_konekt_index.json diff --git a/arduino/cores/packageindex/testdata/package_lattuino_index.json b/internal/arduino/cores/packageindex/testdata/package_lattuino_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_lattuino_index.json rename to internal/arduino/cores/packageindex/testdata/package_lattuino_index.json diff --git a/arduino/cores/packageindex/testdata/package_lauszus_sanguino_index.json b/internal/arduino/cores/packageindex/testdata/package_lauszus_sanguino_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_lauszus_sanguino_index.json rename to internal/arduino/cores/packageindex/testdata/package_lauszus_sanguino_index.json diff --git a/arduino/cores/packageindex/testdata/package_leonardomiliani.com_index.json b/internal/arduino/cores/packageindex/testdata/package_leonardomiliani.com_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_leonardomiliani.com_index.json rename to internal/arduino/cores/packageindex/testdata/package_leonardomiliani.com_index.json diff --git a/arduino/cores/packageindex/testdata/package_macchina_index.json b/internal/arduino/cores/packageindex/testdata/package_macchina_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_macchina_index.json rename to internal/arduino/cores/packageindex/testdata/package_macchina_index.json diff --git a/arduino/cores/packageindex/testdata/package_maxim_index.json b/internal/arduino/cores/packageindex/testdata/package_maxim_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_maxim_index.json rename to internal/arduino/cores/packageindex/testdata/package_maxim_index.json diff --git a/arduino/cores/packageindex/testdata/package_mkr1000_index.json b/internal/arduino/cores/packageindex/testdata/package_mkr1000_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_mkr1000_index.json rename to internal/arduino/cores/packageindex/testdata/package_mkr1000_index.json diff --git a/arduino/cores/packageindex/testdata/package_mtk_linkit_index.json b/internal/arduino/cores/packageindex/testdata/package_mtk_linkit_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_mtk_linkit_index.json rename to internal/arduino/cores/packageindex/testdata/package_mtk_linkit_index.json diff --git a/arduino/cores/packageindex/testdata/package_mtk_linkit_smart_7688_index.json b/internal/arduino/cores/packageindex/testdata/package_mtk_linkit_smart_7688_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_mtk_linkit_smart_7688_index.json rename to internal/arduino/cores/packageindex/testdata/package_mtk_linkit_smart_7688_index.json diff --git a/arduino/cores/packageindex/testdata/package_nRF5_boards_index.json b/internal/arduino/cores/packageindex/testdata/package_nRF5_boards_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_nRF5_boards_index.json rename to internal/arduino/cores/packageindex/testdata/package_nRF5_boards_index.json diff --git a/arduino/cores/packageindex/testdata/package_navspark_index.json b/internal/arduino/cores/packageindex/testdata/package_navspark_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_navspark_index.json rename to internal/arduino/cores/packageindex/testdata/package_navspark_index.json diff --git a/arduino/cores/packageindex/testdata/package_olimex_avr_index.json b/internal/arduino/cores/packageindex/testdata/package_olimex_avr_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_olimex_avr_index.json rename to internal/arduino/cores/packageindex/testdata/package_olimex_avr_index.json diff --git a/arduino/cores/packageindex/testdata/package_olimex_pic_index.json b/internal/arduino/cores/packageindex/testdata/package_olimex_pic_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_olimex_pic_index.json rename to internal/arduino/cores/packageindex/testdata/package_olimex_pic_index.json diff --git a/arduino/cores/packageindex/testdata/package_olimex_stm_index.json b/internal/arduino/cores/packageindex/testdata/package_olimex_stm_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_olimex_stm_index.json rename to internal/arduino/cores/packageindex/testdata/package_olimex_stm_index.json diff --git a/arduino/cores/packageindex/testdata/package_omc_index.json b/internal/arduino/cores/packageindex/testdata/package_omc_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_omc_index.json rename to internal/arduino/cores/packageindex/testdata/package_omc_index.json diff --git a/arduino/cores/packageindex/testdata/package_openpanzer_index.json b/internal/arduino/cores/packageindex/testdata/package_openpanzer_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_openpanzer_index.json rename to internal/arduino/cores/packageindex/testdata/package_openpanzer_index.json diff --git a/arduino/cores/packageindex/testdata/package_opentracker_index.json b/internal/arduino/cores/packageindex/testdata/package_opentracker_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_opentracker_index.json rename to internal/arduino/cores/packageindex/testdata/package_opentracker_index.json diff --git a/arduino/cores/packageindex/testdata/package_oshlab_breadboard_index.json b/internal/arduino/cores/packageindex/testdata/package_oshlab_breadboard_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_oshlab_breadboard_index.json rename to internal/arduino/cores/packageindex/testdata/package_oshlab_breadboard_index.json diff --git a/arduino/cores/packageindex/testdata/package_panstamp_index.json b/internal/arduino/cores/packageindex/testdata/package_panstamp_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_panstamp_index.json rename to internal/arduino/cores/packageindex/testdata/package_panstamp_index.json diff --git a/arduino/cores/packageindex/testdata/package_per1234_wirino_index.json b/internal/arduino/cores/packageindex/testdata/package_per1234_wirino_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_per1234_wirino_index.json rename to internal/arduino/cores/packageindex/testdata/package_per1234_wirino_index.json diff --git a/arduino/cores/packageindex/testdata/package_project_laika.com_index.json b/internal/arduino/cores/packageindex/testdata/package_project_laika.com_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_project_laika.com_index.json rename to internal/arduino/cores/packageindex/testdata/package_project_laika.com_index.json diff --git a/arduino/cores/packageindex/testdata/package_quirkbot.com_index.json b/internal/arduino/cores/packageindex/testdata/package_quirkbot.com_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_quirkbot.com_index.json rename to internal/arduino/cores/packageindex/testdata/package_quirkbot.com_index.json diff --git a/arduino/cores/packageindex/testdata/package_radino_radino32_index.json b/internal/arduino/cores/packageindex/testdata/package_radino_radino32_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_radino_radino32_index.json rename to internal/arduino/cores/packageindex/testdata/package_radino_radino32_index.json diff --git a/arduino/cores/packageindex/testdata/package_realtek.com_ameba_index.json b/internal/arduino/cores/packageindex/testdata/package_realtek.com_ameba_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_realtek.com_ameba_index.json rename to internal/arduino/cores/packageindex/testdata/package_realtek.com_ameba_index.json diff --git a/arduino/cores/packageindex/testdata/package_redbear_index.json.tobefixed b/internal/arduino/cores/packageindex/testdata/package_redbear_index.json.tobefixed similarity index 100% rename from arduino/cores/packageindex/testdata/package_redbear_index.json.tobefixed rename to internal/arduino/cores/packageindex/testdata/package_redbear_index.json.tobefixed diff --git a/arduino/cores/packageindex/testdata/package_redbearlab_index.json b/internal/arduino/cores/packageindex/testdata/package_redbearlab_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_redbearlab_index.json rename to internal/arduino/cores/packageindex/testdata/package_redbearlab_index.json diff --git a/arduino/cores/packageindex/testdata/package_rfduino_index.json b/internal/arduino/cores/packageindex/testdata/package_rfduino_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_rfduino_index.json rename to internal/arduino/cores/packageindex/testdata/package_rfduino_index.json diff --git a/arduino/cores/packageindex/testdata/package_rig_index.json b/internal/arduino/cores/packageindex/testdata/package_rig_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_rig_index.json rename to internal/arduino/cores/packageindex/testdata/package_rig_index.json diff --git a/arduino/cores/packageindex/testdata/package_rnc_index.json b/internal/arduino/cores/packageindex/testdata/package_rnc_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_rnc_index.json rename to internal/arduino/cores/packageindex/testdata/package_rnc_index.json diff --git a/arduino/cores/packageindex/testdata/package_seeeduino_index.json b/internal/arduino/cores/packageindex/testdata/package_seeeduino_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_seeeduino_index.json rename to internal/arduino/cores/packageindex/testdata/package_seeeduino_index.json diff --git a/arduino/cores/packageindex/testdata/package_simba_avr_index.json b/internal/arduino/cores/packageindex/testdata/package_simba_avr_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_simba_avr_index.json rename to internal/arduino/cores/packageindex/testdata/package_simba_avr_index.json diff --git a/arduino/cores/packageindex/testdata/package_simba_esp_index.json b/internal/arduino/cores/packageindex/testdata/package_simba_esp_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_simba_esp_index.json rename to internal/arduino/cores/packageindex/testdata/package_simba_esp_index.json diff --git a/arduino/cores/packageindex/testdata/package_simba_sam_index.json b/internal/arduino/cores/packageindex/testdata/package_simba_sam_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_simba_sam_index.json rename to internal/arduino/cores/packageindex/testdata/package_simba_sam_index.json diff --git a/arduino/cores/packageindex/testdata/package_sodaq_index.json b/internal/arduino/cores/packageindex/testdata/package_sodaq_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_sodaq_index.json rename to internal/arduino/cores/packageindex/testdata/package_sodaq_index.json diff --git a/arduino/cores/packageindex/testdata/package_sodaq_samd_index.json b/internal/arduino/cores/packageindex/testdata/package_sodaq_samd_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_sodaq_samd_index.json rename to internal/arduino/cores/packageindex/testdata/package_sodaq_samd_index.json diff --git a/arduino/cores/packageindex/testdata/package_sparkfun_index.json b/internal/arduino/cores/packageindex/testdata/package_sparkfun_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_sparkfun_index.json rename to internal/arduino/cores/packageindex/testdata/package_sparkfun_index.json diff --git a/arduino/cores/packageindex/testdata/package_stm_index.json b/internal/arduino/cores/packageindex/testdata/package_stm_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_stm_index.json rename to internal/arduino/cores/packageindex/testdata/package_stm_index.json diff --git a/arduino/cores/packageindex/testdata/package_talk2.wisen.com_index.json b/internal/arduino/cores/packageindex/testdata/package_talk2.wisen.com_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_talk2.wisen.com_index.json rename to internal/arduino/cores/packageindex/testdata/package_talk2.wisen.com_index.json diff --git a/arduino/cores/packageindex/testdata/package_thomasonw_ATmegaxxM1-C1_index.json b/internal/arduino/cores/packageindex/testdata/package_thomasonw_ATmegaxxM1-C1_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_thomasonw_ATmegaxxM1-C1_index.json rename to internal/arduino/cores/packageindex/testdata/package_thomasonw_ATmegaxxM1-C1_index.json diff --git a/arduino/cores/packageindex/testdata/package_tkj_balanduino_index.json b/internal/arduino/cores/packageindex/testdata/package_tkj_balanduino_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_tkj_balanduino_index.json rename to internal/arduino/cores/packageindex/testdata/package_tkj_balanduino_index.json diff --git a/arduino/cores/packageindex/testdata/package_tl7788_index.json b/internal/arduino/cores/packageindex/testdata/package_tl7788_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_tl7788_index.json rename to internal/arduino/cores/packageindex/testdata/package_tl7788_index.json diff --git a/arduino/cores/packageindex/testdata/package_udoo_index.json b/internal/arduino/cores/packageindex/testdata/package_udoo_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_udoo_index.json rename to internal/arduino/cores/packageindex/testdata/package_udoo_index.json diff --git a/arduino/cores/packageindex/testdata/package_zevero_avr_boot_index.json b/internal/arduino/cores/packageindex/testdata/package_zevero_avr_boot_index.json similarity index 100% rename from arduino/cores/packageindex/testdata/package_zevero_avr_boot_index.json rename to internal/arduino/cores/packageindex/testdata/package_zevero_avr_boot_index.json diff --git a/arduino/cores/packagemanager/download.go b/internal/arduino/cores/packagemanager/download.go similarity index 98% rename from arduino/cores/packagemanager/download.go rename to internal/arduino/cores/packagemanager/download.go index 43d13c11ea0..89282c97992 100644 --- a/arduino/cores/packagemanager/download.go +++ b/internal/arduino/cores/packagemanager/download.go @@ -18,8 +18,8 @@ package packagemanager import ( "fmt" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/pkg/errors" "go.bug.st/downloader/v2" diff --git a/arduino/cores/packagemanager/identify.go b/internal/arduino/cores/packagemanager/identify.go similarity index 96% rename from arduino/cores/packagemanager/identify.go rename to internal/arduino/cores/packagemanager/identify.go index 22d8382cd67..6b84495dc58 100644 --- a/arduino/cores/packagemanager/identify.go +++ b/internal/arduino/cores/packagemanager/identify.go @@ -16,7 +16,7 @@ package packagemanager import ( - "github.com/arduino/arduino-cli/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores" properties "github.com/arduino/go-properties-orderedmap" ) diff --git a/arduino/cores/packagemanager/install_uninstall.go b/internal/arduino/cores/packagemanager/install_uninstall.go similarity index 98% rename from arduino/cores/packagemanager/install_uninstall.go rename to internal/arduino/cores/packagemanager/install_uninstall.go index 2ea4adc9304..49d6b00b57c 100644 --- a/arduino/cores/packagemanager/install_uninstall.go +++ b/internal/arduino/cores/packagemanager/install_uninstall.go @@ -21,9 +21,9 @@ import ( "fmt" "runtime" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/cores/packageindex" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores/packageindex" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/pkg/errors" diff --git a/arduino/cores/packagemanager/loader.go b/internal/arduino/cores/packagemanager/loader.go similarity index 99% rename from arduino/cores/packagemanager/loader.go rename to internal/arduino/cores/packagemanager/loader.go index 464d027b7ec..7d0799f2cc7 100644 --- a/arduino/cores/packagemanager/loader.go +++ b/internal/arduino/cores/packagemanager/loader.go @@ -23,9 +23,9 @@ import ( "strconv" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/discovery" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/discovery" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" diff --git a/arduino/cores/packagemanager/loader_test.go b/internal/arduino/cores/packagemanager/loader_test.go similarity index 100% rename from arduino/cores/packagemanager/loader_test.go rename to internal/arduino/cores/packagemanager/loader_test.go diff --git a/arduino/cores/packagemanager/package_manager.go b/internal/arduino/cores/packagemanager/package_manager.go similarity index 98% rename from arduino/cores/packagemanager/package_manager.go rename to internal/arduino/cores/packagemanager/package_manager.go index 1f2b380e08a..32117e0c249 100644 --- a/arduino/cores/packagemanager/package_manager.go +++ b/internal/arduino/cores/packagemanager/package_manager.go @@ -26,12 +26,12 @@ import ( "sync" "time" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/cores/packageindex" - "github.com/arduino/arduino-cli/arduino/discovery/discoverymanager" - "github.com/arduino/arduino-cli/arduino/sketch" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores/packageindex" + "github.com/arduino/arduino-cli/internal/arduino/discovery/discoverymanager" + "github.com/arduino/arduino-cli/internal/arduino/sketch" paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" "github.com/arduino/go-timeutils" diff --git a/arduino/cores/packagemanager/package_manager_test.go b/internal/arduino/cores/packagemanager/package_manager_test.go similarity index 99% rename from arduino/cores/packagemanager/package_manager_test.go rename to internal/arduino/cores/packagemanager/package_manager_test.go index 65c1452c791..055a6d332d0 100644 --- a/arduino/cores/packagemanager/package_manager_test.go +++ b/internal/arduino/cores/packagemanager/package_manager_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/arduino/arduino-cli/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" diff --git a/arduino/cores/packagemanager/profiles.go b/internal/arduino/cores/packagemanager/profiles.go similarity index 96% rename from arduino/cores/packagemanager/profiles.go rename to internal/arduino/cores/packagemanager/profiles.go index a7c16fb7f70..7c5eab5de44 100644 --- a/arduino/cores/packagemanager/profiles.go +++ b/internal/arduino/cores/packagemanager/profiles.go @@ -19,11 +19,11 @@ import ( "fmt" "net/url" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/globals" - "github.com/arduino/arduino-cli/arduino/resources" - "github.com/arduino/arduino-cli/arduino/sketch" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino/resources" + "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" diff --git a/arduino/cores/packagemanager/testdata/.gitignore b/internal/arduino/cores/packagemanager/testdata/.gitignore similarity index 100% rename from arduino/cores/packagemanager/testdata/.gitignore rename to internal/arduino/cores/packagemanager/testdata/.gitignore diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/arduino/avr/boards.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/arduino/avr/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/arduino/avr/boards.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/arduino/avr/boards.txt diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/arduino/sam/boards.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/arduino/sam/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/arduino/sam/boards.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/arduino/sam/boards.txt diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/arduino/sam/platform.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/arduino/sam/platform.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/arduino/sam/platform.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/arduino/sam/platform.txt diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/esp8266/esp8266/boards.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/esp8266/esp8266/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/esp8266/esp8266/boards.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/esp8266/esp8266/boards.txt diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/boards.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/boards.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/boards.txt diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex b/internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/SPI.cpp b/internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/SPI.cpp similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/SPI.cpp rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/SPI.cpp diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/SPI.h b/internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/SPI.h similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/SPI.h rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/SPI.h diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino b/internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino b/internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/keywords.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/keywords.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/keywords.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/keywords.txt diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/library.properties b/internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/library.properties similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/library.properties rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/libraries/SPI/library.properties diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/platform.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/platform.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/platform.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/my_avr_platform/avr/platform.txt diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/test/avr/boards.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/test/avr/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/test/avr/boards.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/test/avr/boards.txt diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/boards.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/boards.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/boards.txt diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/platform.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/platform.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/platform.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/platform.txt diff --git a/arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/programmers.txt b/internal/arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/programmers.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/programmers.txt rename to internal/arduino/cores/packagemanager/testdata/custom_hardware/watterott/avr/programmers.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/package_adafruit_index.json b/internal/arduino/cores/packagemanager/testdata/data_dir_1/package_adafruit_index.json similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/package_adafruit_index.json rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/package_adafruit_index.json diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/package_esp32_index.json b/internal/arduino/cores/packagemanager/testdata/data_dir_1/package_esp32_index.json similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/package_esp32_index.json rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/package_esp32_index.json diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/package_esp8266com_index.json b/internal/arduino/cores/packagemanager/testdata/data_dir_1/package_esp8266com_index.json similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/package_esp8266com_index.json rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/package_esp8266com_index.json diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/package_test_index.json b/internal/arduino/cores/packagemanager/testdata/data_dir_1/package_test_index.json similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/package_test_index.json rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/package_test_index.json diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/boards.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/boards.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/boards.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/keywords.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/keywords.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/keywords.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/keywords.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/platform.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/platform.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/platform.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/platform.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/programmers.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/programmers.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/programmers.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/adafruit/hardware/samd/1.5.3/programmers.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/boards.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/boards.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/boards.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/platform.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/platform.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/platform.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/platform.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/programmers.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/programmers.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/programmers.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/hardware/avr/1.8.3/programmers.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/CMSIS-Atmel/1.2.0/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/CMSIS-Atmel/1.2.0/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/CMSIS-Atmel/1.2.0/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/CMSIS-Atmel/1.2.0/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/CMSIS/4.5.0/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/CMSIS/4.5.0/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/CMSIS/4.5.0/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/CMSIS/4.5.0/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/arm-none-eabi-gcc/4.8.3-2014q1/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/arm-none-eabi-gcc/4.8.3-2014q1/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/arm-none-eabi-gcc/4.8.3-2014q1/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/arm-none-eabi-gcc/4.8.3-2014q1/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/bossac/1.7.0/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/bossac/1.7.0/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/bossac/1.7.0/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/bossac/1.7.0/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/bossac/1.8.0-48-gb176eee/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/bossac/1.8.0-48-gb176eee/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/bossac/1.8.0-48-gb176eee/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/bossac/1.8.0-48-gb176eee/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/openocd/0.9.0-arduino/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/openocd/0.9.0-arduino/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/openocd/0.9.0-arduino/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/arduino/tools/openocd/0.9.0-arduino/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/boards.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/boards.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/boards.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/platform.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/platform.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/platform.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/platform.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/programmers.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/programmers.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/programmers.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/hardware/esp32/1.0.0/programmers.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/esptool/2.3.1/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/esptool/2.3.1/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/esptool/2.3.1/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/esptool/2.3.1/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/mkspiffs/0.2.3/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/mkspiffs/0.2.3/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/mkspiffs/0.2.3/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/mkspiffs/0.2.3/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/boards.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/boards.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/boards.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/platform.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/platform.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/platform.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/platform.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/programmers.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/programmers.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/programmers.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/hardware/esp8266/3.0.2/programmers.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/esptool/0.4.13/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/esptool/0.4.13/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/esptool/0.4.13/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/esptool/0.4.13/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/mkspiffs/0.2.0/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/mkspiffs/0.2.0/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/mkspiffs/0.2.0/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/mkspiffs/0.2.0/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/test/hardware/avr/1.1.0/boards.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/test/hardware/avr/1.1.0/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/test/hardware/avr/1.1.0/boards.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/test/hardware/avr/1.1.0/boards.txt diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/test/tools/bossac/1.7.5/.keep b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/test/tools/bossac/1.7.5/.keep similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/test/tools/bossac/1.7.5/.keep rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/test/tools/bossac/1.7.5/.keep diff --git a/arduino/cores/packagemanager/testdata/data_dir_1/packages/test2/hardware/avr/1.0.0/boards.txt b/internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/test2/hardware/avr/1.0.0/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/data_dir_1/packages/test2/hardware/avr/1.0.0/boards.txt rename to internal/arduino/cores/packagemanager/testdata/data_dir_1/packages/test2/hardware/avr/1.0.0/boards.txt diff --git a/arduino/cores/packagemanager/testdata/extra_hardware/referenced/avr/boards.txt b/internal/arduino/cores/packagemanager/testdata/extra_hardware/referenced/avr/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/extra_hardware/referenced/avr/boards.txt rename to internal/arduino/cores/packagemanager/testdata/extra_hardware/referenced/avr/boards.txt diff --git a/arduino/cores/packagemanager/testdata/extra_hardware/referenced/samd/boards.txt b/internal/arduino/cores/packagemanager/testdata/extra_hardware/referenced/samd/boards.txt similarity index 100% rename from arduino/cores/packagemanager/testdata/extra_hardware/referenced/samd/boards.txt rename to internal/arduino/cores/packagemanager/testdata/extra_hardware/referenced/samd/boards.txt diff --git a/arduino/cores/packagemanager/testdata/package_tooltest_index.json b/internal/arduino/cores/packagemanager/testdata/package_tooltest_index.json similarity index 100% rename from arduino/cores/packagemanager/testdata/package_tooltest_index.json rename to internal/arduino/cores/packagemanager/testdata/package_tooltest_index.json diff --git a/arduino/cores/programmers.go b/internal/arduino/cores/programmers.go similarity index 100% rename from arduino/cores/programmers.go rename to internal/arduino/cores/programmers.go diff --git a/arduino/cores/status.go b/internal/arduino/cores/status.go similarity index 100% rename from arduino/cores/status.go rename to internal/arduino/cores/status.go diff --git a/arduino/cores/tools.go b/internal/arduino/cores/tools.go similarity index 99% rename from arduino/cores/tools.go rename to internal/arduino/cores/tools.go index 616e80090a3..3648119c483 100644 --- a/arduino/cores/tools.go +++ b/internal/arduino/cores/tools.go @@ -19,7 +19,7 @@ import ( "regexp" "runtime" - "github.com/arduino/arduino-cli/arduino/resources" + "github.com/arduino/arduino-cli/internal/arduino/resources" "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" semver "go.bug.st/relaxed-semver" diff --git a/arduino/cores/tools_test.go b/internal/arduino/cores/tools_test.go similarity index 99% rename from arduino/cores/tools_test.go rename to internal/arduino/cores/tools_test.go index 2597e1a9a66..4c0d54e953a 100644 --- a/arduino/cores/tools_test.go +++ b/internal/arduino/cores/tools_test.go @@ -18,7 +18,7 @@ package cores import ( "testing" - "github.com/arduino/arduino-cli/arduino/resources" + "github.com/arduino/arduino-cli/internal/arduino/resources" "github.com/stretchr/testify/require" ) diff --git a/arduino/discovery/discovery.go b/internal/arduino/discovery/discovery.go similarity index 100% rename from arduino/discovery/discovery.go rename to internal/arduino/discovery/discovery.go diff --git a/arduino/discovery/discovery_client/main.go b/internal/arduino/discovery/discovery_client/main.go similarity index 92% rename from arduino/discovery/discovery_client/main.go rename to internal/arduino/discovery/discovery_client/main.go index b9e1cfd0988..f908a791a31 100644 --- a/arduino/discovery/discovery_client/main.go +++ b/internal/arduino/discovery/discovery_client/main.go @@ -22,8 +22,8 @@ import ( "os" "sort" - "github.com/arduino/arduino-cli/arduino/discovery" - "github.com/arduino/arduino-cli/arduino/discovery/discoverymanager" + "github.com/arduino/arduino-cli/internal/arduino/discovery" + "github.com/arduino/arduino-cli/internal/arduino/discovery/discoverymanager" "github.com/sirupsen/logrus" ) diff --git a/arduino/discovery/discovery_test.go b/internal/arduino/discovery/discovery_test.go similarity index 100% rename from arduino/discovery/discovery_test.go rename to internal/arduino/discovery/discovery_test.go diff --git a/arduino/discovery/discoverymanager/discoverymanager.go b/internal/arduino/discovery/discoverymanager/discoverymanager.go similarity index 99% rename from arduino/discovery/discoverymanager/discoverymanager.go rename to internal/arduino/discovery/discoverymanager/discoverymanager.go index 7d33115ce31..a52d65e5ab7 100644 --- a/arduino/discovery/discoverymanager/discoverymanager.go +++ b/internal/arduino/discovery/discoverymanager/discoverymanager.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "github.com/arduino/arduino-cli/arduino/discovery" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/discovery" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/arduino/discovery/testdata/cat/.gitignore b/internal/arduino/discovery/testdata/cat/.gitignore similarity index 100% rename from arduino/discovery/testdata/cat/.gitignore rename to internal/arduino/discovery/testdata/cat/.gitignore diff --git a/arduino/discovery/testdata/cat/main.go b/internal/arduino/discovery/testdata/cat/main.go similarity index 100% rename from arduino/discovery/testdata/cat/main.go rename to internal/arduino/discovery/testdata/cat/main.go diff --git a/arduino/errors.go b/internal/arduino/errors.go similarity index 100% rename from arduino/errors.go rename to internal/arduino/errors.go diff --git a/arduino/globals/globals.go b/internal/arduino/globals/globals.go similarity index 100% rename from arduino/globals/globals.go rename to internal/arduino/globals/globals.go diff --git a/arduino/httpclient/httpclient.go b/internal/arduino/httpclient/httpclient.go similarity index 98% rename from arduino/httpclient/httpclient.go rename to internal/arduino/httpclient/httpclient.go index 991eacc9ce4..a7817cd5bf5 100644 --- a/arduino/httpclient/httpclient.go +++ b/internal/arduino/httpclient/httpclient.go @@ -20,8 +20,8 @@ import ( "net/url" "time" - "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" diff --git a/arduino/httpclient/httpclient_test.go b/internal/arduino/httpclient/httpclient_test.go similarity index 100% rename from arduino/httpclient/httpclient_test.go rename to internal/arduino/httpclient/httpclient_test.go diff --git a/arduino/libraries/libraries.go b/internal/arduino/libraries/libraries.go similarity index 98% rename from arduino/libraries/libraries.go rename to internal/arduino/libraries/libraries.go index 1235023e9e5..a6e566a11bd 100644 --- a/arduino/libraries/libraries.go +++ b/internal/arduino/libraries/libraries.go @@ -18,9 +18,9 @@ package libraries import ( "fmt" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/globals" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/globals" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" diff --git a/arduino/libraries/libraries_layout.go b/internal/arduino/libraries/libraries_layout.go similarity index 100% rename from arduino/libraries/libraries_layout.go rename to internal/arduino/libraries/libraries_layout.go diff --git a/arduino/libraries/libraries_location.go b/internal/arduino/libraries/libraries_location.go similarity index 100% rename from arduino/libraries/libraries_location.go rename to internal/arduino/libraries/libraries_location.go diff --git a/arduino/libraries/libraries_test.go b/internal/arduino/libraries/libraries_test.go similarity index 100% rename from arduino/libraries/libraries_test.go rename to internal/arduino/libraries/libraries_test.go diff --git a/arduino/libraries/librariesindex/index.go b/internal/arduino/libraries/librariesindex/index.go similarity index 97% rename from arduino/libraries/librariesindex/index.go rename to internal/arduino/libraries/librariesindex/index.go index b1d756554d9..92226146434 100644 --- a/arduino/libraries/librariesindex/index.go +++ b/internal/arduino/libraries/librariesindex/index.go @@ -18,8 +18,8 @@ package librariesindex import ( "sort" - "github.com/arduino/arduino-cli/arduino/libraries" - "github.com/arduino/arduino-cli/arduino/resources" + "github.com/arduino/arduino-cli/internal/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/resources" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" semver "go.bug.st/relaxed-semver" ) diff --git a/arduino/libraries/librariesindex/index_test.go b/internal/arduino/libraries/librariesindex/index_test.go similarity index 98% rename from arduino/libraries/librariesindex/index_test.go rename to internal/arduino/libraries/librariesindex/index_test.go index 9b5721cc731..b347d2bc664 100644 --- a/arduino/libraries/librariesindex/index_test.go +++ b/internal/arduino/libraries/librariesindex/index_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/arduino/arduino-cli/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/go-paths-helper" easyjson "github.com/mailru/easyjson" "github.com/stretchr/testify/require" diff --git a/arduino/libraries/librariesindex/json.go b/internal/arduino/libraries/librariesindex/json.go similarity index 98% rename from arduino/libraries/librariesindex/json.go rename to internal/arduino/libraries/librariesindex/json.go index c7ada2be4f9..85c450fde32 100644 --- a/arduino/libraries/librariesindex/json.go +++ b/internal/arduino/libraries/librariesindex/json.go @@ -18,8 +18,8 @@ package librariesindex import ( "fmt" - "github.com/arduino/arduino-cli/arduino/resources" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/resources" "github.com/arduino/go-paths-helper" easyjson "github.com/mailru/easyjson" semver "go.bug.st/relaxed-semver" diff --git a/arduino/libraries/librariesindex/json_easyjson.go b/internal/arduino/libraries/librariesindex/json_easyjson.go similarity index 100% rename from arduino/libraries/librariesindex/json_easyjson.go rename to internal/arduino/libraries/librariesindex/json_easyjson.go diff --git a/arduino/libraries/librariesindex/reference.go b/internal/arduino/libraries/librariesindex/reference.go similarity index 100% rename from arduino/libraries/librariesindex/reference.go rename to internal/arduino/libraries/librariesindex/reference.go diff --git a/arduino/libraries/librariesindex/testdata/invalid.json b/internal/arduino/libraries/librariesindex/testdata/invalid.json similarity index 100% rename from arduino/libraries/librariesindex/testdata/invalid.json rename to internal/arduino/libraries/librariesindex/testdata/invalid.json diff --git a/arduino/libraries/librariesindex/testdata/library_index.json b/internal/arduino/libraries/librariesindex/testdata/library_index.json similarity index 100% rename from arduino/libraries/librariesindex/testdata/library_index.json rename to internal/arduino/libraries/librariesindex/testdata/library_index.json diff --git a/arduino/libraries/librarieslist.go b/internal/arduino/libraries/librarieslist.go similarity index 100% rename from arduino/libraries/librarieslist.go rename to internal/arduino/libraries/librarieslist.go diff --git a/arduino/libraries/librariesmanager/download.go b/internal/arduino/libraries/librariesmanager/download.go similarity index 100% rename from arduino/libraries/librariesmanager/download.go rename to internal/arduino/libraries/librariesmanager/download.go diff --git a/arduino/libraries/librariesmanager/install.go b/internal/arduino/libraries/librariesmanager/install.go similarity index 97% rename from arduino/libraries/librariesmanager/install.go rename to internal/arduino/libraries/librariesmanager/install.go index e52d3f9d59a..675b49eed5f 100644 --- a/arduino/libraries/librariesmanager/install.go +++ b/internal/arduino/libraries/librariesmanager/install.go @@ -22,11 +22,11 @@ import ( "os" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/globals" - "github.com/arduino/arduino-cli/arduino/libraries" - "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" - "github.com/arduino/arduino-cli/arduino/utils" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" + "github.com/arduino/arduino-cli/internal/arduino/utils" paths "github.com/arduino/go-paths-helper" "github.com/codeclysm/extract/v3" "github.com/go-git/go-git/v5" diff --git a/arduino/libraries/librariesmanager/install_test.go b/internal/arduino/libraries/librariesmanager/install_test.go similarity index 100% rename from arduino/libraries/librariesmanager/install_test.go rename to internal/arduino/libraries/librariesmanager/install_test.go diff --git a/arduino/libraries/librariesmanager/librariesmanager.go b/internal/arduino/libraries/librariesmanager/librariesmanager.go similarity index 97% rename from arduino/libraries/librariesmanager/librariesmanager.go rename to internal/arduino/libraries/librariesmanager/librariesmanager.go index eb7254054e0..cedc20d9d7b 100644 --- a/arduino/libraries/librariesmanager/librariesmanager.go +++ b/internal/arduino/libraries/librariesmanager/librariesmanager.go @@ -22,10 +22,10 @@ import ( "slices" "strings" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/libraries" - "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" paths "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" "google.golang.org/grpc/codes" diff --git a/arduino/libraries/librariesmanager/librariesmanager_test.go b/internal/arduino/libraries/librariesmanager/librariesmanager_test.go similarity index 94% rename from arduino/libraries/librariesmanager/librariesmanager_test.go rename to internal/arduino/libraries/librariesmanager/librariesmanager_test.go index a987462b6b2..54475cd1fd3 100644 --- a/arduino/libraries/librariesmanager/librariesmanager_test.go +++ b/internal/arduino/libraries/librariesmanager/librariesmanager_test.go @@ -17,7 +17,7 @@ package librariesmanager import ( "testing" - "github.com/arduino/arduino-cli/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/go-paths-helper" "github.com/stretchr/testify/require" ) diff --git a/arduino/libraries/librariesresolver/cpp.go b/internal/arduino/libraries/librariesresolver/cpp.go similarity index 96% rename from arduino/libraries/librariesresolver/cpp.go rename to internal/arduino/libraries/librariesresolver/cpp.go index f817a68f7eb..6224c6ffd52 100644 --- a/arduino/libraries/librariesresolver/cpp.go +++ b/internal/arduino/libraries/librariesresolver/cpp.go @@ -20,11 +20,11 @@ import ( "path/filepath" "strings" - "github.com/arduino/arduino-cli/arduino/cores" - "github.com/arduino/arduino-cli/arduino/libraries" - "github.com/arduino/arduino-cli/arduino/libraries/librariesmanager" - "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/cores" + "github.com/arduino/arduino-cli/internal/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" + "github.com/arduino/arduino-cli/internal/arduino/utils" "github.com/schollz/closestmatch" "github.com/sirupsen/logrus" ) diff --git a/arduino/libraries/librariesresolver/cpp_test.go b/internal/arduino/libraries/librariesresolver/cpp_test.go similarity index 99% rename from arduino/libraries/librariesresolver/cpp_test.go rename to internal/arduino/libraries/librariesresolver/cpp_test.go index 3be147636ac..f65bc195769 100644 --- a/arduino/libraries/librariesresolver/cpp_test.go +++ b/internal/arduino/libraries/librariesresolver/cpp_test.go @@ -18,7 +18,7 @@ package librariesresolver import ( "testing" - "github.com/arduino/arduino-cli/arduino/libraries" + "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/stretchr/testify/require" ) diff --git a/arduino/libraries/loader.go b/internal/arduino/libraries/loader.go similarity index 99% rename from arduino/libraries/loader.go rename to internal/arduino/libraries/loader.go index f278c85d40f..cb4c1c59a3b 100644 --- a/arduino/libraries/loader.go +++ b/internal/arduino/libraries/loader.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - "github.com/arduino/arduino-cli/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" "github.com/pkg/errors" diff --git a/arduino/libraries/testdata/LegacyLib/LegacyLib.h b/internal/arduino/libraries/testdata/LegacyLib/LegacyLib.h similarity index 100% rename from arduino/libraries/testdata/LegacyLib/LegacyLib.h rename to internal/arduino/libraries/testdata/LegacyLib/LegacyLib.h diff --git a/arduino/libraries/testdata/LibWithNonUTF8Properties/library.properties b/internal/arduino/libraries/testdata/LibWithNonUTF8Properties/library.properties similarity index 100% rename from arduino/libraries/testdata/LibWithNonUTF8Properties/library.properties rename to internal/arduino/libraries/testdata/LibWithNonUTF8Properties/library.properties diff --git a/arduino/libraries/testdata/LibWithNonUTF8Properties/src/LibWithNonUTF8Properties.h b/internal/arduino/libraries/testdata/LibWithNonUTF8Properties/src/LibWithNonUTF8Properties.h similarity index 100% rename from arduino/libraries/testdata/LibWithNonUTF8Properties/src/LibWithNonUTF8Properties.h rename to internal/arduino/libraries/testdata/LibWithNonUTF8Properties/src/LibWithNonUTF8Properties.h diff --git a/arduino/libraries/testdata/TestLib/library.properties b/internal/arduino/libraries/testdata/TestLib/library.properties similarity index 100% rename from arduino/libraries/testdata/TestLib/library.properties rename to internal/arduino/libraries/testdata/TestLib/library.properties diff --git a/arduino/libraries/testdata/TestLib/src/TestLib.h b/internal/arduino/libraries/testdata/TestLib/src/TestLib.h similarity index 100% rename from arduino/libraries/testdata/TestLib/src/TestLib.h rename to internal/arduino/libraries/testdata/TestLib/src/TestLib.h diff --git a/arduino/libraries/testdata/TestLibExamples/examples/MultipleFiles/MultipleFiles.ino b/internal/arduino/libraries/testdata/TestLibExamples/examples/MultipleFiles/MultipleFiles.ino similarity index 100% rename from arduino/libraries/testdata/TestLibExamples/examples/MultipleFiles/MultipleFiles.ino rename to internal/arduino/libraries/testdata/TestLibExamples/examples/MultipleFiles/MultipleFiles.ino diff --git a/arduino/libraries/testdata/TestLibExamples/examples/MultipleFiles/MultipleFiles.pde b/internal/arduino/libraries/testdata/TestLibExamples/examples/MultipleFiles/MultipleFiles.pde similarity index 100% rename from arduino/libraries/testdata/TestLibExamples/examples/MultipleFiles/MultipleFiles.pde rename to internal/arduino/libraries/testdata/TestLibExamples/examples/MultipleFiles/MultipleFiles.pde diff --git a/arduino/libraries/testdata/TestLibExamples/examples/WrongCasing/wrongCasing.ino b/internal/arduino/libraries/testdata/TestLibExamples/examples/WrongCasing/wrongCasing.ino similarity index 100% rename from arduino/libraries/testdata/TestLibExamples/examples/WrongCasing/wrongCasing.ino rename to internal/arduino/libraries/testdata/TestLibExamples/examples/WrongCasing/wrongCasing.ino diff --git a/arduino/libraries/testdata/TestLibExamples/examples/simple/simple.ino b/internal/arduino/libraries/testdata/TestLibExamples/examples/simple/simple.ino similarity index 100% rename from arduino/libraries/testdata/TestLibExamples/examples/simple/simple.ino rename to internal/arduino/libraries/testdata/TestLibExamples/examples/simple/simple.ino diff --git a/arduino/libraries/testdata/TestLibExamples/library.properties b/internal/arduino/libraries/testdata/TestLibExamples/library.properties similarity index 100% rename from arduino/libraries/testdata/TestLibExamples/library.properties rename to internal/arduino/libraries/testdata/TestLibExamples/library.properties diff --git a/arduino/libraries/testdata/TestLibExamples/src/TestLib.h b/internal/arduino/libraries/testdata/TestLibExamples/src/TestLib.h similarity index 100% rename from arduino/libraries/testdata/TestLibExamples/src/TestLib.h rename to internal/arduino/libraries/testdata/TestLibExamples/src/TestLib.h diff --git a/arduino/libraries/testdata/TestLibInDev/.development b/internal/arduino/libraries/testdata/TestLibInDev/.development similarity index 100% rename from arduino/libraries/testdata/TestLibInDev/.development rename to internal/arduino/libraries/testdata/TestLibInDev/.development diff --git a/arduino/libraries/testdata/TestLibInDev/library.properties b/internal/arduino/libraries/testdata/TestLibInDev/library.properties similarity index 100% rename from arduino/libraries/testdata/TestLibInDev/library.properties rename to internal/arduino/libraries/testdata/TestLibInDev/library.properties diff --git a/arduino/libraries/testdata/TestLibInDev/src/TestLib.h b/internal/arduino/libraries/testdata/TestLibInDev/src/TestLib.h similarity index 100% rename from arduino/libraries/testdata/TestLibInDev/src/TestLib.h rename to internal/arduino/libraries/testdata/TestLibInDev/src/TestLib.h diff --git a/arduino/monitor/monitor.go b/internal/arduino/monitor/monitor.go similarity index 100% rename from arduino/monitor/monitor.go rename to internal/arduino/monitor/monitor.go diff --git a/arduino/monitor/monitor_test.go b/internal/arduino/monitor/monitor_test.go similarity index 100% rename from arduino/monitor/monitor_test.go rename to internal/arduino/monitor/monitor_test.go diff --git a/arduino/monitor/testdata/.gitignore b/internal/arduino/monitor/testdata/.gitignore similarity index 100% rename from arduino/monitor/testdata/.gitignore rename to internal/arduino/monitor/testdata/.gitignore diff --git a/arduino/resources/checksums.go b/internal/arduino/resources/checksums.go similarity index 100% rename from arduino/resources/checksums.go rename to internal/arduino/resources/checksums.go diff --git a/arduino/resources/download.go b/internal/arduino/resources/download.go similarity index 97% rename from arduino/resources/download.go rename to internal/arduino/resources/download.go index ac8946b155c..4f1df1ad5b3 100644 --- a/arduino/resources/download.go +++ b/internal/arduino/resources/download.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/arduino/arduino-cli/arduino/httpclient" + "github.com/arduino/arduino-cli/internal/arduino/httpclient" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" "go.bug.st/downloader/v2" diff --git a/arduino/resources/helpers.go b/internal/arduino/resources/helpers.go similarity index 100% rename from arduino/resources/helpers.go rename to internal/arduino/resources/helpers.go diff --git a/arduino/resources/helpers_test.go b/internal/arduino/resources/helpers_test.go similarity index 97% rename from arduino/resources/helpers_test.go rename to internal/arduino/resources/helpers_test.go index f8dea9abf43..e56747d8b40 100644 --- a/arduino/resources/helpers_test.go +++ b/internal/arduino/resources/helpers_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/arduino/arduino-cli/arduino/httpclient" + "github.com/arduino/arduino-cli/internal/arduino/httpclient" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/stretchr/testify/require" diff --git a/arduino/resources/index.go b/internal/arduino/resources/index.go similarity index 97% rename from arduino/resources/index.go rename to internal/arduino/resources/index.go index ffd9bb4b0b0..3366d1179d0 100644 --- a/arduino/resources/index.go +++ b/internal/arduino/resources/index.go @@ -22,9 +22,9 @@ import ( "path" "strings" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/httpclient" - "github.com/arduino/arduino-cli/arduino/security" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/httpclient" + "github.com/arduino/arduino-cli/internal/arduino/security" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/codeclysm/extract/v3" diff --git a/arduino/resources/install.go b/internal/arduino/resources/install.go similarity index 100% rename from arduino/resources/install.go rename to internal/arduino/resources/install.go diff --git a/arduino/resources/install_test.go b/internal/arduino/resources/install_test.go similarity index 100% rename from arduino/resources/install_test.go rename to internal/arduino/resources/install_test.go diff --git a/arduino/resources/resources_test.go b/internal/arduino/resources/resources_test.go similarity index 100% rename from arduino/resources/resources_test.go rename to internal/arduino/resources/resources_test.go diff --git a/arduino/resources/structs.go b/internal/arduino/resources/structs.go similarity index 100% rename from arduino/resources/structs.go rename to internal/arduino/resources/structs.go diff --git a/arduino/resources/testdata/invalid/package_index.tar.bz2 b/internal/arduino/resources/testdata/invalid/package_index.tar.bz2 similarity index 100% rename from arduino/resources/testdata/invalid/package_index.tar.bz2 rename to internal/arduino/resources/testdata/invalid/package_index.tar.bz2 diff --git a/arduino/resources/testdata/invalid/platform_with_multiple_root_folders.tar.bz2 b/internal/arduino/resources/testdata/invalid/platform_with_multiple_root_folders.tar.bz2 similarity index 100% rename from arduino/resources/testdata/invalid/platform_with_multiple_root_folders.tar.bz2 rename to internal/arduino/resources/testdata/invalid/platform_with_multiple_root_folders.tar.bz2 diff --git a/arduino/resources/testdata/invalid/platform_without_root_folder.tar.bz2 b/internal/arduino/resources/testdata/invalid/platform_without_root_folder.tar.bz2 similarity index 100% rename from arduino/resources/testdata/invalid/platform_without_root_folder.tar.bz2 rename to internal/arduino/resources/testdata/invalid/platform_without_root_folder.tar.bz2 diff --git a/arduino/resources/testdata/valid/package_index.tar.bz2 b/internal/arduino/resources/testdata/valid/package_index.tar.bz2 similarity index 100% rename from arduino/resources/testdata/valid/package_index.tar.bz2 rename to internal/arduino/resources/testdata/valid/package_index.tar.bz2 diff --git a/arduino/resources/testdata/valid/platform_with_root_and__MACOSX_folder.tar.bz2 b/internal/arduino/resources/testdata/valid/platform_with_root_and__MACOSX_folder.tar.bz2 similarity index 100% rename from arduino/resources/testdata/valid/platform_with_root_and__MACOSX_folder.tar.bz2 rename to internal/arduino/resources/testdata/valid/platform_with_root_and__MACOSX_folder.tar.bz2 diff --git a/arduino/security/keys/arduino_public.gpg.key b/internal/arduino/security/keys/arduino_public.gpg.key similarity index 100% rename from arduino/security/keys/arduino_public.gpg.key rename to internal/arduino/security/keys/arduino_public.gpg.key diff --git a/arduino/security/signature_test.go b/internal/arduino/security/signature_test.go similarity index 100% rename from arduino/security/signature_test.go rename to internal/arduino/security/signature_test.go diff --git a/arduino/security/signatures.go b/internal/arduino/security/signatures.go similarity index 100% rename from arduino/security/signatures.go rename to internal/arduino/security/signatures.go diff --git a/arduino/security/testdata/module_firmware_index.json b/internal/arduino/security/testdata/module_firmware_index.json similarity index 100% rename from arduino/security/testdata/module_firmware_index.json rename to internal/arduino/security/testdata/module_firmware_index.json diff --git a/arduino/security/testdata/module_firmware_index.json.sig b/internal/arduino/security/testdata/module_firmware_index.json.sig similarity index 100% rename from arduino/security/testdata/module_firmware_index.json.sig rename to internal/arduino/security/testdata/module_firmware_index.json.sig diff --git a/arduino/security/testdata/module_firmware_index_public.gpg.key b/internal/arduino/security/testdata/module_firmware_index_public.gpg.key similarity index 100% rename from arduino/security/testdata/module_firmware_index_public.gpg.key rename to internal/arduino/security/testdata/module_firmware_index_public.gpg.key diff --git a/arduino/security/testdata/package_index.json b/internal/arduino/security/testdata/package_index.json similarity index 100% rename from arduino/security/testdata/package_index.json rename to internal/arduino/security/testdata/package_index.json diff --git a/arduino/security/testdata/package_index.json.sig b/internal/arduino/security/testdata/package_index.json.sig similarity index 100% rename from arduino/security/testdata/package_index.json.sig rename to internal/arduino/security/testdata/package_index.json.sig diff --git a/arduino/serialutils/serialutils.go b/internal/arduino/serialutils/serialutils.go similarity index 100% rename from arduino/serialutils/serialutils.go rename to internal/arduino/serialutils/serialutils.go diff --git a/arduino/sketch/profiles.go b/internal/arduino/sketch/profiles.go similarity index 99% rename from arduino/sketch/profiles.go rename to internal/arduino/sketch/profiles.go index 93fcdf11787..f7065717f71 100644 --- a/arduino/sketch/profiles.go +++ b/internal/arduino/sketch/profiles.go @@ -23,7 +23,7 @@ import ( "regexp" "strings" - "github.com/arduino/arduino-cli/arduino/utils" + "github.com/arduino/arduino-cli/internal/arduino/utils" "github.com/arduino/go-paths-helper" semver "go.bug.st/relaxed-semver" "gopkg.in/yaml.v3" diff --git a/arduino/sketch/profiles_test.go b/internal/arduino/sketch/profiles_test.go similarity index 100% rename from arduino/sketch/profiles_test.go rename to internal/arduino/sketch/profiles_test.go diff --git a/arduino/sketch/sketch.go b/internal/arduino/sketch/sketch.go similarity index 99% rename from arduino/sketch/sketch.go rename to internal/arduino/sketch/sketch.go index fd6bff38dd4..28f7e972122 100644 --- a/arduino/sketch/sketch.go +++ b/internal/arduino/sketch/sketch.go @@ -22,8 +22,8 @@ import ( "sort" "strings" - "github.com/arduino/arduino-cli/arduino/globals" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/go-paths-helper" "github.com/pkg/errors" ) diff --git a/arduino/sketch/sketch_test.go b/internal/arduino/sketch/sketch_test.go similarity index 100% rename from arduino/sketch/sketch_test.go rename to internal/arduino/sketch/sketch_test.go diff --git a/arduino/sketch/testdata/SketchBothInoAndPde/SketchBothInoAndPde.ino b/internal/arduino/sketch/testdata/SketchBothInoAndPde/SketchBothInoAndPde.ino similarity index 100% rename from arduino/sketch/testdata/SketchBothInoAndPde/SketchBothInoAndPde.ino rename to internal/arduino/sketch/testdata/SketchBothInoAndPde/SketchBothInoAndPde.ino diff --git a/arduino/sketch/testdata/SketchBothInoAndPde/SketchBothInoAndPde.pde b/internal/arduino/sketch/testdata/SketchBothInoAndPde/SketchBothInoAndPde.pde similarity index 100% rename from arduino/sketch/testdata/SketchBothInoAndPde/SketchBothInoAndPde.pde rename to internal/arduino/sketch/testdata/SketchBothInoAndPde/SketchBothInoAndPde.pde diff --git a/arduino/sketch/testdata/SketchCasingCorrect/SketchCasingCorrect.ino b/internal/arduino/sketch/testdata/SketchCasingCorrect/SketchCasingCorrect.ino similarity index 100% rename from arduino/sketch/testdata/SketchCasingCorrect/SketchCasingCorrect.ino rename to internal/arduino/sketch/testdata/SketchCasingCorrect/SketchCasingCorrect.ino diff --git a/arduino/sketch/testdata/SketchCasingWrong/sketchcasingwrong.ino b/internal/arduino/sketch/testdata/SketchCasingWrong/sketchcasingwrong.ino similarity index 100% rename from arduino/sketch/testdata/SketchCasingWrong/sketchcasingwrong.ino rename to internal/arduino/sketch/testdata/SketchCasingWrong/sketchcasingwrong.ino diff --git a/arduino/sketch/testdata/SketchMultipleMainFiles/SketchMultipleMainFiles.ino b/internal/arduino/sketch/testdata/SketchMultipleMainFiles/SketchMultipleMainFiles.ino similarity index 100% rename from arduino/sketch/testdata/SketchMultipleMainFiles/SketchMultipleMainFiles.ino rename to internal/arduino/sketch/testdata/SketchMultipleMainFiles/SketchMultipleMainFiles.ino diff --git a/arduino/sketch/testdata/SketchMultipleMainFiles/SketchMultipleMainFiles.pde b/internal/arduino/sketch/testdata/SketchMultipleMainFiles/SketchMultipleMainFiles.pde similarity index 100% rename from arduino/sketch/testdata/SketchMultipleMainFiles/SketchMultipleMainFiles.pde rename to internal/arduino/sketch/testdata/SketchMultipleMainFiles/SketchMultipleMainFiles.pde diff --git a/arduino/sketch/testdata/SketchPde/SketchPde.pde b/internal/arduino/sketch/testdata/SketchPde/SketchPde.pde similarity index 100% rename from arduino/sketch/testdata/SketchPde/SketchPde.pde rename to internal/arduino/sketch/testdata/SketchPde/SketchPde.pde diff --git a/arduino/sketch/testdata/SketchSimple/SketchSimple.ino b/internal/arduino/sketch/testdata/SketchSimple/SketchSimple.ino similarity index 100% rename from arduino/sketch/testdata/SketchSimple/SketchSimple.ino rename to internal/arduino/sketch/testdata/SketchSimple/SketchSimple.ino diff --git a/arduino/sketch/testdata/SketchSimple/other.cpp b/internal/arduino/sketch/testdata/SketchSimple/other.cpp similarity index 100% rename from arduino/sketch/testdata/SketchSimple/other.cpp rename to internal/arduino/sketch/testdata/SketchSimple/other.cpp diff --git a/arduino/sketch/testdata/SketchSymlinkSrc/.#sketch.ino b/internal/arduino/sketch/testdata/SketchSymlinkSrc/.#sketch.ino similarity index 100% rename from arduino/sketch/testdata/SketchSymlinkSrc/.#sketch.ino rename to internal/arduino/sketch/testdata/SketchSymlinkSrc/.#sketch.ino diff --git a/arduino/sketch/testdata/SketchSymlinkSrc/SketchSymlinkSrc.ino b/internal/arduino/sketch/testdata/SketchSymlinkSrc/SketchSymlinkSrc.ino similarity index 100% rename from arduino/sketch/testdata/SketchSymlinkSrc/SketchSymlinkSrc.ino rename to internal/arduino/sketch/testdata/SketchSymlinkSrc/SketchSymlinkSrc.ino diff --git a/arduino/sketch/testdata/SketchSymlinkSrc/doc.txt b/internal/arduino/sketch/testdata/SketchSymlinkSrc/doc.txt similarity index 100% rename from arduino/sketch/testdata/SketchSymlinkSrc/doc.txt rename to internal/arduino/sketch/testdata/SketchSymlinkSrc/doc.txt diff --git a/arduino/sketch/testdata/SketchSymlinkSrc/header.h b/internal/arduino/sketch/testdata/SketchSymlinkSrc/header.h similarity index 100% rename from arduino/sketch/testdata/SketchSymlinkSrc/header.h rename to internal/arduino/sketch/testdata/SketchSymlinkSrc/header.h diff --git a/arduino/sketch/testdata/SketchSymlinkSrc/old.pde b/internal/arduino/sketch/testdata/SketchSymlinkSrc/old.pde similarity index 100% rename from arduino/sketch/testdata/SketchSymlinkSrc/old.pde rename to internal/arduino/sketch/testdata/SketchSymlinkSrc/old.pde diff --git a/arduino/sketch/testdata/SketchSymlinkSrc/other.ino b/internal/arduino/sketch/testdata/SketchSymlinkSrc/other.ino similarity index 100% rename from arduino/sketch/testdata/SketchSymlinkSrc/other.ino rename to internal/arduino/sketch/testdata/SketchSymlinkSrc/other.ino diff --git a/arduino/sketch/testdata/SketchSymlinkSrc/s_file.S b/internal/arduino/sketch/testdata/SketchSymlinkSrc/s_file.S similarity index 100% rename from arduino/sketch/testdata/SketchSymlinkSrc/s_file.S rename to internal/arduino/sketch/testdata/SketchSymlinkSrc/s_file.S diff --git a/arduino/sketch/testdata/SketchSymlinkSrc/src/dont_load_me.ino b/internal/arduino/sketch/testdata/SketchSymlinkSrc/src/dont_load_me.ino similarity index 100% rename from arduino/sketch/testdata/SketchSymlinkSrc/src/dont_load_me.ino rename to internal/arduino/sketch/testdata/SketchSymlinkSrc/src/dont_load_me.ino diff --git a/arduino/sketch/testdata/SketchSymlinkSrc/src/helper.h b/internal/arduino/sketch/testdata/SketchSymlinkSrc/src/helper.h similarity index 100% rename from arduino/sketch/testdata/SketchSymlinkSrc/src/helper.h rename to internal/arduino/sketch/testdata/SketchSymlinkSrc/src/helper.h diff --git a/arduino/sketch/testdata/SketchWithDefaultFQBNAndPort/SketchWithDefaultFQBNAndPort.ino b/internal/arduino/sketch/testdata/SketchWithDefaultFQBNAndPort/SketchWithDefaultFQBNAndPort.ino similarity index 100% rename from arduino/sketch/testdata/SketchWithDefaultFQBNAndPort/SketchWithDefaultFQBNAndPort.ino rename to internal/arduino/sketch/testdata/SketchWithDefaultFQBNAndPort/SketchWithDefaultFQBNAndPort.ino diff --git a/arduino/sketch/testdata/SketchWithDefaultFQBNAndPort/sketch.yml b/internal/arduino/sketch/testdata/SketchWithDefaultFQBNAndPort/sketch.yml similarity index 100% rename from arduino/sketch/testdata/SketchWithDefaultFQBNAndPort/sketch.yml rename to internal/arduino/sketch/testdata/SketchWithDefaultFQBNAndPort/sketch.yml diff --git a/arduino/sketch/testdata/SketchWithIppFile/SketchWithIppFile.ino b/internal/arduino/sketch/testdata/SketchWithIppFile/SketchWithIppFile.ino similarity index 100% rename from arduino/sketch/testdata/SketchWithIppFile/SketchWithIppFile.ino rename to internal/arduino/sketch/testdata/SketchWithIppFile/SketchWithIppFile.ino diff --git a/arduino/sketch/testdata/SketchWithIppFile/template.ipp b/internal/arduino/sketch/testdata/SketchWithIppFile/template.ipp similarity index 100% rename from arduino/sketch/testdata/SketchWithIppFile/template.ipp rename to internal/arduino/sketch/testdata/SketchWithIppFile/template.ipp diff --git a/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/SketchWithMarkdownAsciidocJson.ino b/internal/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/SketchWithMarkdownAsciidocJson.ino similarity index 100% rename from arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/SketchWithMarkdownAsciidocJson.ino rename to internal/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/SketchWithMarkdownAsciidocJson.ino diff --git a/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.adoc b/internal/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.adoc similarity index 100% rename from arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.adoc rename to internal/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.adoc diff --git a/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.json b/internal/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.json similarity index 100% rename from arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.json rename to internal/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.json diff --git a/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.md b/internal/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.md similarity index 100% rename from arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.md rename to internal/arduino/sketch/testdata/SketchWithMarkdownAsciidocJson/foo.md diff --git a/arduino/sketch/testdata/SketchWithMultipleSymlinkLoops/SketchWithMultipleSymlinkLoops.ino b/internal/arduino/sketch/testdata/SketchWithMultipleSymlinkLoops/SketchWithMultipleSymlinkLoops.ino similarity index 100% rename from arduino/sketch/testdata/SketchWithMultipleSymlinkLoops/SketchWithMultipleSymlinkLoops.ino rename to internal/arduino/sketch/testdata/SketchWithMultipleSymlinkLoops/SketchWithMultipleSymlinkLoops.ino diff --git a/arduino/sketch/testdata/SketchWithProfiles/sketch.yml b/internal/arduino/sketch/testdata/SketchWithProfiles/sketch.yml similarity index 100% rename from arduino/sketch/testdata/SketchWithProfiles/sketch.yml rename to internal/arduino/sketch/testdata/SketchWithProfiles/sketch.yml diff --git a/arduino/sketch/testdata/SketchWithSymlink/SketchWithSymlink.ino b/internal/arduino/sketch/testdata/SketchWithSymlink/SketchWithSymlink.ino similarity index 100% rename from arduino/sketch/testdata/SketchWithSymlink/SketchWithSymlink.ino rename to internal/arduino/sketch/testdata/SketchWithSymlink/SketchWithSymlink.ino diff --git a/arduino/sketch/testdata/SketchWithSymlink/some_folder/helper.h b/internal/arduino/sketch/testdata/SketchWithSymlink/some_folder/helper.h similarity index 100% rename from arduino/sketch/testdata/SketchWithSymlink/some_folder/helper.h rename to internal/arduino/sketch/testdata/SketchWithSymlink/some_folder/helper.h diff --git a/arduino/sketch/testdata/SketchWithSymlinkLoop/SketchWithSymlinkLoop.ino b/internal/arduino/sketch/testdata/SketchWithSymlinkLoop/SketchWithSymlinkLoop.ino similarity index 100% rename from arduino/sketch/testdata/SketchWithSymlinkLoop/SketchWithSymlinkLoop.ino rename to internal/arduino/sketch/testdata/SketchWithSymlinkLoop/SketchWithSymlinkLoop.ino diff --git a/arduino/sketch/testdata/SketchWithSymlinkLoop/some_folder/helper.h b/internal/arduino/sketch/testdata/SketchWithSymlinkLoop/some_folder/helper.h similarity index 100% rename from arduino/sketch/testdata/SketchWithSymlinkLoop/some_folder/helper.h rename to internal/arduino/sketch/testdata/SketchWithSymlinkLoop/some_folder/helper.h diff --git a/arduino/sketch/testdata/SketchWithTppFile/SketchWithTppFile.ino b/internal/arduino/sketch/testdata/SketchWithTppFile/SketchWithTppFile.ino similarity index 100% rename from arduino/sketch/testdata/SketchWithTppFile/SketchWithTppFile.ino rename to internal/arduino/sketch/testdata/SketchWithTppFile/SketchWithTppFile.ino diff --git a/arduino/sketch/testdata/SketchWithTppFile/template.tpp b/internal/arduino/sketch/testdata/SketchWithTppFile/template.tpp similarity index 100% rename from arduino/sketch/testdata/SketchWithTppFile/template.tpp rename to internal/arduino/sketch/testdata/SketchWithTppFile/template.tpp diff --git a/arduino/sketch/testdata/SketchWithWrongMain/main.ino b/internal/arduino/sketch/testdata/SketchWithWrongMain/main.ino similarity index 100% rename from arduino/sketch/testdata/SketchWithWrongMain/main.ino rename to internal/arduino/sketch/testdata/SketchWithWrongMain/main.ino diff --git a/arduino/sketch/testdata/TestNewItem.ino b/internal/arduino/sketch/testdata/TestNewItem.ino similarity index 100% rename from arduino/sketch/testdata/TestNewItem.ino rename to internal/arduino/sketch/testdata/TestNewItem.ino diff --git a/arduino/sketch/yaml.go b/internal/arduino/sketch/yaml.go similarity index 100% rename from arduino/sketch/yaml.go rename to internal/arduino/sketch/yaml.go diff --git a/arduino/sketch/yaml_test.go b/internal/arduino/sketch/yaml_test.go similarity index 100% rename from arduino/sketch/yaml_test.go rename to internal/arduino/sketch/yaml_test.go diff --git a/arduino/utils/filenames.go b/internal/arduino/utils/filenames.go similarity index 100% rename from arduino/utils/filenames.go rename to internal/arduino/utils/filenames.go diff --git a/arduino/utils/search.go b/internal/arduino/utils/search.go similarity index 100% rename from arduino/utils/search.go rename to internal/arduino/utils/search.go diff --git a/arduino/utils/url.go b/internal/arduino/utils/url.go similarity index 100% rename from arduino/utils/url.go rename to internal/arduino/utils/url.go diff --git a/arduino/utils/url_test.go b/internal/arduino/utils/url_test.go similarity index 100% rename from arduino/utils/url_test.go rename to internal/arduino/utils/url_test.go diff --git a/internal/cli/arguments/fqbn.go b/internal/cli/arguments/fqbn.go index 84c805c0088..7f1291537a6 100644 --- a/internal/cli/arguments/fqbn.go +++ b/internal/cli/arguments/fqbn.go @@ -18,7 +18,7 @@ package arguments import ( "strings" - "github.com/arduino/arduino-cli/arduino" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/feedback" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/spf13/cobra" diff --git a/internal/cli/arguments/port.go b/internal/cli/arguments/port.go index de583dccf51..183cb839216 100644 --- a/internal/cli/arguments/port.go +++ b/internal/cli/arguments/port.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/commands/board" f "github.com/arduino/arduino-cli/internal/algorithms" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/feedback" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" diff --git a/internal/cli/arguments/reference.go b/internal/cli/arguments/reference.go index ed6152af5b8..4d4fce1924b 100644 --- a/internal/cli/arguments/reference.go +++ b/internal/cli/arguments/reference.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/commands/core" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/instance" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" diff --git a/internal/cli/board/list.go b/internal/cli/board/list.go index cdb226c0b36..8a08d2ec2ca 100644 --- a/internal/cli/board/list.go +++ b/internal/cli/board/list.go @@ -22,9 +22,9 @@ import ( "os" "sort" - "github.com/arduino/arduino-cli/arduino" - "github.com/arduino/arduino-cli/arduino/cores" "github.com/arduino/arduino-cli/commands/board" + "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" diff --git a/internal/cli/burnbootloader/burnbootloader.go b/internal/cli/burnbootloader/burnbootloader.go index 0792f1c87e7..8d11cd547e2 100644 --- a/internal/cli/burnbootloader/burnbootloader.go +++ b/internal/cli/burnbootloader/burnbootloader.go @@ -20,9 +20,9 @@ import ( "errors" "os" - "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/commands/upload" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/instance" diff --git a/internal/cli/compile/compile.go b/internal/cli/compile/compile.go index 17e99f2801c..8966b977b96 100644 --- a/internal/cli/compile/compile.go +++ b/internal/cli/compile/compile.go @@ -24,12 +24,12 @@ import ( "os" "strings" - "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/commands/compile" "github.com/arduino/arduino-cli/commands/core" "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/commands/upload" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" diff --git a/internal/cli/core/search.go b/internal/cli/core/search.go index 6122b649ec7..b84b855b8ad 100644 --- a/internal/cli/core/search.go +++ b/internal/cli/core/search.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/arduino/arduino-cli/arduino/globals" - "github.com/arduino/arduino-cli/arduino/utils" "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/core" + "github.com/arduino/arduino-cli/internal/arduino/globals" + "github.com/arduino/arduino-cli/internal/arduino/utils" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" diff --git a/internal/cli/core/upgrade.go b/internal/cli/core/upgrade.go index c7282d9ba4d..8798f4fb734 100644 --- a/internal/cli/core/upgrade.go +++ b/internal/cli/core/upgrade.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/commands/core" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/instance" diff --git a/internal/cli/debug/debug.go b/internal/cli/debug/debug.go index 772b16071fc..93228526fea 100644 --- a/internal/cli/debug/debug.go +++ b/internal/cli/debug/debug.go @@ -22,10 +22,10 @@ import ( "os" "os/signal" - "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/commands/debug" "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/table" diff --git a/internal/cli/sketch/new.go b/internal/cli/sketch/new.go index 01aa818168c..3514a05556b 100644 --- a/internal/cli/sketch/new.go +++ b/internal/cli/sketch/new.go @@ -20,8 +20,8 @@ import ( "os" "strings" - "github.com/arduino/arduino-cli/arduino/globals" sk "github.com/arduino/arduino-cli/commands/sketch" + "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/arduino-cli/internal/cli/feedback" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" diff --git a/internal/cli/updater/updater.go b/internal/cli/updater/updater.go index 185e8a5051f..bbedb1a2378 100644 --- a/internal/cli/updater/updater.go +++ b/internal/cli/updater/updater.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/arduino/arduino-cli/arduino/httpclient" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino/httpclient" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/inventory" diff --git a/internal/cli/upload/upload.go b/internal/cli/upload/upload.go index 6ea7e22e483..e3f3bd17bea 100644 --- a/internal/cli/upload/upload.go +++ b/internal/cli/upload/upload.go @@ -22,11 +22,11 @@ import ( "os" "strings" - "github.com/arduino/arduino-cli/arduino" "github.com/arduino/arduino-cli/commands/core" sk "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/commands/upload" "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" diff --git a/internal/integrationtest/compile_1/compile_test.go b/internal/integrationtest/compile_1/compile_test.go index 7ab7ab97f5e..40add0dc391 100644 --- a/internal/integrationtest/compile_1/compile_test.go +++ b/internal/integrationtest/compile_1/compile_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/arduino/arduino-cli/arduino/builder/cpp" + "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" "github.com/arduino/arduino-cli/internal/integrationtest" "github.com/arduino/go-paths-helper" "github.com/go-git/go-git/v5" diff --git a/internal/integrationtest/compile_4/compile_test.go b/internal/integrationtest/compile_4/compile_test.go index 42bd97fd1a9..b48075fa21c 100644 --- a/internal/integrationtest/compile_4/compile_test.go +++ b/internal/integrationtest/compile_4/compile_test.go @@ -27,7 +27,7 @@ import ( "text/template" "time" - "github.com/arduino/arduino-cli/arduino/builder/cpp" + "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" "github.com/arduino/arduino-cli/internal/integrationtest" "github.com/arduino/go-paths-helper" "github.com/stretchr/testify/require" diff --git a/internal/integrationtest/daemon/daemon_test.go b/internal/integrationtest/daemon/daemon_test.go index 25df9e25aa2..964adc73d9b 100644 --- a/internal/integrationtest/daemon/daemon_test.go +++ b/internal/integrationtest/daemon/daemon_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/arduino/arduino-cli/arduino" f "github.com/arduino/arduino-cli/internal/algorithms" + "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/integrationtest" "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" From 729fd2775e239b838ca26a3de7034b3d6e8a78f5 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 6 Dec 2023 20:17:39 +0100 Subject: [PATCH 03/11] Moved errors in their own package --- commands/board/details.go | 8 +-- commands/board/list.go | 10 ++-- commands/board/listall.go | 4 +- commands/board/search.go | 4 +- .../cmderrors/cmderrors.go | 2 +- commands/compile/compile.go | 42 +++++++-------- commands/core/download.go | 8 +-- commands/core/install.go | 8 +-- commands/core/search.go | 4 +- commands/core/uninstall.go | 10 ++-- commands/core/upgrade.go | 4 +- commands/daemon/daemon.go | 4 +- commands/debug/debug.go | 10 ++-- commands/debug/debug_info.go | 28 +++++----- commands/instances.go | 52 +++++++++---------- commands/internal/instances/instances.go | 8 +-- commands/lib/download.go | 8 +-- commands/lib/install.go | 14 ++--- commands/lib/list.go | 12 ++--- commands/lib/resolve_deps.go | 8 +-- commands/lib/search.go | 4 +- commands/lib/uninstall.go | 6 +-- commands/lib/upgrade.go | 8 +-- commands/lib/utils.go | 6 +-- commands/monitor/monitor.go | 22 ++++---- commands/monitor/settings.go | 8 +-- commands/sketch/archive.go | 16 +++--- commands/sketch/load.go | 4 +- commands/sketch/new.go | 16 +++--- commands/sketch/set_defaults.go | 8 +-- commands/upload/burnbootloader.go | 4 +- commands/upload/programmers_list.go | 10 ++-- commands/upload/upload.go | 52 +++++++++---------- .../arduino/cores/packagemanager/download.go | 6 +-- .../cores/packagemanager/install_uninstall.go | 30 +++++------ .../arduino/cores/packagemanager/loader.go | 4 +- .../cores/packagemanager/package_manager.go | 4 +- .../arduino/cores/packagemanager/profiles.go | 20 +++---- internal/arduino/httpclient/httpclient.go | 6 +-- .../libraries/librariesmanager/install.go | 4 +- internal/arduino/resources/index.go | 34 ++++++------ internal/cli/arguments/fqbn.go | 6 +-- internal/cli/arguments/port.go | 6 +-- internal/cli/arguments/reference.go | 6 +-- internal/cli/board/list.go | 4 +- internal/cli/burnbootloader/burnbootloader.go | 6 +-- internal/cli/compile/compile.go | 8 +-- internal/cli/core/upgrade.go | 4 +- internal/cli/debug/debug.go | 6 +-- internal/cli/upload/upload.go | 8 +-- .../integrationtest/daemon/daemon_test.go | 6 +-- 51 files changed, 290 insertions(+), 290 deletions(-) rename internal/arduino/errors.go => commands/cmderrors/cmderrors.go (99%) diff --git a/commands/board/details.go b/commands/board/details.go index 7f3b1d53f7a..604f6cb4553 100644 --- a/commands/board/details.go +++ b/commands/board/details.go @@ -18,8 +18,8 @@ package board import ( "context" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" @@ -30,18 +30,18 @@ import ( func Details(ctx context.Context, req *rpc.BoardDetailsRequest) (*rpc.BoardDetailsResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() fqbn, err := cores.ParseFQBN(req.GetFqbn()) if err != nil { - return nil, &arduino.InvalidFQBNError{Cause: err} + return nil, &cmderrors.InvalidFQBNError{Cause: err} } boardPackage, boardPlatformRelease, board, boardProperties, _, err := pme.ResolveFQBN(fqbn) if err != nil { - return nil, &arduino.UnknownFQBNError{Cause: err} + return nil, &cmderrors.UnknownFQBNError{Cause: err} } details := &rpc.BoardDetailsResponse{} diff --git a/commands/board/list.go b/commands/board/list.go index 59630771390..16ee283d315 100644 --- a/commands/board/list.go +++ b/commands/board/list.go @@ -26,8 +26,8 @@ import ( "strings" "time" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/internal/arduino/discovery" @@ -151,7 +151,7 @@ func identify(pme *packagemanager.Explorer, port *discovery.Port) ([]*rpc.BoardL for _, board := range pme.IdentifyBoard(port.Properties) { fqbn, err := cores.ParseFQBN(board.FQBN()) if err != nil { - return nil, &arduino.InvalidFQBNError{Cause: err} + return nil, &cmderrors.InvalidFQBNError{Cause: err} } fqbn.Configs = board.IdentifyBoardConfiguration(port.Properties) @@ -207,7 +207,7 @@ func identify(pme *packagemanager.Explorer, port *discovery.Port) ([]*rpc.BoardL func List(req *rpc.BoardListRequest) (r []*rpc.DetectedPort, discoveryStartErrors []error, e error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, nil, &arduino.InvalidInstanceError{} + return nil, nil, &cmderrors.InvalidInstanceError{} } defer release() @@ -216,7 +216,7 @@ func List(req *rpc.BoardListRequest) (r []*rpc.DetectedPort, discoveryStartError var err error fqbnFilter, err = cores.ParseFQBN(f) if err != nil { - return nil, nil, &arduino.InvalidFQBNError{Cause: err} + return nil, nil, &cmderrors.InvalidFQBNError{Cause: err} } } @@ -262,7 +262,7 @@ func hasMatchingBoard(b *rpc.DetectedPort, fqbnFilter *cores.FQBN) bool { func Watch(ctx context.Context, req *rpc.BoardListWatchRequest) (<-chan *rpc.BoardListWatchResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() dm := pme.DiscoveryManager() diff --git a/commands/board/listall.go b/commands/board/listall.go index 17670c5c150..8b03ed890f1 100644 --- a/commands/board/listall.go +++ b/commands/board/listall.go @@ -21,8 +21,8 @@ import ( "strings" "github.com/arduino/arduino-cli/commands" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" @@ -32,7 +32,7 @@ import ( func ListAll(ctx context.Context, req *rpc.BoardListAllRequest) (*rpc.BoardListAllResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() diff --git a/commands/board/search.go b/commands/board/search.go index 79ca8b872bf..08bb388b240 100644 --- a/commands/board/search.go +++ b/commands/board/search.go @@ -21,8 +21,8 @@ import ( "strings" "github.com/arduino/arduino-cli/commands" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) @@ -34,7 +34,7 @@ import ( func Search(ctx context.Context, req *rpc.BoardSearchRequest) (*rpc.BoardSearchResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() diff --git a/internal/arduino/errors.go b/commands/cmderrors/cmderrors.go similarity index 99% rename from internal/arduino/errors.go rename to commands/cmderrors/cmderrors.go index b87adb8ee21..d5b0c93bf34 100644 --- a/internal/arduino/errors.go +++ b/commands/cmderrors/cmderrors.go @@ -13,7 +13,7 @@ // Arduino software without disclosing the source code of your own applications. // To purchase a commercial license, send an email to license@arduino.cc. -package arduino +package cmderrors import ( "fmt" diff --git a/commands/compile/compile.go b/commands/compile/compile.go index 0a36b0648d0..8e4d4af3547 100644 --- a/commands/compile/compile.go +++ b/commands/compile/compile.go @@ -23,9 +23,9 @@ import ( "sort" "strings" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/builder" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" @@ -59,23 +59,23 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() lm := instances.GetLibraryManager(req.GetInstance()) if lm == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } logrus.Tracef("Compile %s for %s started", req.GetSketchPath(), req.GetFqbn()) if req.GetSketchPath() == "" { - return nil, &arduino.MissingSketchPathError{} + return nil, &cmderrors.MissingSketchPathError{} } sketchPath := paths.New(req.GetSketchPath()) sk, err := sketch.New(sketchPath) if err != nil { - return nil, &arduino.CantOpenSketchError{Cause: err} + return nil, &cmderrors.CantOpenSketchError{Cause: err} } fqbnIn := req.GetFqbn() @@ -87,22 +87,22 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream } } if fqbnIn == "" { - return nil, &arduino.MissingFQBNError{} + return nil, &cmderrors.MissingFQBNError{} } fqbn, err := cores.ParseFQBN(fqbnIn) if err != nil { - return nil, &arduino.InvalidFQBNError{Cause: err} + return nil, &cmderrors.InvalidFQBNError{Cause: err} } _, targetPlatform, targetBoard, boardBuildProperties, buildPlatform, err := pme.ResolveFQBN(fqbn) if err != nil { if targetPlatform == nil { - return nil, &arduino.PlatformNotFoundError{ + return nil, &cmderrors.PlatformNotFoundError{ Platform: fmt.Sprintf("%s:%s", fqbn.Package, fqbn.PlatformArch), Cause: fmt.Errorf(tr("platform not installed")), } } - return nil, &arduino.InvalidFQBNError{Cause: err} + return nil, &cmderrors.InvalidFQBNError{Cause: err} } r = &rpc.CompileResponse{} @@ -145,7 +145,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream buildPath = sk.DefaultBuildPath() } if err = buildPath.MkdirAll(); err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Cannot create build directory"), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Cannot create build directory"), Cause: err} } buildcache.New(buildPath.Parent()).GetOrCreate(buildPath.Base()) // cache is purged after compilation to not remove entries that might be required @@ -157,10 +157,10 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream } else { buildCachePath, err := paths.New(req.GetBuildCachePath()).Abs() if err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Cannot create build cache directory"), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Cannot create build cache directory"), Cause: err} } if err := buildCachePath.MkdirAll(); err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Cannot create build cache directory"), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Cannot create build cache directory"), Cause: err} } coreBuildCachePath = buildCachePath.Join("core") } @@ -203,14 +203,14 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream ) if err != nil { if strings.Contains(err.Error(), "invalid build properties") { - return nil, &arduino.InvalidArgumentError{Message: tr("Invalid build properties"), Cause: err} + return nil, &cmderrors.InvalidArgumentError{Message: tr("Invalid build properties"), Cause: err} } if errors.Is(err, builder.ErrSketchCannotBeLocatedInBuildPath) { - return r, &arduino.CompileFailedError{ + return r, &cmderrors.CompileFailedError{ Message: tr("Sketch cannot be located in build path. Please specify a different build path"), } } - return r, &arduino.CompileFailedError{Message: err.Error()} + return r, &cmderrors.CompileFailedError{Message: err.Error()} } defer func() { @@ -247,7 +247,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream // Just output preprocessed source code and exit preprocessedSketch, err := sketchBuilder.Preprocess() if err != nil { - err = &arduino.CompileFailedError{Message: err.Error()} + err = &cmderrors.CompileFailedError{Message: err.Error()} return r, err } _, err = outStream.Write(preprocessedSketch) @@ -293,7 +293,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream } if err := sketchBuilder.Build(); err != nil { - return r, &arduino.CompileFailedError{Message: err.Error()} + return r, &cmderrors.CompileFailedError{Message: err.Error()} } // If the export directory is set we assume you want to export the binaries @@ -321,23 +321,23 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream if !buildPath.EqualsTo(exportPath) { logrus.WithField("path", exportPath).Trace("Saving sketch to export path.") if err := exportPath.MkdirAll(); err != nil { - return r, &arduino.PermissionDeniedError{Message: tr("Error creating output dir"), Cause: err} + return r, &cmderrors.PermissionDeniedError{Message: tr("Error creating output dir"), Cause: err} } baseName, ok := sketchBuilder.GetBuildProperties().GetOk("build.project_name") // == "sketch.ino" if !ok { - return r, &arduino.MissingPlatformPropertyError{Property: "build.project_name"} + return r, &cmderrors.MissingPlatformPropertyError{Property: "build.project_name"} } buildFiles, err := sketchBuilder.GetBuildPath().ReadDir() if err != nil { - return r, &arduino.PermissionDeniedError{Message: tr("Error reading build directory"), Cause: err} + return r, &cmderrors.PermissionDeniedError{Message: tr("Error reading build directory"), Cause: err} } buildFiles.FilterPrefix(baseName) for _, buildFile := range buildFiles { exportedFile := exportPath.Join(buildFile.Base()) logrus.WithField("src", buildFile).WithField("dest", exportedFile).Trace("Copying artifact.") if err = buildFile.CopyTo(exportedFile); err != nil { - return r, &arduino.PermissionDeniedError{Message: tr("Error copying output file %s", buildFile), Cause: err} + return r, &cmderrors.PermissionDeniedError{Message: tr("Error copying output file %s", buildFile), Cause: err} } } } diff --git a/commands/core/download.go b/commands/core/download.go index 5650eaa2043..2d67157d31e 100644 --- a/commands/core/download.go +++ b/commands/core/download.go @@ -19,9 +19,9 @@ import ( "context" "github.com/arduino/arduino-cli/commands" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) @@ -32,13 +32,13 @@ var tr = i18n.Tr func PlatformDownload(ctx context.Context, req *rpc.PlatformDownloadRequest, downloadCB rpc.DownloadProgressCB) (*rpc.PlatformDownloadResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() version, err := commands.ParseVersion(req) if err != nil { - return nil, &arduino.InvalidVersionError{Cause: err} + return nil, &cmderrors.InvalidVersionError{Cause: err} } ref := &packagemanager.PlatformReference{ @@ -48,7 +48,7 @@ func PlatformDownload(ctx context.Context, req *rpc.PlatformDownloadRequest, dow } platform, tools, err := pme.FindPlatformReleaseDependencies(ref) if err != nil { - return nil, &arduino.PlatformNotFoundError{Platform: ref.String(), Cause: err} + return nil, &cmderrors.PlatformNotFoundError{Platform: ref.String(), Cause: err} } if err := pme.DownloadPlatformRelease(platform, nil, downloadCB); err != nil { diff --git a/commands/core/install.go b/commands/core/install.go index 573ec891146..01a37736649 100644 --- a/commands/core/install.go +++ b/commands/core/install.go @@ -20,8 +20,8 @@ import ( "fmt" "github.com/arduino/arduino-cli/commands" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) @@ -31,13 +31,13 @@ func PlatformInstall(ctx context.Context, req *rpc.PlatformInstallRequest, downl install := func() error { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return &arduino.InvalidInstanceError{} + return &cmderrors.InvalidInstanceError{} } defer release() version, err := commands.ParseVersion(req) if err != nil { - return &arduino.InvalidVersionError{Cause: err} + return &cmderrors.InvalidVersionError{Cause: err} } ref := &packagemanager.PlatformReference{ @@ -47,7 +47,7 @@ func PlatformInstall(ctx context.Context, req *rpc.PlatformInstallRequest, downl } platformRelease, tools, err := pme.FindPlatformReleaseDependencies(ref) if err != nil { - return &arduino.PlatformNotFoundError{Platform: ref.String(), Cause: err} + return &cmderrors.PlatformNotFoundError{Platform: ref.String(), Cause: err} } // Prerequisite checks before install diff --git a/commands/core/search.go b/commands/core/search.go index 8346911798b..9631aaae6b2 100644 --- a/commands/core/search.go +++ b/commands/core/search.go @@ -21,8 +21,8 @@ import ( "strings" "github.com/arduino/arduino-cli/commands" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" @@ -32,7 +32,7 @@ import ( func PlatformSearch(req *rpc.PlatformSearchRequest) (*rpc.PlatformSearchResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() diff --git a/commands/core/uninstall.go b/commands/core/uninstall.go index 55740a3b581..c95d9e1afb4 100644 --- a/commands/core/uninstall.go +++ b/commands/core/uninstall.go @@ -19,8 +19,8 @@ import ( "context" "github.com/arduino/arduino-cli/commands" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) @@ -40,7 +40,7 @@ func PlatformUninstall(ctx context.Context, req *rpc.PlatformUninstallRequest, t func platformUninstall(ctx context.Context, req *rpc.PlatformUninstallRequest, taskCB rpc.TaskProgressCB) error { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return &arduino.InvalidInstanceError{} + return &cmderrors.InvalidInstanceError{} } defer release() @@ -51,18 +51,18 @@ func platformUninstall(ctx context.Context, req *rpc.PlatformUninstallRequest, t if ref.PlatformVersion == nil { platform := pme.FindPlatform(ref) if platform == nil { - return &arduino.PlatformNotFoundError{Platform: ref.String()} + return &cmderrors.PlatformNotFoundError{Platform: ref.String()} } platformRelease := pme.GetInstalledPlatformRelease(platform) if platformRelease == nil { - return &arduino.PlatformNotFoundError{Platform: ref.String()} + return &cmderrors.PlatformNotFoundError{Platform: ref.String()} } ref.PlatformVersion = platformRelease.Version } platform, tools, err := pme.FindPlatformReleaseDependencies(ref) if err != nil { - return &arduino.NotFoundError{Message: tr("Can't find dependencies for platform %s", ref), Cause: err} + return &cmderrors.NotFoundError{Message: tr("Can't find dependencies for platform %s", ref), Cause: err} } if err := pme.UninstallPlatform(platform, taskCB, req.GetSkipPreUninstall()); err != nil { diff --git a/commands/core/upgrade.go b/commands/core/upgrade.go index 0f359972f5a..cecb2e721d8 100644 --- a/commands/core/upgrade.go +++ b/commands/core/upgrade.go @@ -19,8 +19,8 @@ import ( "context" "github.com/arduino/arduino-cli/commands" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" @@ -31,7 +31,7 @@ func PlatformUpgrade(ctx context.Context, req *rpc.PlatformUpgradeRequest, downl upgrade := func() (*cores.PlatformRelease, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() diff --git a/commands/daemon/daemon.go b/commands/daemon/daemon.go index b2cbf53f879..ffb7e0c0f5d 100644 --- a/commands/daemon/daemon.go +++ b/commands/daemon/daemon.go @@ -23,6 +23,7 @@ import ( "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/board" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/compile" "github.com/arduino/arduino-cli/commands/core" "github.com/arduino/arduino-cli/commands/lib" @@ -30,7 +31,6 @@ import ( "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/commands/upload" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" "google.golang.org/grpc/metadata" @@ -50,7 +50,7 @@ func convertErrorToRPCStatus(err error) error { if err == nil { return nil } - if cmdErr, ok := err.(arduino.CommandError); ok { + if cmdErr, ok := err.(cmderrors.CommandError); ok { return cmdErr.ToRPCStatus().Err() } return err diff --git a/commands/debug/debug.go b/commands/debug/debug.go index e04ba12d40f..76282515e5e 100644 --- a/commands/debug/debug.go +++ b/commands/debug/debug.go @@ -24,9 +24,9 @@ import ( "runtime" "time" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" @@ -46,7 +46,7 @@ func Debug(ctx context.Context, req *rpc.GetDebugConfigRequest, inStream io.Read // Get debugging command line to run debugger pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() @@ -68,7 +68,7 @@ func Debug(ctx context.Context, req *rpc.GetDebugConfigRequest, inStream io.Read cmd, err := paths.NewProcess(pme.GetEnvVarsForSpawnedProcess(), commandLine...) if err != nil { - return nil, &arduino.FailedDebugError{Message: tr("Cannot execute debug tool"), Cause: err} + return nil, &cmderrors.FailedDebugError{Message: tr("Cannot execute debug tool"), Cause: err} } // Get stdIn pipe from tool @@ -135,7 +135,7 @@ func getCommandLine(req *rpc.GetDebugConfigRequest, pme *packagemanager.Explorer } gdbPath = paths.New(debugInfo.GetToolchainPath()).Join(gdbexecutable) default: - return nil, &arduino.FailedDebugError{Message: tr("Toolchain '%s' is not supported", debugInfo.GetToolchain())} + return nil, &cmderrors.FailedDebugError{Message: tr("Toolchain '%s' is not supported", debugInfo.GetToolchain())} } add(gdbPath.String()) @@ -179,7 +179,7 @@ func getCommandLine(req *rpc.GetDebugConfigRequest, pme *packagemanager.Explorer add(serverCmd) default: - return nil, &arduino.FailedDebugError{Message: tr("GDB server '%s' is not supported", debugInfo.GetServer())} + return nil, &cmderrors.FailedDebugError{Message: tr("GDB server '%s' is not supported", debugInfo.GetServer())} } // Add executable diff --git a/commands/debug/debug_info.go b/commands/debug/debug_info.go index 536a09f9699..82e99b61eb0 100644 --- a/commands/debug/debug_info.go +++ b/commands/debug/debug_info.go @@ -24,8 +24,8 @@ import ( "strconv" "strings" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/internal/arduino/sketch" @@ -40,7 +40,7 @@ import ( func GetDebugConfig(ctx context.Context, req *rpc.GetDebugConfigRequest) (*rpc.GetDebugConfigResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() return getDebugProperties(req, pme, false) @@ -50,7 +50,7 @@ func GetDebugConfig(ctx context.Context, req *rpc.GetDebugConfigRequest) (*rpc.G func IsDebugSupported(ctx context.Context, req *rpc.IsDebugSupportedRequest) (*rpc.IsDebugSupportedResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() configRequest := &rpc.GetDebugConfigRequest{ @@ -63,7 +63,7 @@ func IsDebugSupported(ctx context.Context, req *rpc.IsDebugSupportedRequest) (*r Programmer: req.GetProgrammer(), } expectedOutput, err := getDebugProperties(configRequest, pme, true) - var x *arduino.FailedDebugError + var x *cmderrors.FailedDebugError if errors.As(err, &x) { return &rpc.IsDebugSupportedResponse{DebuggingSupported: false}, nil } @@ -99,12 +99,12 @@ func getDebugProperties(req *rpc.GetDebugConfigRequest, pme *packagemanager.Expl // TODO: make a generic function to extract sketch from request // and remove duplication in commands/compile.go if req.GetSketchPath() == "" { - return nil, &arduino.MissingSketchPathError{} + return nil, &cmderrors.MissingSketchPathError{} } sketchPath := paths.New(req.GetSketchPath()) sk, err := sketch.New(sketchPath) if err != nil { - return nil, &arduino.CantOpenSketchError{Cause: err} + return nil, &cmderrors.CantOpenSketchError{Cause: err} } sketchName = sk.Name sketchDefaultFQBN = sk.GetDefaultFQBN() @@ -122,17 +122,17 @@ func getDebugProperties(req *rpc.GetDebugConfigRequest, pme *packagemanager.Expl fqbnIn = sketchDefaultFQBN } if fqbnIn == "" { - return nil, &arduino.MissingFQBNError{} + return nil, &cmderrors.MissingFQBNError{} } fqbn, err := cores.ParseFQBN(fqbnIn) if err != nil { - return nil, &arduino.InvalidFQBNError{Cause: err} + return nil, &cmderrors.InvalidFQBNError{Cause: err} } // Find target board and board properties _, platformRelease, _, boardProperties, referencedPlatformRelease, err := pme.ResolveFQBN(fqbn) if err != nil { - return nil, &arduino.UnknownFQBNError{Cause: err} + return nil, &cmderrors.UnknownFQBNError{Cause: err} } // Build configuration for debug @@ -155,14 +155,14 @@ func getDebugProperties(req *rpc.GetDebugConfigRequest, pme *packagemanager.Expl } if req.GetProgrammer() == "" { - return nil, &arduino.MissingProgrammerError{} + return nil, &cmderrors.MissingProgrammerError{} } if p, ok := platformRelease.Programmers[req.GetProgrammer()]; ok { toolProperties.Merge(p.Properties) } else if refP, ok := referencedPlatformRelease.Programmers[req.GetProgrammer()]; ok { toolProperties.Merge(refP.Properties) } else { - return nil, &arduino.ProgrammerNotFoundError{Programmer: req.GetProgrammer()} + return nil, &cmderrors.ProgrammerNotFoundError{Programmer: req.GetProgrammer()} } var importPath *paths.Path @@ -173,10 +173,10 @@ func getDebugProperties(req *rpc.GetDebugConfigRequest, pme *packagemanager.Expl } if !skipSketchChecks { if !importPath.Exist() { - return nil, &arduino.NotFoundError{Message: tr("Compiled sketch not found in %s", importPath)} + return nil, &cmderrors.NotFoundError{Message: tr("Compiled sketch not found in %s", importPath)} } if !importPath.IsDir() { - return nil, &arduino.NotFoundError{Message: tr("Expected compiled sketch in directory %s, but is a file instead", importPath)} + return nil, &cmderrors.NotFoundError{Message: tr("Expected compiled sketch in directory %s, but is a file instead", importPath)} } } toolProperties.SetPath("build.path", importPath) @@ -203,7 +203,7 @@ func getDebugProperties(req *rpc.GetDebugConfigRequest, pme *packagemanager.Expl } if !debugProperties.ContainsKey("executable") || debugProperties.Get("executable") == "" { - return nil, &arduino.FailedDebugError{Message: tr("Debugging not supported for board %s", req.GetFqbn())} + return nil, &cmderrors.FailedDebugError{Message: tr("Debugging not supported for board %s", req.GetFqbn())} } server := debugProperties.Get("server") diff --git a/commands/instances.go b/commands/instances.go index 075c2fa9e04..6164f903b9c 100644 --- a/commands/instances.go +++ b/commands/instances.go @@ -22,9 +22,9 @@ import ( "path/filepath" "strings" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packageindex" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" @@ -79,11 +79,11 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro } reqInst := req.GetInstance() if reqInst == nil { - return &arduino.InvalidInstanceError{} + return &cmderrors.InvalidInstanceError{} } instance := req.GetInstance() if !instances.IsValid(instance) { - return &arduino.InvalidInstanceError{} + return &cmderrors.InvalidInstanceError{} } // Setup callback functions @@ -121,11 +121,11 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro if req.GetProfile() != "" { sk, err := sketch.New(paths.New(req.GetSketchPath())) if err != nil { - return &arduino.InvalidArgumentError{Cause: err} + return &cmderrors.InvalidArgumentError{Cause: err} } profile = sk.GetProfile(req.GetProfile()) if profile == nil { - return &arduino.UnknownProfileError{Profile: req.GetProfile()} + return &cmderrors.UnknownProfileError{Profile: req.GetProfile()} } responseCallback(&rpc.InitResponse{ Message: &rpc.InitResponse_Profile{ @@ -145,7 +145,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro for _, u := range configuration.Settings.GetStringSlice("board_manager.additional_urls") { URL, err := utils.URLParse(u) if err != nil { - e := &arduino.InitFailedError{ + e := &cmderrors.InitFailedError{ Code: codes.InvalidArgument, Cause: fmt.Errorf(tr("Invalid additional URL: %v", err)), Reason: rpc.FailedInstanceInitReason_FAILED_INSTANCE_INIT_REASON_INVALID_INDEX_URL, @@ -157,7 +157,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro } } if err := firstUpdate(context.Background(), req.GetInstance(), downloadCallback, allPackageIndexUrls); err != nil { - e := &arduino.InitFailedError{ + e := &cmderrors.InitFailedError{ Code: codes.InvalidArgument, Cause: err, Reason: rpc.FailedInstanceInitReason_FAILED_INSTANCE_INIT_REASON_INDEX_DOWNLOAD_ERROR, @@ -178,7 +178,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro if URL.Scheme == "file" { _, err := pmb.LoadPackageIndexFromFile(paths.New(URL.Path)) if err != nil { - e := &arduino.InitFailedError{ + e := &cmderrors.InitFailedError{ Code: codes.FailedPrecondition, Cause: fmt.Errorf(tr("Loading index file: %v", err)), Reason: rpc.FailedInstanceInitReason_FAILED_INSTANCE_INIT_REASON_INDEX_LOAD_ERROR, @@ -189,7 +189,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro } if err := pmb.LoadPackageIndex(URL); err != nil { - e := &arduino.InitFailedError{ + e := &cmderrors.InitFailedError{ Code: codes.FailedPrecondition, Cause: fmt.Errorf(tr("Loading index file: %v", err)), Reason: rpc.FailedInstanceInitReason_FAILED_INSTANCE_INIT_REASON_INDEX_LOAD_ERROR, @@ -206,7 +206,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro // Load Platforms if profile == nil { for _, err := range pmb.LoadHardware() { - s := &arduino.PlatformLoadingError{Cause: err} + s := &cmderrors.PlatformLoadingError{Cause: err} responseError(s.ToRPCStatus()) } } else { @@ -215,7 +215,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro profile, true, downloadCallback, taskCallback, ) for _, err := range errs { - s := &arduino.PlatformLoadingError{Cause: err} + s := &cmderrors.PlatformLoadingError{Cause: err} responseError(s.ToRPCStatus()) } @@ -231,7 +231,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro for name, tool := range pmb.GetOrCreatePackage("builtin").Tools { latest := tool.LatestRelease() if latest == nil { - e := &arduino.InitFailedError{ + e := &cmderrors.InitFailedError{ Code: codes.Internal, Cause: fmt.Errorf(tr("can't find latest release of tool %s", name)), Reason: rpc.FailedInstanceInitReason_FAILED_INSTANCE_INIT_REASON_TOOL_LOAD_ERROR, @@ -246,7 +246,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro if len(builtinToolsToInstall) > 0 { for _, toolRelease := range builtinToolsToInstall { if err := installTool(pmb.Build(), toolRelease, downloadCallback, taskCallback); err != nil { - e := &arduino.InitFailedError{ + e := &cmderrors.InitFailedError{ Code: codes.Internal, Cause: err, Reason: rpc.FailedInstanceInitReason_FAILED_INSTANCE_INIT_REASON_TOOL_LOAD_ERROR, @@ -258,7 +258,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro // We installed at least one builtin tool after loading hardware // so we must reload again otherwise we would never found them. for _, err := range loadBuiltinTools() { - s := &arduino.PlatformLoadingError{Cause: err} + s := &cmderrors.PlatformLoadingError{Cause: err} responseError(s.ToRPCStatus()) } } @@ -270,7 +270,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro defer release() for _, err := range pme.LoadDiscoveries() { - s := &arduino.PlatformLoadingError{Cause: err} + s := &cmderrors.PlatformLoadingError{Cause: err} responseError(s.ToRPCStatus()) } @@ -319,13 +319,13 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro }) if libRelease == nil { taskCallback(&rpc.TaskProgress{Name: tr("Library %s not found", libraryRef)}) - err := &arduino.LibraryNotFoundError{Library: libraryRef.Library} + err := &cmderrors.LibraryNotFoundError{Library: libraryRef.Library} responseError(err.ToRPCStatus()) continue } if err := libRelease.Resource.Download(lm.DownloadsDir, nil, libRelease.String(), downloadCallback, ""); err != nil { taskCallback(&rpc.TaskProgress{Name: tr("Error downloading library %s", libraryRef)}) - e := &arduino.FailedLibraryInstallError{Cause: err} + e := &cmderrors.FailedLibraryInstallError{Cause: err} responseError(e.ToRPCStatus()) continue } @@ -335,7 +335,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro taskCallback(&rpc.TaskProgress{Name: tr("Installing library %s", libraryRef)}) if err := libRelease.Resource.Install(lm.DownloadsDir, libRoot, libDir); err != nil { taskCallback(&rpc.TaskProgress{Name: tr("Error installing library %s", libraryRef)}) - e := &arduino.FailedLibraryInstallError{Cause: err} + e := &cmderrors.FailedLibraryInstallError{Cause: err} responseError(e.ToRPCStatus()) continue } @@ -362,7 +362,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro // Destroy FIXMEDOC func Destroy(ctx context.Context, req *rpc.DestroyRequest) (*rpc.DestroyResponse, error) { if ok := instances.Delete(req.GetInstance()); !ok { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } return &rpc.DestroyResponse{}, nil } @@ -372,17 +372,17 @@ func UpdateLibrariesIndex(ctx context.Context, req *rpc.UpdateLibrariesIndexRequ logrus.Info("Updating libraries index") lm := instances.GetLibraryManager(req.GetInstance()) if lm == nil { - return &arduino.InvalidInstanceError{} + return &cmderrors.InvalidInstanceError{} } if err := lm.IndexFile.Parent().MkdirAll(); err != nil { - return &arduino.PermissionDeniedError{Message: tr("Could not create index directory"), Cause: err} + return &cmderrors.PermissionDeniedError{Message: tr("Could not create index directory"), Cause: err} } // Create a temp dir to stage all downloads tmp, err := paths.MkTempDir("", "library_index_download") if err != nil { - return &arduino.TempDirCreationFailedError{Cause: err} + return &cmderrors.TempDirCreationFailedError{Cause: err} } defer tmp.RemoveAll() @@ -400,7 +400,7 @@ func UpdateLibrariesIndex(ctx context.Context, req *rpc.UpdateLibrariesIndexRequ // UpdateIndex FIXMEDOC func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexRequest, downloadCB rpc.DownloadProgressCB) error { if !instances.IsValid(req.GetInstance()) { - return &arduino.InvalidInstanceError{} + return &cmderrors.InvalidInstanceError{} } indexpath := configuration.DataDir(configuration.Settings) @@ -448,7 +448,7 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexRequest, downloadCB rp } if failed { - return &arduino.FailedDownloadError{Message: tr("Some indexes could not be updated.")} + return &cmderrors.FailedDownloadError{Message: tr("Some indexes could not be updated.")} } return nil } @@ -475,9 +475,9 @@ func firstUpdate(ctx context.Context, instance *rpc.Instance, downloadCb func(ms } packageIndexFileName, err := (&resources.IndexResource{URL: URL}).IndexFileName() if err != nil { - return &arduino.FailedDownloadError{ + return &cmderrors.FailedDownloadError{ Message: tr("Error downloading index '%s'", URL), - Cause: &arduino.InvalidURLError{}} + Cause: &cmderrors.InvalidURLError{}} } packageIndexFile := dataDir.Join(packageIndexFileName) if packageIndexFile.NotExist() { diff --git a/commands/internal/instances/instances.go b/commands/internal/instances/instances.go index 90c02ff6987..199a143e18c 100644 --- a/commands/internal/instances/instances.go +++ b/commands/internal/instances/instances.go @@ -3,11 +3,11 @@ package instances import ( "sync" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/cli/configuration" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" + "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/arduino-cli/version" ) @@ -83,7 +83,7 @@ func Create(extraUserAgent ...string) (*rpc.Instance, error) { if downloadsDir.NotExist() { err := downloadsDir.MkdirAll() if err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Failed to create downloads directory"), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Failed to create downloads directory"), Cause: err} } } @@ -93,7 +93,7 @@ func Create(extraUserAgent ...string) (*rpc.Instance, error) { if packagesDir.NotExist() { err := packagesDir.MkdirAll() if err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Failed to create data directory"), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Failed to create data directory"), Cause: err} } } diff --git a/commands/lib/download.go b/commands/lib/download.go index d7d66d6b9c5..47022c3ee56 100644 --- a/commands/lib/download.go +++ b/commands/lib/download.go @@ -18,9 +18,9 @@ package lib import ( "context" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/httpclient" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" @@ -37,7 +37,7 @@ func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadRequest, downl lm := instances.GetLibraryManager(req.GetInstance()) if lm == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } logrus.Info("Preparing download") @@ -60,10 +60,10 @@ func downloadLibrary(lm *librariesmanager.LibrariesManager, libRelease *librarie taskCB(&rpc.TaskProgress{Name: tr("Downloading %s", libRelease)}) config, err := httpclient.GetDownloaderConfig() if err != nil { - return &arduino.FailedDownloadError{Message: tr("Can't download library"), Cause: err} + return &cmderrors.FailedDownloadError{Message: tr("Can't download library"), Cause: err} } if err := libRelease.Resource.Download(lm.DownloadsDir, config, libRelease.String(), downloadCB, queryParameter); err != nil { - return &arduino.FailedDownloadError{Message: tr("Can't download library"), Cause: err} + return &cmderrors.FailedDownloadError{Message: tr("Can't download library"), Cause: err} } taskCB(&rpc.TaskProgress{Completed: true}) diff --git a/commands/lib/install.go b/commands/lib/install.go index 997ddd4075a..8c9e3e5794e 100644 --- a/commands/lib/install.go +++ b/commands/lib/install.go @@ -21,8 +21,8 @@ import ( "fmt" "github.com/arduino/arduino-cli/commands" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" @@ -35,7 +35,7 @@ import ( func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error { lm := instances.GetLibraryManager(req.GetInstance()) if lm == nil { - return &arduino.InvalidInstanceError{} + return &cmderrors.InvalidInstanceError{} } toInstall := map[string]*rpc.LibraryDependencyStatus{} @@ -62,7 +62,7 @@ func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallRequest, downloa err := errors.New( tr("two different versions of the library %[1]s are required: %[2]s and %[3]s", dep.GetName(), dep.GetVersionRequired(), existingDep.GetVersionRequired())) - return &arduino.LibraryDependenciesResolutionFailedError{Cause: err} + return &cmderrors.LibraryDependenciesResolutionFailedError{Cause: err} } } toInstall[dep.GetName()] = dep @@ -131,12 +131,12 @@ func installLibrary(lm *librariesmanager.LibrariesManager, libRelease *libraries if libReplaced := installTask.ReplacedLib; libReplaced != nil { taskCB(&rpc.TaskProgress{Message: tr("Replacing %[1]s with %[2]s", libReplaced, libRelease)}) if err := lm.Uninstall(libReplaced); err != nil { - return &arduino.FailedLibraryInstallError{ + return &cmderrors.FailedLibraryInstallError{ Cause: fmt.Errorf("%s: %s", tr("could not remove old library"), err)} } } if err := lm.Install(libRelease, installTask.TargetPath); err != nil { - return &arduino.FailedLibraryInstallError{Cause: err} + return &cmderrors.FailedLibraryInstallError{Cause: err} } taskCB(&rpc.TaskProgress{Message: tr("Installed %s", libRelease), Completed: true}) @@ -147,7 +147,7 @@ func installLibrary(lm *librariesmanager.LibrariesManager, libRelease *libraries func ZipLibraryInstall(ctx context.Context, req *rpc.ZipLibraryInstallRequest, taskCB rpc.TaskProgressCB) error { lm := instances.GetLibraryManager(req.GetInstance()) if err := lm.InstallZipLib(ctx, paths.New(req.GetPath()), req.GetOverwrite()); err != nil { - return &arduino.FailedLibraryInstallError{Cause: err} + return &cmderrors.FailedLibraryInstallError{Cause: err} } taskCB(&rpc.TaskProgress{Message: tr("Library installed"), Completed: true}) return nil @@ -157,7 +157,7 @@ func ZipLibraryInstall(ctx context.Context, req *rpc.ZipLibraryInstallRequest, t func GitLibraryInstall(ctx context.Context, req *rpc.GitLibraryInstallRequest, taskCB rpc.TaskProgressCB) error { lm := instances.GetLibraryManager(req.GetInstance()) if err := lm.InstallGitLib(req.GetUrl(), req.GetOverwrite()); err != nil { - return &arduino.FailedLibraryInstallError{Cause: err} + return &cmderrors.FailedLibraryInstallError{Cause: err} } taskCB(&rpc.TaskProgress{Message: tr("Library installed"), Completed: true}) return nil diff --git a/commands/lib/list.go b/commands/lib/list.go index 9f5d645fe06..e1fa300ea1f 100644 --- a/commands/lib/list.go +++ b/commands/lib/list.go @@ -19,8 +19,8 @@ import ( "context" "strings" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" @@ -38,13 +38,13 @@ type installedLib struct { func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.LibraryListResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() lm := instances.GetLibraryManager(req.GetInstance()) if lm == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } nameFilter := strings.ToLower(req.GetName()) @@ -54,11 +54,11 @@ func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.Library allLibs = listLibraries(lm, req.GetUpdatable(), true) fqbn, err := cores.ParseFQBN(req.GetFqbn()) if err != nil { - return nil, &arduino.InvalidFQBNError{Cause: err} + return nil, &cmderrors.InvalidFQBNError{Cause: err} } _, boardPlatform, _, _, refBoardPlatform, err := pme.ResolveFQBN(fqbn) if err != nil { - return nil, &arduino.UnknownFQBNError{Cause: err} + return nil, &cmderrors.UnknownFQBNError{Cause: err} } filteredRes := map[string]*installedLib{} @@ -105,7 +105,7 @@ func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.Library } rpcLib, err := lib.Library.ToRPCLibrary() if err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Error getting information for library %s", lib.Library.Name), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Error getting information for library %s", lib.Library.Name), Cause: err} } installedLibs = append(installedLibs, &rpc.InstalledLibrary{ Library: rpcLib, diff --git a/commands/lib/resolve_deps.go b/commands/lib/resolve_deps.go index 72e9fa4c447..6131aa7b260 100644 --- a/commands/lib/resolve_deps.go +++ b/commands/lib/resolve_deps.go @@ -20,8 +20,8 @@ import ( "errors" "sort" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" @@ -32,7 +32,7 @@ import ( func LibraryResolveDependencies(ctx context.Context, req *rpc.LibraryResolveDependenciesRequest) (*rpc.LibraryResolveDependenciesResponse, error) { lm := instances.GetLibraryManager(req.GetInstance()) if lm == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } // Search the requested lib @@ -70,12 +70,12 @@ func LibraryResolveDependencies(ctx context.Context, req *rpc.LibraryResolveDepe for _, directDep := range reqLibRelease.GetDependencies() { if _, ok := lm.Index.Libraries[directDep.GetName()]; !ok { err := errors.New(tr("dependency '%s' is not available", directDep.GetName())) - return nil, &arduino.LibraryDependenciesResolutionFailedError{Cause: err} + return nil, &cmderrors.LibraryDependenciesResolutionFailedError{Cause: err} } } // Otherwise there is no possible solution, the depends field has an invalid formula - return nil, &arduino.LibraryDependenciesResolutionFailedError{} + return nil, &cmderrors.LibraryDependenciesResolutionFailedError{} } res := []*rpc.LibraryDependencyStatus{} diff --git a/commands/lib/search.go b/commands/lib/search.go index e75df05cf9a..e5492d4d0c7 100644 --- a/commands/lib/search.go +++ b/commands/lib/search.go @@ -20,8 +20,8 @@ import ( "sort" "strings" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" @@ -32,7 +32,7 @@ import ( func LibrarySearch(ctx context.Context, req *rpc.LibrarySearchRequest) (*rpc.LibrarySearchResponse, error) { lm := instances.GetLibraryManager(req.GetInstance()) if lm == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } return searchLibrary(req, lm), nil } diff --git a/commands/lib/uninstall.go b/commands/lib/uninstall.go index 39266569b2f..e31823add46 100644 --- a/commands/lib/uninstall.go +++ b/commands/lib/uninstall.go @@ -18,8 +18,8 @@ package lib import ( "context" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/libraries" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" @@ -30,7 +30,7 @@ func LibraryUninstall(ctx context.Context, req *rpc.LibraryUninstallRequest, tas lm := instances.GetLibraryManager(req.GetInstance()) ref, err := createLibIndexReference(lm, req) if err != nil { - return &arduino.InvalidLibraryError{Cause: err} + return &cmderrors.InvalidLibraryError{Cause: err} } libs := lm.FindByReference(ref, libraries.User) @@ -51,7 +51,7 @@ func LibraryUninstall(ctx context.Context, req *rpc.LibraryUninstallRequest, tas for _, lib := range libs { libsDir.Add(lib.InstallDir) } - return &arduino.MultipleLibraryInstallDetected{ + return &cmderrors.MultipleLibraryInstallDetected{ LibName: libs[0].Name, LibsDir: libsDir, Message: tr("Automatic library uninstall can't be performed in this case, please manually remove them."), diff --git a/commands/lib/upgrade.go b/commands/lib/upgrade.go index 7a1aefcd588..aac357c00f3 100644 --- a/commands/lib/upgrade.go +++ b/commands/lib/upgrade.go @@ -19,16 +19,16 @@ import ( "context" "github.com/arduino/arduino-cli/commands" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" - "github.com/arduino/arduino-cli/internal/arduino" ) // LibraryUpgradeAll upgrades all the available libraries func LibraryUpgradeAll(req *rpc.LibraryUpgradeAllRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error { lm := instances.GetLibraryManager(req.GetInstance()) if lm == nil { - return &arduino.InvalidInstanceError{} + return &cmderrors.InvalidInstanceError{} } if err := upgrade(req.GetInstance(), listLibraries(lm, true, false), downloadCB, taskCB); err != nil { @@ -46,7 +46,7 @@ func LibraryUpgradeAll(req *rpc.LibraryUpgradeAllRequest, downloadCB rpc.Downloa func LibraryUpgrade(ctx context.Context, req *rpc.LibraryUpgradeRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error { lm := instances.GetLibraryManager(req.GetInstance()) if lm == nil { - return &arduino.InvalidInstanceError{} + return &cmderrors.InvalidInstanceError{} } // Get the library to upgrade @@ -54,7 +54,7 @@ func LibraryUpgrade(ctx context.Context, req *rpc.LibraryUpgradeRequest, downloa lib := filterByName(listLibraries(lm, false, false), name) if lib == nil { // library not installed... - return &arduino.LibraryNotFoundError{Library: name} + return &cmderrors.LibraryNotFoundError{Library: name} } if lib.Available == nil { taskCB(&rpc.TaskProgress{Message: tr("Library %s is already at the latest version", name), Completed: true}) diff --git a/commands/lib/utils.go b/commands/lib/utils.go index 09fe71344fd..cab8d85ec0c 100644 --- a/commands/lib/utils.go +++ b/commands/lib/utils.go @@ -17,7 +17,7 @@ package lib import ( "github.com/arduino/arduino-cli/commands" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" ) @@ -30,7 +30,7 @@ type libraryReferencer interface { func createLibIndexReference(lm *librariesmanager.LibrariesManager, req libraryReferencer) (*librariesindex.Reference, error) { version, err := commands.ParseVersion(req) if err != nil { - return nil, &arduino.InvalidVersionError{Cause: err} + return nil, &cmderrors.InvalidVersionError{Cause: err} } return &librariesindex.Reference{Name: req.GetName(), Version: version}, nil @@ -43,7 +43,7 @@ func findLibraryIndexRelease(lm *librariesmanager.LibrariesManager, req libraryR } lib := lm.Index.FindRelease(ref) if lib == nil { - return nil, &arduino.LibraryNotFoundError{Library: ref.String()} + return nil, &cmderrors.LibraryNotFoundError{Library: ref.String()} } return lib, nil } diff --git a/commands/monitor/monitor.go b/commands/monitor/monitor.go index f0d8549de2d..f6285ec77bd 100644 --- a/commands/monitor/monitor.go +++ b/commands/monitor/monitor.go @@ -20,9 +20,9 @@ import ( "fmt" "io" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" pluggableMonitor "github.com/arduino/arduino-cli/internal/arduino/monitor" @@ -63,7 +63,7 @@ func (p *PortProxy) Close() error { func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggableMonitor.PortDescriptor, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, nil, &arduino.InvalidInstanceError{} + return nil, nil, &cmderrors.InvalidInstanceError{} } defer release() @@ -73,13 +73,13 @@ func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggab } if err := m.Run(); err != nil { - return nil, nil, &arduino.FailedMonitorError{Cause: err} + return nil, nil, &cmderrors.FailedMonitorError{Cause: err} } descriptor, err := m.Describe() if err != nil { m.Quit() - return nil, nil, &arduino.FailedMonitorError{Cause: err} + return nil, nil, &cmderrors.FailedMonitorError{Cause: err} } // Apply user-requested settings @@ -99,7 +99,7 @@ func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggab monIO, err := m.Open(req.GetPort().GetAddress(), req.GetPort().GetProtocol()) if err != nil { m.Quit() - return nil, nil, &arduino.FailedMonitorError{Cause: err} + return nil, nil, &cmderrors.FailedMonitorError{Cause: err} } logrus.Infof("Port %s successfully opened", req.GetPort().GetAddress()) @@ -115,7 +115,7 @@ func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggab func findMonitorAndSettingsForProtocolAndBoard(pme *packagemanager.Explorer, protocol, fqbn string) (*pluggableMonitor.PluggableMonitor, *properties.Map, error) { if protocol == "" { - return nil, nil, &arduino.MissingPortProtocolError{} + return nil, nil, &cmderrors.MissingPortProtocolError{} } var monitorDepOrRecipe *cores.MonitorDependency @@ -125,12 +125,12 @@ func findMonitorAndSettingsForProtocolAndBoard(pme *packagemanager.Explorer, pro if fqbn != "" { fqbn, err := cores.ParseFQBN(fqbn) if err != nil { - return nil, nil, &arduino.InvalidFQBNError{Cause: err} + return nil, nil, &cmderrors.InvalidFQBNError{Cause: err} } _, boardPlatform, _, boardProperties, _, err := pme.ResolveFQBN(fqbn) if err != nil { - return nil, nil, &arduino.UnknownFQBNError{Cause: err} + return nil, nil, &cmderrors.UnknownFQBNError{Cause: err} } boardSettings = cores.GetMonitorSettings(protocol, boardProperties) @@ -142,7 +142,7 @@ func findMonitorAndSettingsForProtocolAndBoard(pme *packagemanager.Explorer, pro cmdLine := boardProperties.ExpandPropsInString(recipe) cmdArgs, err := properties.SplitQuotedString(cmdLine, `"'`, false) if err != nil { - return nil, nil, &arduino.InvalidArgumentError{Message: tr("Invalid recipe in platform.txt"), Cause: err} + return nil, nil, &cmderrors.InvalidArgumentError{Message: tr("Invalid recipe in platform.txt"), Cause: err} } id := fmt.Sprintf("%s-%s", boardPlatform, protocol) return pluggableMonitor.New(id, cmdArgs...), boardSettings, nil @@ -160,13 +160,13 @@ func findMonitorAndSettingsForProtocolAndBoard(pme *packagemanager.Explorer, pro } if monitorDepOrRecipe == nil { - return nil, nil, &arduino.NoMonitorAvailableForProtocolError{Protocol: protocol} + return nil, nil, &cmderrors.NoMonitorAvailableForProtocolError{Protocol: protocol} } // If it is a monitor dependency, resolve tool and create a monitor client tool := pme.FindMonitorDependency(monitorDepOrRecipe) if tool == nil { - return nil, nil, &arduino.MonitorNotFoundError{Monitor: monitorDepOrRecipe.String()} + return nil, nil, &cmderrors.MonitorNotFoundError{Monitor: monitorDepOrRecipe.String()} } return pluggableMonitor.New( diff --git a/commands/monitor/settings.go b/commands/monitor/settings.go index 3b9a6a48193..4f170b942d4 100644 --- a/commands/monitor/settings.go +++ b/commands/monitor/settings.go @@ -18,8 +18,8 @@ package monitor import ( "context" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" pluggableMonitor "github.com/arduino/arduino-cli/internal/arduino/monitor" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) @@ -28,7 +28,7 @@ import ( func EnumerateMonitorPortSettings(ctx context.Context, req *rpc.EnumerateMonitorPortSettingsRequest) (*rpc.EnumerateMonitorPortSettingsResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() @@ -38,13 +38,13 @@ func EnumerateMonitorPortSettings(ctx context.Context, req *rpc.EnumerateMonitor } if err := m.Run(); err != nil { - return nil, &arduino.FailedMonitorError{Cause: err} + return nil, &cmderrors.FailedMonitorError{Cause: err} } defer m.Quit() desc, err := m.Describe() if err != nil { - return nil, &arduino.FailedMonitorError{Cause: err} + return nil, &cmderrors.FailedMonitorError{Cause: err} } // Apply default settings for this board and protocol diff --git a/commands/sketch/archive.go b/commands/sketch/archive.go index 8221d09c306..7d07d1fcbf2 100644 --- a/commands/sketch/archive.go +++ b/commands/sketch/archive.go @@ -22,8 +22,8 @@ import ( "path/filepath" "strings" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/sketch" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" @@ -43,7 +43,7 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc s, err := sketch.New(sketchPath) if err != nil { - return nil, &arduino.CantOpenSketchError{Cause: err} + return nil, &cmderrors.CantOpenSketchError{Cause: err} } sketchPath = s.FullPath @@ -56,7 +56,7 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc archivePath, err = archivePath.Clean().Abs() if err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Error getting absolute path of sketch archive"), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Error getting absolute path of sketch archive"), Cause: err} } // Makes archivePath point to a zip file @@ -68,19 +68,19 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc if !req.GetOverwrite() { if archivePath.Exist() { - return nil, &arduino.InvalidArgumentError{Message: tr("Archive already exists")} + return nil, &cmderrors.InvalidArgumentError{Message: tr("Archive already exists")} } } filesToZip, err := sketchPath.ReadDirRecursive() if err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Error reading sketch files"), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Error reading sketch files"), Cause: err} } filesToZip.FilterOutDirs() archive, err := archivePath.Create() if err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Error creating sketch archive"), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Error creating sketch archive"), Cause: err} } defer archive.Close() @@ -92,7 +92,7 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc if !req.GetIncludeBuildDir() { filePath, err := sketchPath.Parent().RelTo(f) if err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Error calculating relative file path"), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Error calculating relative file path"), Cause: err} } // Skips build folder @@ -104,7 +104,7 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc // We get the parent path since we want the archive to unpack as a folder. // If we don't do this the archive would contain all the sketch files as top level. if err := addFileToSketchArchive(zipWriter, f, sketchPath.Parent()); err != nil { - return nil, &arduino.PermissionDeniedError{Message: tr("Error adding file to sketch archive"), Cause: err} + return nil, &cmderrors.PermissionDeniedError{Message: tr("Error adding file to sketch archive"), Cause: err} } } diff --git a/commands/sketch/load.go b/commands/sketch/load.go index 30c1a9fb66c..d32fc505969 100644 --- a/commands/sketch/load.go +++ b/commands/sketch/load.go @@ -18,7 +18,7 @@ package sketch import ( "context" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/sketch" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" @@ -29,7 +29,7 @@ func LoadSketch(ctx context.Context, req *rpc.LoadSketchRequest) (*rpc.LoadSketc // TODO: This should be a ToRpc function for the Sketch struct sk, err := sketch.New(paths.New(req.GetSketchPath())) if err != nil { - return nil, &arduino.CantOpenSketchError{Cause: err} + return nil, &cmderrors.CantOpenSketchError{Cause: err} } otherSketchFiles := make([]string, sk.OtherSketchFiles.Len()) diff --git a/commands/sketch/new.go b/commands/sketch/new.go index abb0cfde19b..5a7f6003e29 100644 --- a/commands/sketch/new.go +++ b/commands/sketch/new.go @@ -20,7 +20,7 @@ import ( "errors" "regexp" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" @@ -57,17 +57,17 @@ func NewSketch(ctx context.Context, req *rpc.NewSketchRequest) (*rpc.NewSketchRe sketchDirPath := paths.New(sketchesDir).Join(req.GetSketchName()) if err := sketchDirPath.MkdirAll(); err != nil { - return nil, &arduino.CantCreateSketchError{Cause: err} + return nil, &cmderrors.CantCreateSketchError{Cause: err} } sketchName := sketchDirPath.Base() sketchMainFilePath := sketchDirPath.Join(sketchName + globals.MainFileValidExtension) if !req.GetOverwrite() { if sketchMainFilePath.Exist() { - return nil, &arduino.CantCreateSketchError{Cause: errors.New(tr(".ino file already exists"))} + return nil, &cmderrors.CantCreateSketchError{Cause: errors.New(tr(".ino file already exists"))} } } if err := sketchMainFilePath.WriteFile(emptySketch); err != nil { - return nil, &arduino.CantCreateSketchError{Cause: err} + return nil, &cmderrors.CantCreateSketchError{Cause: err} } return &rpc.NewSketchResponse{MainFile: sketchMainFilePath.String()}, nil @@ -75,20 +75,20 @@ func NewSketch(ctx context.Context, req *rpc.NewSketchRequest) (*rpc.NewSketchRe func validateSketchName(name string) error { if name == "" { - return &arduino.CantCreateSketchError{Cause: errors.New(tr("sketch name cannot be empty"))} + return &cmderrors.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 (%[1]d characters). Maximum allowed length is %[2]d", + return &cmderrors.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 "%[1]s": the first character must be alphanumeric or "_", the following ones can also contain "-" and ".". The last one cannot be ".".`, + return &cmderrors.CantCreateSketchError{Cause: errors.New(tr(`invalid sketch name "%[1]s": the first character must be alphanumeric or "_", the following ones can also contain "-" and ".". The last one cannot be ".".`, name))} } for _, invalid := range invalidNames { if name == invalid { - return &arduino.CantCreateSketchError{Cause: errors.New(tr(`sketch name cannot be the reserved name "%[1]s"`, invalid))} + return &cmderrors.CantCreateSketchError{Cause: errors.New(tr(`sketch name cannot be the reserved name "%[1]s"`, invalid))} } } return nil diff --git a/commands/sketch/set_defaults.go b/commands/sketch/set_defaults.go index 5583a6450e0..612d48a08a7 100644 --- a/commands/sketch/set_defaults.go +++ b/commands/sketch/set_defaults.go @@ -18,7 +18,7 @@ package sketch import ( "context" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/sketch" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" @@ -29,7 +29,7 @@ import ( func SetSketchDefaults(ctx context.Context, req *rpc.SetSketchDefaultsRequest) (*rpc.SetSketchDefaultsResponse, error) { sk, err := sketch.New(paths.New(req.GetSketchPath())) if err != nil { - return nil, &arduino.CantOpenSketchError{Cause: err} + return nil, &cmderrors.CantOpenSketchError{Cause: err} } oldAddress, oldProtocol := sk.GetDefaultPortAddressAndProtocol() @@ -41,13 +41,13 @@ func SetSketchDefaults(ctx context.Context, req *rpc.SetSketchDefaultsRequest) ( if fqbn := req.GetDefaultFqbn(); fqbn != "" { if err := sk.SetDefaultFQBN(fqbn); err != nil { - return nil, &arduino.CantUpdateSketchError{Cause: err} + return nil, &cmderrors.CantUpdateSketchError{Cause: err} } res.DefaultFqbn = fqbn } if newAddress, newProtocol := req.GetDefaultPortAddress(), req.GetDefaultPortProtocol(); newAddress != "" { if err := sk.SetDefaultPort(newAddress, newProtocol); err != nil { - return nil, &arduino.CantUpdateSketchError{Cause: err} + return nil, &cmderrors.CantUpdateSketchError{Cause: err} } res.DefaultPortAddress = newAddress res.DefaultPortProtocol = newProtocol diff --git a/commands/upload/burnbootloader.go b/commands/upload/burnbootloader.go index dc14df5f3e7..bf8bc3a608a 100644 --- a/commands/upload/burnbootloader.go +++ b/commands/upload/burnbootloader.go @@ -19,7 +19,7 @@ import ( "context" "io" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" @@ -35,7 +35,7 @@ func BurnBootloader(ctx context.Context, req *rpc.BurnBootloaderRequest, outStre pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() diff --git a/commands/upload/programmers_list.go b/commands/upload/programmers_list.go index 30b14839044..7bdeb6b7266 100644 --- a/commands/upload/programmers_list.go +++ b/commands/upload/programmers_list.go @@ -18,8 +18,8 @@ package upload import ( "context" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) @@ -28,23 +28,23 @@ import ( func ListProgrammersAvailableForUpload(ctx context.Context, req *rpc.ListProgrammersAvailableForUploadRequest) (*rpc.ListProgrammersAvailableForUploadResponse, error) { pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer release() fqbnIn := req.GetFqbn() if fqbnIn == "" { - return nil, &arduino.MissingFQBNError{} + return nil, &cmderrors.MissingFQBNError{} } fqbn, err := cores.ParseFQBN(fqbnIn) if err != nil { - return nil, &arduino.InvalidFQBNError{Cause: err} + return nil, &cmderrors.InvalidFQBNError{Cause: err} } // Find target platforms _, platform, _, _, refPlatform, err := pme.ResolveFQBN(fqbn) if err != nil { - return nil, &arduino.UnknownFQBNError{Cause: err} + return nil, &cmderrors.UnknownFQBNError{Cause: err} } result := []*rpc.Programmer{} diff --git a/commands/upload/upload.go b/commands/upload/upload.go index 34d20f339e7..4f21543d994 100644 --- a/commands/upload/upload.go +++ b/commands/upload/upload.go @@ -23,10 +23,10 @@ import ( "strings" "time" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" "github.com/arduino/arduino-cli/i18n" f "github.com/arduino/arduino-cli/internal/algorithms" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/internal/arduino/discovery" @@ -46,29 +46,29 @@ var tr = i18n.Tr // by the upload tools needed by the board using the protocol specified in SupportedUserFieldsRequest. func SupportedUserFields(ctx context.Context, req *rpc.SupportedUserFieldsRequest) (*rpc.SupportedUserFieldsResponse, error) { if req.GetProtocol() == "" { - return nil, &arduino.MissingPortProtocolError{} + return nil, &cmderrors.MissingPortProtocolError{} } pme, release := instances.GetPackageManagerExplorer(req.GetInstance()) defer release() if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } fqbn, err := cores.ParseFQBN(req.GetFqbn()) if err != nil { - return nil, &arduino.InvalidFQBNError{Cause: err} + return nil, &cmderrors.InvalidFQBNError{Cause: err} } _, platformRelease, _, boardProperties, _, err := pme.ResolveFQBN(fqbn) if platformRelease == nil { - return nil, &arduino.PlatformNotFoundError{ + return nil, &cmderrors.PlatformNotFoundError{ Platform: fmt.Sprintf("%s:%s", fqbn.Package, fqbn.PlatformArch), Cause: err, } } else if err != nil { - return nil, &arduino.UnknownFQBNError{Cause: err} + return nil, &cmderrors.UnknownFQBNError{Cause: err} } toolID, err := getToolID(boardProperties, "upload", req.GetProtocol()) @@ -97,7 +97,7 @@ func getToolID(props *properties.Map, action, protocol string) (string, error) { return t, nil } - return "", &arduino.MissingPlatformPropertyError{Property: toolProperty} + return "", &cmderrors.MissingPlatformPropertyError{Property: toolProperty} } // getUserFields return all user fields supported by the tools specified. @@ -133,12 +133,12 @@ func Upload(ctx context.Context, req *rpc.UploadRequest, outStream io.Writer, er sketchPath := paths.New(req.GetSketchPath()) sk, err := sketch.New(sketchPath) if err != nil && req.GetImportDir() == "" && req.GetImportFile() == "" { - return nil, &arduino.CantOpenSketchError{Cause: err} + return nil, &cmderrors.CantOpenSketchError{Cause: err} } pme, pmeRelease := instances.GetPackageManagerExplorer(req.GetInstance()) if pme == nil { - return nil, &arduino.InvalidInstanceError{} + return nil, &cmderrors.InvalidInstanceError{} } defer pmeRelease() @@ -177,7 +177,7 @@ func UsingProgrammer(ctx context.Context, req *rpc.UploadUsingProgrammerRequest, logrus.Tracef("Upload using programmer %s on %s started", req.GetSketchPath(), req.GetFqbn()) if req.GetProgrammer() == "" { - return &arduino.MissingProgrammerError{} + return &cmderrors.MissingProgrammerError{} } _, err := Upload(ctx, &rpc.UploadRequest{ Instance: req.GetInstance(), @@ -210,24 +210,24 @@ func runProgramAction(pme *packagemanager.Explorer, logrus.WithField("port", port).Tracef("Upload port") if burnBootloader && programmerID == "" { - return nil, &arduino.MissingProgrammerError{} + return nil, &cmderrors.MissingProgrammerError{} } fqbn, err := cores.ParseFQBN(fqbnIn) if err != nil { - return nil, &arduino.InvalidFQBNError{Cause: err} + return nil, &cmderrors.InvalidFQBNError{Cause: err} } logrus.WithField("fqbn", fqbn).Tracef("Detected FQBN") // Find target board and board properties _, boardPlatform, board, boardProperties, buildPlatform, err := pme.ResolveFQBN(fqbn) if boardPlatform == nil { - return nil, &arduino.PlatformNotFoundError{ + return nil, &cmderrors.PlatformNotFoundError{ Platform: fmt.Sprintf("%s:%s", fqbn.Package, fqbn.PlatformArch), Cause: err, } } else if err != nil { - return nil, &arduino.UnknownFQBNError{Cause: err} + return nil, &cmderrors.UnknownFQBNError{Cause: err} } logrus. WithField("boardPlatform", boardPlatform). @@ -244,7 +244,7 @@ func runProgramAction(pme *packagemanager.Explorer, programmer = buildPlatform.Programmers[programmerID] } if programmer == nil { - return nil, &arduino.ProgrammerNotFoundError{Programmer: programmerID} + return nil, &cmderrors.ProgrammerNotFoundError{Programmer: programmerID} } } @@ -280,7 +280,7 @@ func runProgramAction(pme *packagemanager.Explorer, Trace("Upload tool") if split := strings.Split(uploadToolID, ":"); len(split) > 2 { - return nil, &arduino.InvalidPlatformPropertyError{ + return nil, &cmderrors.InvalidPlatformPropertyError{ Property: fmt.Sprintf("%s.tool.%s", action, port.Protocol), // TODO: Can be done better, maybe inline getToolID(...) Value: uploadToolID} } else if len(split) == 2 { @@ -289,12 +289,12 @@ func runProgramAction(pme *packagemanager.Explorer, PlatformArchitecture: boardPlatform.Platform.Architecture, }) if p == nil { - return nil, &arduino.PlatformNotFoundError{Platform: split[0] + ":" + boardPlatform.Platform.Architecture} + return nil, &cmderrors.PlatformNotFoundError{Platform: split[0] + ":" + boardPlatform.Platform.Architecture} } uploadToolID = split[1] uploadToolPlatform = pme.GetInstalledPlatformRelease(p) if uploadToolPlatform == nil { - return nil, &arduino.PlatformNotFoundError{Platform: split[0] + ":" + boardPlatform.Platform.Architecture} + return nil, &cmderrors.PlatformNotFoundError{Platform: split[0] + ":" + boardPlatform.Platform.Architecture} } } @@ -321,7 +321,7 @@ func runProgramAction(pme *packagemanager.Explorer, } if !uploadProperties.ContainsKey("upload.protocol") && programmer == nil { - return nil, &arduino.ProgrammerRequiredForUploadError{} + return nil, &cmderrors.ProgrammerRequiredForUploadError{} } // Set properties for verbose upload @@ -369,13 +369,13 @@ func runProgramAction(pme *packagemanager.Explorer, if !burnBootloader { importPath, sketchName, err := determineBuildPathAndSketchName(importFile, importDir, sk, fqbn) if err != nil { - return nil, &arduino.NotFoundError{Message: tr("Error finding build artifacts"), Cause: err} + return nil, &cmderrors.NotFoundError{Message: tr("Error finding build artifacts"), Cause: err} } if !importPath.Exist() { - return nil, &arduino.NotFoundError{Message: tr("Compiled sketch not found in %s", importPath)} + return nil, &cmderrors.NotFoundError{Message: tr("Compiled sketch not found in %s", importPath)} } if !importPath.IsDir() { - return nil, &arduino.NotFoundError{Message: tr("Expected compiled sketch in directory %s, but is a file instead", importPath)} + return nil, &cmderrors.NotFoundError{Message: tr("Expected compiled sketch in directory %s, but is a file instead", importPath)} } uploadProperties.SetPath("build.path", importPath) uploadProperties.Set("build.project_name", sketchName) @@ -498,18 +498,18 @@ func runProgramAction(pme *packagemanager.Explorer, toolEnv := pme.GetEnvVarsForSpawnedProcess() if burnBootloader { if err := runTool("erase.pattern", uploadProperties, outStream, errStream, verbose, dryRun, toolEnv); err != nil { - return nil, &arduino.FailedUploadError{Message: tr("Failed chip erase"), Cause: err} + return nil, &cmderrors.FailedUploadError{Message: tr("Failed chip erase"), Cause: err} } if err := runTool("bootloader.pattern", uploadProperties, outStream, errStream, verbose, dryRun, toolEnv); err != nil { - return nil, &arduino.FailedUploadError{Message: tr("Failed to burn bootloader"), Cause: err} + return nil, &cmderrors.FailedUploadError{Message: tr("Failed to burn bootloader"), Cause: err} } } else if programmer != nil { if err := runTool("program.pattern", uploadProperties, outStream, errStream, verbose, dryRun, toolEnv); err != nil { - return nil, &arduino.FailedUploadError{Message: tr("Failed programming"), Cause: err} + return nil, &cmderrors.FailedUploadError{Message: tr("Failed programming"), Cause: err} } } else { if err := runTool("upload.pattern", uploadProperties, outStream, errStream, verbose, dryRun, toolEnv); err != nil { - return nil, &arduino.FailedUploadError{Message: tr("Failed uploading"), Cause: err} + return nil, &cmderrors.FailedUploadError{Message: tr("Failed uploading"), Cause: err} } } diff --git a/internal/arduino/cores/packagemanager/download.go b/internal/arduino/cores/packagemanager/download.go index 89282c97992..f2e293b3f27 100644 --- a/internal/arduino/cores/packagemanager/download.go +++ b/internal/arduino/cores/packagemanager/download.go @@ -18,7 +18,7 @@ package packagemanager import ( "fmt" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/cores" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/pkg/errors" @@ -123,7 +123,7 @@ func (pme *Explorer) FindPlatformReleaseDependencies(item *PlatformReference) (* func (pme *Explorer) DownloadToolRelease(tool *cores.ToolRelease, config *downloader.Config, progressCB rpc.DownloadProgressCB) error { resource := tool.GetCompatibleFlavour() if resource == nil { - return &arduino.FailedDownloadError{ + return &cmderrors.FailedDownloadError{ Message: tr("Error downloading tool %s", tool), Cause: errors.New(tr("no versions available for the current OS, try contacting %s", tool.Tool.Package.Email))} } @@ -134,7 +134,7 @@ func (pme *Explorer) DownloadToolRelease(tool *cores.ToolRelease, config *downlo // nil Downloader is returned. func (pme *Explorer) DownloadPlatformRelease(platform *cores.PlatformRelease, config *downloader.Config, progressCB rpc.DownloadProgressCB) error { if platform.Resource == nil { - return &arduino.PlatformNotFoundError{Platform: platform.String()} + return &cmderrors.PlatformNotFoundError{Platform: platform.String()} } return platform.Resource.Download(pme.DownloadDir, config, platform.String(), progressCB, "") } diff --git a/internal/arduino/cores/packagemanager/install_uninstall.go b/internal/arduino/cores/packagemanager/install_uninstall.go index 49d6b00b57c..5b2af285ea6 100644 --- a/internal/arduino/cores/packagemanager/install_uninstall.go +++ b/internal/arduino/cores/packagemanager/install_uninstall.go @@ -21,7 +21,7 @@ import ( "fmt" "runtime" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packageindex" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" @@ -40,27 +40,27 @@ func (pme *Explorer) DownloadAndInstallPlatformUpgrades( skipPreUninstall bool, ) (*cores.PlatformRelease, error) { if platformRef.PlatformVersion != nil { - return nil, &arduino.InvalidArgumentError{Message: tr("Upgrade doesn't accept parameters with version")} + return nil, &cmderrors.InvalidArgumentError{Message: tr("Upgrade doesn't accept parameters with version")} } // Search the latest version for all specified platforms platform := pme.FindPlatform(platformRef) if platform == nil { - return nil, &arduino.PlatformNotFoundError{Platform: platformRef.String()} + return nil, &cmderrors.PlatformNotFoundError{Platform: platformRef.String()} } installed := pme.GetInstalledPlatformRelease(platform) if installed == nil { - return nil, &arduino.PlatformNotFoundError{Platform: platformRef.String()} + return nil, &cmderrors.PlatformNotFoundError{Platform: platformRef.String()} } latest := platform.GetLatestCompatibleRelease() if !latest.Version.GreaterThan(installed.Version) { - return installed, &arduino.PlatformAlreadyAtTheLatestVersionError{Platform: platformRef.String()} + return installed, &cmderrors.PlatformAlreadyAtTheLatestVersionError{Platform: platformRef.String()} } platformRef.PlatformVersion = latest.Version platformRelease, tools, err := pme.FindPlatformReleaseDependencies(platformRef) if err != nil { - return nil, &arduino.PlatformNotFoundError{Platform: platformRef.String()} + return nil, &cmderrors.PlatformNotFoundError{Platform: platformRef.String()} } if err := pme.DownloadAndInstallPlatformAndTools(platformRelease, tools, downloadCB, taskCB, skipPostInstall, skipPreUninstall); err != nil { return nil, err @@ -130,14 +130,14 @@ func (pme *Explorer) DownloadAndInstallPlatformAndTools( var err error _, installedTools, err = pme.FindPlatformReleaseDependencies(platformRef) if err != nil { - return &arduino.NotFoundError{Message: tr("Can't find dependencies for platform %s", platformRef), Cause: err} + return &cmderrors.NotFoundError{Message: tr("Can't find dependencies for platform %s", platformRef), Cause: err} } } // Install if err := pme.InstallPlatform(platformRelease); err != nil { log.WithError(err).Error("Cannot install platform") - return &arduino.FailedInstallError{Message: tr("Cannot install platform"), Cause: err} + return &cmderrors.FailedInstallError{Message: tr("Cannot install platform"), Cause: err} } // If upgrading remove previous release @@ -155,7 +155,7 @@ func (pme *Explorer) DownloadAndInstallPlatformAndTools( taskCB(&rpc.TaskProgress{Message: tr("Error rolling-back changes: %s", err)}) } - return &arduino.FailedInstallError{Message: tr("Cannot upgrade platform"), Cause: uninstallErr} + return &cmderrors.FailedInstallError{Message: tr("Cannot upgrade platform"), Cause: uninstallErr} } // Uninstall unused tools @@ -279,14 +279,14 @@ func (pme *Explorer) UninstallPlatform(platformRelease *cores.PlatformRelease, t if platformRelease.InstallDir == nil { err := fmt.Errorf(tr("platform not installed")) log.WithError(err).Error("Error uninstalling") - return &arduino.FailedUninstallError{Message: err.Error()} + return &cmderrors.FailedUninstallError{Message: err.Error()} } // Safety measure if !pme.IsManagedPlatformRelease(platformRelease) { err := fmt.Errorf(tr("%s is not managed by package manager"), platformRelease) log.WithError(err).Error("Error uninstalling") - return &arduino.FailedUninstallError{Message: err.Error()} + return &cmderrors.FailedUninstallError{Message: err.Error()} } if !skipPreUninstall { @@ -306,7 +306,7 @@ func (pme *Explorer) UninstallPlatform(platformRelease *cores.PlatformRelease, t if err := platformRelease.InstallDir.RemoveAll(); err != nil { err = fmt.Errorf(tr("removing platform files: %s"), err) log.WithError(err).Error("Error uninstalling") - return &arduino.FailedUninstallError{Message: err.Error()} + return &cmderrors.FailedUninstallError{Message: err.Error()} } platformRelease.InstallDir = nil @@ -342,7 +342,7 @@ func (pme *Explorer) InstallTool(toolRelease *cores.ToolRelease, taskCB rpc.Task err := toolResource.Install(pme.DownloadDir, pme.tempDir, destDir) if err != nil { log.WithError(err).Warn("Cannot install tool") - return &arduino.FailedInstallError{Message: tr("Cannot install tool %s", toolRelease), Cause: err} + return &cmderrors.FailedInstallError{Message: tr("Cannot install tool %s", toolRelease), Cause: err} } if d, err := destDir.Abs(); err == nil { toolRelease.InstallDir = d @@ -397,7 +397,7 @@ func (pme *Explorer) UninstallTool(toolRelease *cores.ToolRelease, taskCB rpc.Ta // Safety measure if !pme.IsManagedToolRelease(toolRelease) { - err := &arduino.FailedUninstallError{Message: tr("tool %s is not managed by package manager", toolRelease)} + err := &cmderrors.FailedUninstallError{Message: tr("tool %s is not managed by package manager", toolRelease)} log.WithError(err).Error("Error uninstalling") return err } @@ -417,7 +417,7 @@ func (pme *Explorer) UninstallTool(toolRelease *cores.ToolRelease, taskCB rpc.Ta } if err := toolRelease.InstallDir.RemoveAll(); err != nil { - err = &arduino.FailedUninstallError{Message: err.Error()} + err = &cmderrors.FailedUninstallError{Message: err.Error()} log.WithError(err).Error("Error uninstalling") return err } diff --git a/internal/arduino/cores/packagemanager/loader.go b/internal/arduino/cores/packagemanager/loader.go index 7d0799f2cc7..bc736734bc9 100644 --- a/internal/arduino/cores/packagemanager/loader.go +++ b/internal/arduino/cores/packagemanager/loader.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/discovery" "github.com/arduino/arduino-cli/internal/cli/configuration" @@ -200,7 +200,7 @@ func (pm *Builder) loadPlatform(targetPackage *cores.Package, architecture strin versionString := platformProperties.ExpandPropsInString(platformProperties.Get("version")) version, err := semver.Parse(versionString) if err != nil { - return &arduino.InvalidVersionError{Cause: fmt.Errorf("%s: %s", platformTxtPath, err)} + return &cmderrors.InvalidVersionError{Cause: fmt.Errorf("%s: %s", platformTxtPath, err)} } // Check if package_bundled_index.json exists. diff --git a/internal/arduino/cores/packagemanager/package_manager.go b/internal/arduino/cores/packagemanager/package_manager.go index 32117e0c249..31782dae1bd 100644 --- a/internal/arduino/cores/packagemanager/package_manager.go +++ b/internal/arduino/cores/packagemanager/package_manager.go @@ -26,8 +26,8 @@ import ( "sync" "time" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packageindex" "github.com/arduino/arduino-cli/internal/arduino/discovery/discoverymanager" @@ -478,7 +478,7 @@ func (pme *Explorer) determineReferencedPlatformRelease(boardBuildProperties *pr func (pmb *Builder) LoadPackageIndex(URL *url.URL) error { indexFileName := path.Base(URL.Path) if indexFileName == "." || indexFileName == "" { - return &arduino.InvalidURLError{Cause: errors.New(URL.String())} + return &cmderrors.InvalidURLError{Cause: errors.New(URL.String())} } if strings.HasSuffix(indexFileName, ".tar.bz2") { indexFileName = strings.TrimSuffix(indexFileName, ".tar.bz2") + ".json" diff --git a/internal/arduino/cores/packagemanager/profiles.go b/internal/arduino/cores/packagemanager/profiles.go index 7c5eab5de44..7a6710b380d 100644 --- a/internal/arduino/cores/packagemanager/profiles.go +++ b/internal/arduino/cores/packagemanager/profiles.go @@ -19,7 +19,7 @@ import ( "fmt" "net/url" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/arduino-cli/internal/arduino/resources" @@ -104,16 +104,16 @@ func (pmb *Builder) installMissingProfilePlatform(platformRef *sketch.ProfilePla for _, indexURL := range indexesToDownload { if err != nil { taskCB(&rpc.TaskProgress{Name: tr("Error downloading %s", indexURL)}) - return &arduino.FailedDownloadError{Message: tr("Error downloading %s", indexURL), Cause: err} + return &cmderrors.FailedDownloadError{Message: tr("Error downloading %s", indexURL), Cause: err} } indexResource := resources.IndexResource{URL: indexURL} if err := indexResource.Download(tmpPmb.IndexDir, downloadCB); err != nil { taskCB(&rpc.TaskProgress{Name: tr("Error downloading %s", indexURL)}) - return &arduino.FailedDownloadError{Message: tr("Error downloading %s", indexURL), Cause: err} + return &cmderrors.FailedDownloadError{Message: tr("Error downloading %s", indexURL), Cause: err} } if err := tmpPmb.LoadPackageIndex(indexURL); err != nil { taskCB(&rpc.TaskProgress{Name: tr("Error loading index %s", indexURL)}) - return &arduino.FailedInstallError{Message: tr("Error loading index %s", indexURL), Cause: err} + return &cmderrors.FailedInstallError{Message: tr("Error loading index %s", indexURL), Cause: err} } } @@ -127,7 +127,7 @@ func (pmb *Builder) installMissingProfilePlatform(platformRef *sketch.ProfilePla if err := tmpPme.DownloadPlatformRelease(tmpPlatformRelease, nil, downloadCB); err != nil { taskCB(&rpc.TaskProgress{Name: tr("Error downloading platform %s", tmpPlatformRelease)}) - return &arduino.FailedInstallError{Message: tr("Error downloading platform %s", tmpPlatformRelease), Cause: err} + return &cmderrors.FailedInstallError{Message: tr("Error downloading platform %s", tmpPlatformRelease), Cause: err} } taskCB(&rpc.TaskProgress{Completed: true}) @@ -135,7 +135,7 @@ func (pmb *Builder) installMissingProfilePlatform(platformRef *sketch.ProfilePla taskCB(&rpc.TaskProgress{Name: tr("Installing platform %s", tmpPlatformRelease)}) if err := tmpPme.InstallPlatformInDirectory(tmpPlatformRelease, destDir); err != nil { taskCB(&rpc.TaskProgress{Name: tr("Error installing platform %s", tmpPlatformRelease)}) - return &arduino.FailedInstallError{Message: tr("Error installing platform %s", tmpPlatformRelease), Cause: err} + return &cmderrors.FailedInstallError{Message: tr("Error installing platform %s", tmpPlatformRelease), Cause: err} } taskCB(&rpc.TaskProgress{Completed: true}) return nil @@ -152,7 +152,7 @@ func (pmb *Builder) loadProfileTool(toolRef *cores.ToolDependency, indexURL *url // Try installing the missing tool toolRelease := tool.GetOrCreateRelease(toolRef.ToolVersion) if toolRelease == nil { - return &arduino.InvalidVersionError{Cause: fmt.Errorf(tr("version %s not found", toolRef.ToolVersion))} + return &cmderrors.InvalidVersionError{Cause: fmt.Errorf(tr("version %s not found", toolRef.ToolVersion))} } if err := pmb.installMissingProfileTool(toolRelease, destDir, downloadCB, taskCB); err != nil { return err @@ -173,12 +173,12 @@ func (pmb *Builder) installMissingProfileTool(toolRelease *cores.ToolRelease, de // Download the tool toolResource := toolRelease.GetCompatibleFlavour() if toolResource == nil { - return &arduino.InvalidVersionError{Cause: fmt.Errorf(tr("version %s not available for this operating system", toolRelease))} + return &cmderrors.InvalidVersionError{Cause: fmt.Errorf(tr("version %s not available for this operating system", toolRelease))} } taskCB(&rpc.TaskProgress{Name: tr("Downloading tool %s", toolRelease)}) if err := toolResource.Download(pmb.DownloadDir, nil, toolRelease.String(), downloadCB, ""); err != nil { taskCB(&rpc.TaskProgress{Name: tr("Error downloading tool %s", toolRelease)}) - return &arduino.FailedInstallError{Message: tr("Error installing tool %s", toolRelease), Cause: err} + return &cmderrors.FailedInstallError{Message: tr("Error installing tool %s", toolRelease), Cause: err} } taskCB(&rpc.TaskProgress{Completed: true}) @@ -186,7 +186,7 @@ func (pmb *Builder) installMissingProfileTool(toolRelease *cores.ToolRelease, de taskCB(&rpc.TaskProgress{Name: tr("Installing tool %s", toolRelease)}) if err := toolResource.Install(pmb.DownloadDir, tmp, destDir); err != nil { taskCB(&rpc.TaskProgress{Name: tr("Error installing tool %s", toolRelease)}) - return &arduino.FailedInstallError{Message: tr("Error installing tool %s", toolRelease), Cause: err} + return &cmderrors.FailedInstallError{Message: tr("Error installing tool %s", toolRelease), Cause: err} } taskCB(&rpc.TaskProgress{Completed: true}) return nil diff --git a/internal/arduino/httpclient/httpclient.go b/internal/arduino/httpclient/httpclient.go index a7817cd5bf5..d6bea3d045f 100644 --- a/internal/arduino/httpclient/httpclient.go +++ b/internal/arduino/httpclient/httpclient.go @@ -20,8 +20,8 @@ import ( "net/url" "time" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" @@ -71,7 +71,7 @@ func DownloadFile(path *paths.Path, URL string, queryParameter string, label str // The URL is not reachable for some reason if d.Resp.StatusCode >= 400 && d.Resp.StatusCode <= 599 { msg := tr("Server responded with: %s", d.Resp.Status) - return &arduino.FailedDownloadError{Message: msg} + return &cmderrors.FailedDownloadError{Message: msg} } return nil @@ -109,7 +109,7 @@ func NewWithConfig(config *Config) *http.Client { func GetDownloaderConfig() (*downloader.Config, error) { httpClient, err := New() if err != nil { - return nil, &arduino.InvalidArgumentError{Message: tr("Could not connect via HTTP"), Cause: err} + return nil, &cmderrors.InvalidArgumentError{Message: tr("Could not connect via HTTP"), Cause: err} } return &downloader.Config{ HttpClient: *httpClient, diff --git a/internal/arduino/libraries/librariesmanager/install.go b/internal/arduino/libraries/librariesmanager/install.go index 675b49eed5f..39af1f4b704 100644 --- a/internal/arduino/libraries/librariesmanager/install.go +++ b/internal/arduino/libraries/librariesmanager/install.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" @@ -72,7 +72,7 @@ func (lm *LibrariesManager) InstallPrerequisiteCheck(name string, version *semve for _, lib := range libs { libsDir.Add(lib.InstallDir) } - return nil, &arduino.MultipleLibraryInstallDetected{ + return nil, &cmderrors.MultipleLibraryInstallDetected{ LibName: name, LibsDir: libsDir, Message: tr("Automatic library install can't be performed in this case, please manually remove all duplicates and retry."), diff --git a/internal/arduino/resources/index.go b/internal/arduino/resources/index.go index 3366d1179d0..4740c6f12f0 100644 --- a/internal/arduino/resources/index.go +++ b/internal/arduino/resources/index.go @@ -22,7 +22,7 @@ import ( "path" "strings" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/httpclient" "github.com/arduino/arduino-cli/internal/arduino/security" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" @@ -43,7 +43,7 @@ type IndexResource struct { func (res *IndexResource) IndexFileName() (string, error) { filename := path.Base(res.URL.Path) // == package_index.json[.gz] || packacge_index.tar.bz2 if filename == "." || filename == "" || filename == "/" { - return "", &arduino.InvalidURLError{} + return "", &cmderrors.InvalidURLError{} } switch { case strings.HasSuffix(filename, ".json"): @@ -61,13 +61,13 @@ func (res *IndexResource) IndexFileName() (string, error) { func (res *IndexResource) Download(destDir *paths.Path, downloadCB rpc.DownloadProgressCB) error { // Create destination directory if err := destDir.MkdirAll(); err != nil { - return &arduino.PermissionDeniedError{Message: tr("Can't create data directory %s", destDir), Cause: err} + return &cmderrors.PermissionDeniedError{Message: tr("Can't create data directory %s", destDir), Cause: err} } // Create a temp dir to stage all downloads tmp, err := paths.MkTempDir("", "library_index_download") if err != nil { - return &arduino.TempDirCreationFailedError{Cause: err} + return &cmderrors.TempDirCreationFailedError{Cause: err} } defer tmp.RemoveAll() @@ -79,7 +79,7 @@ func (res *IndexResource) Download(destDir *paths.Path, downloadCB rpc.DownloadP } tmpIndexPath := tmp.Join(downloadFileName) if err := httpclient.DownloadFile(tmpIndexPath, res.URL.String(), "", tr("Downloading index: %s", downloadFileName), downloadCB, nil, downloader.NoResume); err != nil { - return &arduino.FailedDownloadError{Message: tr("Error downloading index '%s'", res.URL), Cause: err} + return &cmderrors.FailedDownloadError{Message: tr("Error downloading index '%s'", res.URL), Cause: err} } var signaturePath, tmpSignaturePath *paths.Path @@ -95,19 +95,19 @@ func (res *IndexResource) Download(destDir *paths.Path, downloadCB rpc.DownloadP // Extract archive in a tmp/archive subdirectory f, err := tmpIndexPath.Open() if err != nil { - return &arduino.PermissionDeniedError{Message: tr("Error opening %s", tmpIndexPath), Cause: err} + return &cmderrors.PermissionDeniedError{Message: tr("Error opening %s", tmpIndexPath), Cause: err} } defer f.Close() tmpArchivePath := tmp.Join("archive") _ = tmpArchivePath.MkdirAll() if err := extract.Bz2(context.Background(), f, tmpArchivePath.String(), nil); err != nil { - return &arduino.PermissionDeniedError{Message: tr("Error extracting %s", tmpIndexPath), Cause: err} + return &cmderrors.PermissionDeniedError{Message: tr("Error extracting %s", tmpIndexPath), Cause: err} } // Look for index.json tmpIndexPath = tmpArchivePath.Join(indexFileName) if !tmpIndexPath.Exist() { - return &arduino.NotFoundError{Message: tr("Invalid archive: file %{1}s not found in archive %{2}s", indexFileName, tmpArchivePath.Base())} + return &cmderrors.NotFoundError{Message: tr("Invalid archive: file %{1}s not found in archive %{2}s", indexFileName, tmpArchivePath.Base())} } // Look for signature @@ -120,7 +120,7 @@ func (res *IndexResource) Download(destDir *paths.Path, downloadCB rpc.DownloadP } else if strings.HasSuffix(downloadFileName, ".gz") { tmpUnzippedIndexPath := tmp.Join(indexFileName) if err := paths.GUnzip(tmpIndexPath, tmpUnzippedIndexPath); err != nil { - return &arduino.PermissionDeniedError{Message: tr("Error extracting %s", indexFileName), Cause: err} + return &cmderrors.PermissionDeniedError{Message: tr("Error extracting %s", indexFileName), Cause: err} } tmpIndexPath = tmpUnzippedIndexPath } @@ -134,7 +134,7 @@ func (res *IndexResource) Download(destDir *paths.Path, downloadCB rpc.DownloadP signaturePath = destDir.Join(signatureFileName) tmpSignaturePath = tmp.Join(signatureFileName) if err := httpclient.DownloadFile(tmpSignaturePath, res.SignatureURL.String(), "", tr("Downloading index signature: %s", signatureFileName), downloadCB, nil, downloader.NoResume); err != nil { - return &arduino.FailedDownloadError{Message: tr("Error downloading index signature '%s'", res.SignatureURL), Cause: err} + return &cmderrors.FailedDownloadError{Message: tr("Error downloading index signature '%s'", res.SignatureURL), Cause: err} } hasSignature = true @@ -143,13 +143,13 @@ func (res *IndexResource) Download(destDir *paths.Path, downloadCB rpc.DownloadP if hasSignature { // Check signature... if valid, _, err := security.VerifyArduinoDetachedSignature(tmpIndexPath, tmpSignaturePath); err != nil { - return &arduino.PermissionDeniedError{Message: tr("Error verifying signature"), Cause: err} + return &cmderrors.PermissionDeniedError{Message: tr("Error verifying signature"), Cause: err} } else if !valid { - return &arduino.SignatureVerificationFailedError{File: res.URL.String()} + return &cmderrors.SignatureVerificationFailedError{File: res.URL.String()} } } else { if res.EnforceSignatureVerification { - return &arduino.PermissionDeniedError{Message: tr("Error verifying signature"), Cause: errors.New(tr("missing signature"))} + return &cmderrors.PermissionDeniedError{Message: tr("Error verifying signature"), Cause: errors.New(tr("missing signature"))} } } @@ -161,23 +161,23 @@ func (res *IndexResource) Download(destDir *paths.Path, downloadCB rpc.DownloadP oldIndex := tmp.Join("old_index") if indexPath.Exist() { if err := indexPath.CopyTo(oldIndex); err != nil { - return &arduino.PermissionDeniedError{Message: tr("Error saving downloaded index"), Cause: err} + return &cmderrors.PermissionDeniedError{Message: tr("Error saving downloaded index"), Cause: err} } defer oldIndex.CopyTo(indexPath) // will silently fail in case of success } oldSignature := tmp.Join("old_signature") if oldSignature.Exist() { if err := signaturePath.CopyTo(oldSignature); err != nil { - return &arduino.PermissionDeniedError{Message: tr("Error saving downloaded index signature"), Cause: err} + return &cmderrors.PermissionDeniedError{Message: tr("Error saving downloaded index signature"), Cause: err} } defer oldSignature.CopyTo(signaturePath) // will silently fail in case of success } if err := tmpIndexPath.CopyTo(indexPath); err != nil { - return &arduino.PermissionDeniedError{Message: tr("Error saving downloaded index"), Cause: err} + return &cmderrors.PermissionDeniedError{Message: tr("Error saving downloaded index"), Cause: err} } if hasSignature { if err := tmpSignaturePath.CopyTo(signaturePath); err != nil { - return &arduino.PermissionDeniedError{Message: tr("Error saving downloaded index signature"), Cause: err} + return &cmderrors.PermissionDeniedError{Message: tr("Error saving downloaded index signature"), Cause: err} } } _ = oldIndex.Remove() diff --git a/internal/cli/arguments/fqbn.go b/internal/cli/arguments/fqbn.go index 7f1291537a6..01e1079d8ab 100644 --- a/internal/cli/arguments/fqbn.go +++ b/internal/cli/arguments/fqbn.go @@ -18,7 +18,7 @@ package arguments import ( "strings" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/cli/feedback" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/spf13/cobra" @@ -76,11 +76,11 @@ func CalculateFQBNAndPort(portArgs *Port, fqbnArg *Fqbn, instance *rpc.Instance, } if fqbn == "" { if portArgs == nil || portArgs.address == "" { - feedback.FatalError(&arduino.MissingFQBNError{}, feedback.ErrGeneric) + feedback.FatalError(&cmderrors.MissingFQBNError{}, feedback.ErrGeneric) } fqbn, port := portArgs.DetectFQBN(instance) if fqbn == "" { - feedback.FatalError(&arduino.MissingFQBNError{}, feedback.ErrGeneric) + feedback.FatalError(&cmderrors.MissingFQBNError{}, feedback.ErrGeneric) } return fqbn, port } diff --git a/internal/cli/arguments/port.go b/internal/cli/arguments/port.go index 183cb839216..f10c6bf70a0 100644 --- a/internal/cli/arguments/port.go +++ b/internal/cli/arguments/port.go @@ -21,8 +21,8 @@ import ( "time" "github.com/arduino/arduino-cli/commands/board" + "github.com/arduino/arduino-cli/commands/cmderrors" f "github.com/arduino/arduino-cli/internal/algorithms" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/feedback" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" @@ -146,10 +146,10 @@ func (p *Port) DetectFQBN(inst *rpc.Instance) (string, *rpc.Port) { continue } if len(detectedPort.GetMatchingBoards()) > 1 { - feedback.FatalError(&arduino.MultipleBoardsDetectedError{Port: port}, feedback.ErrBadArgument) + feedback.FatalError(&cmderrors.MultipleBoardsDetectedError{Port: port}, feedback.ErrBadArgument) } if len(detectedPort.GetMatchingBoards()) == 0 { - feedback.FatalError(&arduino.NoBoardsDetectedError{Port: port}, feedback.ErrBadArgument) + feedback.FatalError(&cmderrors.NoBoardsDetectedError{Port: port}, feedback.ErrBadArgument) } return detectedPort.GetMatchingBoards()[0].GetFqbn(), port } diff --git a/internal/cli/arguments/reference.go b/internal/cli/arguments/reference.go index 4d4fce1924b..bf4e327fed1 100644 --- a/internal/cli/arguments/reference.go +++ b/internal/cli/arguments/reference.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/core" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/instance" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" @@ -115,10 +115,10 @@ func ParseReference(arg string) (*Reference, error) { // replace the returned Reference only if only one occurrence is found, // otherwise return an error to the user because we don't know on which platform operate if len(foundPlatforms) == 0 { - return nil, &arduino.PlatformNotFoundError{Platform: arg} + return nil, &cmderrors.PlatformNotFoundError{Platform: arg} } if len(foundPlatforms) > 1 { - return nil, &arduino.MultiplePlatformsError{Platforms: foundPlatforms, UserPlatform: arg} + return nil, &cmderrors.MultiplePlatformsError{Platforms: foundPlatforms, UserPlatform: arg} } toks = strings.Split(foundPlatforms[0], ":") ret.PackageName = toks[0] diff --git a/internal/cli/board/list.go b/internal/cli/board/list.go index 8a08d2ec2ca..f864768fc8d 100644 --- a/internal/cli/board/list.go +++ b/internal/cli/board/list.go @@ -23,7 +23,7 @@ import ( "sort" "github.com/arduino/arduino-cli/commands/board" - "github.com/arduino/arduino-cli/internal/arduino" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" @@ -72,7 +72,7 @@ func runListCommand(watch bool, timeout int64, fqbn string) { Timeout: timeout, Fqbn: fqbn, }) - var invalidFQBNErr *arduino.InvalidFQBNError + var invalidFQBNErr *cmderrors.InvalidFQBNError if errors.As(err, &invalidFQBNErr) { feedback.Fatal(tr(err.Error()), feedback.ErrBadArgument) } diff --git a/internal/cli/burnbootloader/burnbootloader.go b/internal/cli/burnbootloader/burnbootloader.go index 8d11cd547e2..8b6c0fc772b 100644 --- a/internal/cli/burnbootloader/burnbootloader.go +++ b/internal/cli/burnbootloader/burnbootloader.go @@ -20,9 +20,9 @@ import ( "errors" "os" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/upload" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/instance" @@ -85,10 +85,10 @@ func runBootloaderCommand(command *cobra.Command, args []string) { DryRun: dryRun, }, stdOut, stdErr); err != nil { errcode := feedback.ErrGeneric - if errors.Is(err, &arduino.ProgrammerRequiredForUploadError{}) { + if errors.Is(err, &cmderrors.ProgrammerRequiredForUploadError{}) { errcode = feedback.ErrMissingProgrammer } - if errors.Is(err, &arduino.MissingProgrammerError{}) { + if errors.Is(err, &cmderrors.MissingProgrammerError{}) { errcode = feedback.ErrMissingProgrammer } feedback.Fatal(tr("Error during Upload: %v", err), errcode) diff --git a/internal/cli/compile/compile.go b/internal/cli/compile/compile.go index 8966b977b96..bf40b125007 100644 --- a/internal/cli/compile/compile.go +++ b/internal/cli/compile/compile.go @@ -24,12 +24,12 @@ import ( "os" "strings" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/compile" "github.com/arduino/arduino-cli/commands/core" "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/commands/upload" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" @@ -282,10 +282,10 @@ func runCompileCommand(cmd *cobra.Command, args []string) { if res, err := upload.Upload(context.Background(), uploadRequest, stdOut, stdErr); err != nil { errcode := feedback.ErrGeneric - if errors.Is(err, &arduino.ProgrammerRequiredForUploadError{}) { + if errors.Is(err, &cmderrors.ProgrammerRequiredForUploadError{}) { errcode = feedback.ErrMissingProgrammer } - if errors.Is(err, &arduino.MissingProgrammerError{}) { + if errors.Is(err, &cmderrors.MissingProgrammerError{}) { errcode = feedback.ErrMissingProgrammer } feedback.Fatal(tr("Error during Upload: %v", err), errcode) @@ -366,7 +366,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) { // Check the error type to give the user better feedback on how // to resolve it - var platformErr *arduino.PlatformNotFoundError + var platformErr *cmderrors.PlatformNotFoundError if errors.As(compileError, &platformErr) { split := strings.Split(platformErr.Platform, ":") if len(split) < 2 { diff --git a/internal/cli/core/upgrade.go b/internal/cli/core/upgrade.go index 8798f4fb734..638246dc4f1 100644 --- a/internal/cli/core/upgrade.go +++ b/internal/cli/core/upgrade.go @@ -21,8 +21,8 @@ import ( "fmt" "os" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/core" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/instance" @@ -125,7 +125,7 @@ func Upgrade(inst *rpc.Instance, args []string, skipPostInstall bool, skipPreUni response, err := core.PlatformUpgrade(context.Background(), r, feedback.ProgressBar(), feedback.TaskProgress()) warningMissingIndex(response) if err != nil { - var alreadyAtLatestVersionErr *arduino.PlatformAlreadyAtTheLatestVersionError + var alreadyAtLatestVersionErr *cmderrors.PlatformAlreadyAtTheLatestVersionError if errors.As(err, &alreadyAtLatestVersionErr) { feedback.Warning(err.Error()) continue diff --git a/internal/cli/debug/debug.go b/internal/cli/debug/debug.go index 93228526fea..fcf72fd1686 100644 --- a/internal/cli/debug/debug.go +++ b/internal/cli/debug/debug.go @@ -22,10 +22,10 @@ import ( "os" "os/signal" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/debug" "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/table" @@ -101,7 +101,7 @@ func runDebugCommand(args []string, portArgs *arguments.Port, fqbnArg *arguments if res, err := debug.GetDebugConfig(context.Background(), debugConfigRequested); err != nil { errcode := feedback.ErrBadArgument - if errors.Is(err, &arduino.MissingProgrammerError{}) { + if errors.Is(err, &cmderrors.MissingProgrammerError{}) { errcode = feedback.ErrMissingProgrammer } feedback.Fatal(tr("Error getting Debug info: %v", err), errcode) @@ -121,7 +121,7 @@ func runDebugCommand(args []string, portArgs *arguments.Port, fqbnArg *arguments } if _, err := debug.Debug(context.Background(), debugConfigRequested, in, out, ctrlc); err != nil { errcode := feedback.ErrGeneric - if errors.Is(err, &arduino.MissingProgrammerError{}) { + if errors.Is(err, &cmderrors.MissingProgrammerError{}) { errcode = feedback.ErrMissingProgrammer } feedback.Fatal(tr("Error during Debug: %v", err), errcode) diff --git a/internal/cli/upload/upload.go b/internal/cli/upload/upload.go index e3f3bd17bea..2f480e62ca2 100644 --- a/internal/cli/upload/upload.go +++ b/internal/cli/upload/upload.go @@ -22,11 +22,11 @@ import ( "os" "strings" + "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/core" sk "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/commands/upload" "github.com/arduino/arduino-cli/i18n" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" @@ -129,7 +129,7 @@ func runUploadCommand(args []string, uploadFieldsArgs map[string]string) { // Check the error type to give the user better feedback on how // to resolve it - var platformErr *arduino.PlatformNotFoundError + var platformErr *cmderrors.PlatformNotFoundError if errors.As(err, &platformErr) { split := strings.Split(platformErr.Platform, ":") if len(split) < 2 { @@ -194,10 +194,10 @@ func runUploadCommand(args []string, uploadFieldsArgs map[string]string) { } if res, err := upload.Upload(context.Background(), req, stdOut, stdErr); err != nil { errcode := feedback.ErrGeneric - if errors.Is(err, &arduino.ProgrammerRequiredForUploadError{}) { + if errors.Is(err, &cmderrors.ProgrammerRequiredForUploadError{}) { errcode = feedback.ErrMissingProgrammer } - if errors.Is(err, &arduino.MissingProgrammerError{}) { + if errors.Is(err, &cmderrors.MissingProgrammerError{}) { errcode = feedback.ErrMissingProgrammer } feedback.FatalError(err, errcode) diff --git a/internal/integrationtest/daemon/daemon_test.go b/internal/integrationtest/daemon/daemon_test.go index 964adc73d9b..f7e59a02896 100644 --- a/internal/integrationtest/daemon/daemon_test.go +++ b/internal/integrationtest/daemon/daemon_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "github.com/arduino/arduino-cli/commands/cmderrors" f "github.com/arduino/arduino-cli/internal/algorithms" - "github.com/arduino/arduino-cli/internal/arduino" "github.com/arduino/arduino-cli/internal/integrationtest" "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" @@ -518,7 +518,7 @@ func TestDaemonCoreUpgradePlatform(t *testing.T) { require.NoError(t, err) platform, upgradeError := analyzePlatformUpgradeClient(plUpgrade) - require.ErrorIs(t, upgradeError, (&arduino.PlatformAlreadyAtTheLatestVersionError{Platform: "esp8266:esp8266"}).ToRPCStatus().Err()) + require.ErrorIs(t, upgradeError, (&cmderrors.PlatformAlreadyAtTheLatestVersionError{Platform: "esp8266:esp8266"}).ToRPCStatus().Err()) require.NotNil(t, platform) require.False(t, platform.GetMetadata().GetIndexed()) // the esp866 is not present in the additional-urls require.False(t, platform.GetRelease().GetMissingMetadata()) // install.json is present @@ -543,7 +543,7 @@ func TestDaemonCoreUpgradePlatform(t *testing.T) { require.NoError(t, err) platform, upgradeError := analyzePlatformUpgradeClient(plUpgrade) - require.ErrorIs(t, upgradeError, (&arduino.PlatformAlreadyAtTheLatestVersionError{Platform: "esp8266:esp8266"}).ToRPCStatus().Err()) + require.ErrorIs(t, upgradeError, (&cmderrors.PlatformAlreadyAtTheLatestVersionError{Platform: "esp8266:esp8266"}).ToRPCStatus().Err()) require.NotNil(t, platform) require.False(t, platform.GetMetadata().GetIndexed()) // the esp866 is not present in the additional-urls require.True(t, platform.GetRelease().GetMissingMetadata()) // install.json is present From 825e64536ac7d2725c3bf34acdcd1a3eb44ed6fd Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 7 Dec 2023 11:37:14 +0100 Subject: [PATCH 04/11] Moved directories init out of commands/internal/instances --- commands/instances.go | 21 +++++++++++- commands/internal/instances/instances.go | 43 ++++-------------------- 2 files changed, 26 insertions(+), 38 deletions(-) diff --git a/commands/instances.go b/commands/instances.go index 6164f903b9c..aaeb32d8195 100644 --- a/commands/instances.go +++ b/commands/instances.go @@ -61,7 +61,26 @@ func installTool(pm *packagemanager.PackageManager, tool *cores.ToolRelease, dow // Create a new CoreInstance ready to be initialized, supporting directories are also created. func Create(req *rpc.CreateRequest, extraUserAgent ...string) (*rpc.CreateResponse, error) { - inst, err := instances.Create(extraUserAgent...) + // Setup downloads directory + downloadsDir := configuration.DownloadsDir(configuration.Settings) + if downloadsDir.NotExist() { + err := downloadsDir.MkdirAll() + if err != nil { + return nil, &cmderrors.PermissionDeniedError{Message: tr("Failed to create downloads directory"), Cause: err} + } + } + + // Setup data directory + dataDir := configuration.DataDir(configuration.Settings) + packagesDir := configuration.PackagesDir(configuration.Settings) + if packagesDir.NotExist() { + err := packagesDir.MkdirAll() + if err != nil { + return nil, &cmderrors.PermissionDeniedError{Message: tr("Failed to create data directory"), Cause: err} + } + } + + inst, err := instances.Create(dataDir, packagesDir, downloadsDir, extraUserAgent...) if err != nil { return nil, err } diff --git a/commands/internal/instances/instances.go b/commands/internal/instances/instances.go index 199a143e18c..80be3c62da2 100644 --- a/commands/internal/instances/instances.go +++ b/commands/internal/instances/instances.go @@ -3,17 +3,13 @@ package instances import ( "sync" - "github.com/arduino/arduino-cli/commands/cmderrors" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" - "github.com/arduino/arduino-cli/internal/cli/configuration" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/arduino-cli/version" + "github.com/arduino/go-paths-helper" ) -var tr = i18n.Tr - // coreInstance is an instance of the Arduino Core Services. The user can // instantiate as many as needed by providing a different configuration // for each one. @@ -74,45 +70,18 @@ func SetLibraryManager(inst *rpc.Instance, lm *librariesmanager.LibrariesManager return true } -// Create a new *rpc.Instance ready to be initialized, supporting directories are also created. -func Create(extraUserAgent ...string) (*rpc.Instance, error) { +// Create a new *rpc.Instance ready to be initialized +func Create(dataDir, packagesDir, downloadsDir *paths.Path, extraUserAgent ...string) (*rpc.Instance, error) { instance := &coreInstance{} - // Setup downloads directory - downloadsDir := configuration.DownloadsDir(configuration.Settings) - if downloadsDir.NotExist() { - err := downloadsDir.MkdirAll() - if err != nil { - return nil, &cmderrors.PermissionDeniedError{Message: tr("Failed to create downloads directory"), Cause: err} - } - } - - // Setup data directory - dataDir := configuration.DataDir(configuration.Settings) - packagesDir := configuration.PackagesDir(configuration.Settings) - if packagesDir.NotExist() { - err := packagesDir.MkdirAll() - if err != nil { - return nil, &cmderrors.PermissionDeniedError{Message: tr("Failed to create data directory"), Cause: err} - } - } - // Create package manager userAgent := "arduino-cli/" + version.VersionInfo.VersionString for _, ua := range extraUserAgent { userAgent += " " + ua } - instance.pm = packagemanager.NewBuilder( - dataDir, - configuration.PackagesDir(configuration.Settings), - downloadsDir, - dataDir.Join("tmp"), - userAgent, - ).Build() - instance.lm = librariesmanager.NewLibraryManager( - dataDir, - downloadsDir, - ) + tempDir := dataDir.Join("tmp") + instance.pm = packagemanager.NewBuilder(dataDir, packagesDir, downloadsDir, tempDir, userAgent).Build() + instance.lm = librariesmanager.NewLibraryManager(dataDir, downloadsDir) // Save instance instancesMux.Lock() From 5ad49f18c02a734a6f98dca54a377da660b8d719 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 7 Dec 2023 12:37:49 +0100 Subject: [PATCH 05/11] Updated docs --- docs/UPGRADING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/UPGRADING.md b/docs/UPGRADING.md index 3fda8770199..bb787d7248e 100644 --- a/docs/UPGRADING.md +++ b/docs/UPGRADING.md @@ -8,12 +8,15 @@ Here you can find a list of migration guides to handle breaking changes between The following golang modules are no longer available as public API: +- `github.com/arduino/arduino-cli/arduino` - `github.com/arduino/arduino-cli/buildcache` - `github.com/arduino/arduino-cli/configuration` - `github.com/arduino/arduino-cli/executils` - `github.com/arduino/arduino-cli/table` Most of the `executils` library has been integrated inside the `go-paths` library `github.com/arduino/go-paths-helper`. +The other packages are not intended for usage outside the Arduino CLI, we will keep them internal to allow future +breaking changes as needed. ### CLI changed JSON output for some `lib`, `core`, `config`, `board`, and `sketch` commands. From 4304bfe64c6fa48c053409f4a3a6dc880025a3ae Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 6 Dec 2023 18:30:13 +0100 Subject: [PATCH 06/11] Removed dep on pkg/errors library --- .../arduino/go-paths-helper.dep.yml | 2 +- .licenses/go/github.com/pkg/errors.dep.yml | 36 ---------------- commands/board/list.go | 14 +++---- commands/daemon/debug.go | 4 +- commands/upload/upload.go | 8 ++-- go.mod | 3 +- go.sum | 4 +- .../arduino/builder/archive_compiled_files.go | 7 ++-- .../arduino/builder/build_options_manager.go | 16 ++++---- internal/arduino/builder/compilation.go | 13 +++--- internal/arduino/builder/core.go | 14 +++---- .../builder/internal/detector/detector.go | 41 ++++++++++--------- .../preprocessor/arduino_preprocessor.go | 4 +- .../builder/internal/preprocessor/ctags.go | 8 ++-- .../builder/internal/preprocessor/gcc.go | 4 +- .../arduino/builder/internal/utils/utils.go | 9 ++-- internal/arduino/builder/libraries.go | 23 +++++------ internal/arduino/builder/linker.go | 7 ++-- internal/arduino/builder/recipe.go | 5 +-- internal/arduino/builder/sizer.go | 2 +- internal/arduino/builder/sketch.go | 23 +++++------ .../arduino/cores/packagemanager/download.go | 2 +- .../cores/packagemanager/install_uninstall.go | 6 +-- .../arduino/cores/packagemanager/loader.go | 2 +- .../cores/packagemanager/package_manager.go | 2 +- internal/arduino/discovery/discovery.go | 40 +++++++++--------- .../discoverymanager/discoverymanager.go | 4 +- internal/arduino/libraries/loader.go | 8 ++-- internal/arduino/serialutils/serialutils.go | 9 ++-- internal/arduino/sketch/sketch.go | 10 ++--- internal/buildcache/build_cache.go | 3 +- 31 files changed, 144 insertions(+), 189 deletions(-) delete mode 100644 .licenses/go/github.com/pkg/errors.dep.yml diff --git a/.licenses/go/github.com/arduino/go-paths-helper.dep.yml b/.licenses/go/github.com/arduino/go-paths-helper.dep.yml index 6e7dcc9ffc8..f06e4ce1625 100644 --- a/.licenses/go/github.com/arduino/go-paths-helper.dep.yml +++ b/.licenses/go/github.com/arduino/go-paths-helper.dep.yml @@ -1,6 +1,6 @@ --- name: github.com/arduino/go-paths-helper -version: v1.10.0 +version: v1.10.1 type: go summary: homepage: https://pkg.go.dev/github.com/arduino/go-paths-helper diff --git a/.licenses/go/github.com/pkg/errors.dep.yml b/.licenses/go/github.com/pkg/errors.dep.yml deleted file mode 100644 index a9b72bc4b04..00000000000 --- a/.licenses/go/github.com/pkg/errors.dep.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -name: github.com/pkg/errors -version: v0.9.1 -type: go -summary: Package errors provides simple error handling primitives. -homepage: https://pkg.go.dev/github.com/pkg/errors -license: bsd-2-clause -licenses: -- sources: LICENSE - text: | - Copyright (c) 2015, Dave Cheney - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- sources: README.md - text: BSD-2-Clause -notices: [] diff --git a/commands/board/list.go b/commands/board/list.go index 16ee283d315..18d2d815e55 100644 --- a/commands/board/list.go +++ b/commands/board/list.go @@ -18,6 +18,7 @@ package board import ( "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -35,7 +36,6 @@ import ( "github.com/arduino/arduino-cli/internal/inventory" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -73,10 +73,10 @@ func cachedAPIByVidPid(vid, pid string) ([]*rpc.BoardListItem, error) { func apiByVidPid(vid, pid string) ([]*rpc.BoardListItem, error) { // ensure vid and pid are valid before hitting the API if !validVidPid.MatchString(vid) { - return nil, errors.Errorf(tr("Invalid vid value: '%s'"), vid) + return nil, errors.New(tr("Invalid vid value: '%s'", vid)) } if !validVidPid.MatchString(pid) { - return nil, errors.Errorf(tr("Invalid pid value: '%s'"), pid) + return nil, errors.New(tr("Invalid pid value: '%s'", pid)) } url := fmt.Sprintf("%s/%s/%s", vidPidURL, vid, pid) @@ -88,19 +88,19 @@ func apiByVidPid(vid, pid string) ([]*rpc.BoardListItem, error) { httpClient, err := httpclient.New() if err != nil { - return nil, errors.Wrap(err, tr("failed to initialize http client")) + return nil, fmt.Errorf("%s: %w", tr("failed to initialize http client"), err) } res, err := httpClient.Do(req) if err != nil { - return nil, errors.Wrap(err, tr("error querying Arduino Cloud Api")) + return nil, fmt.Errorf("%s: %w", tr("error querying Arduino Cloud Api"), err) } if res.StatusCode == 404 { // This is not an error, it just means that the board is not recognized return nil, nil } if res.StatusCode >= 400 { - return nil, errors.Errorf(tr("the server responded with status %s"), res.Status) + return nil, errors.New(tr("the server responded with status %s", res.Status)) } resp, err := io.ReadAll(res.Body) @@ -113,7 +113,7 @@ func apiByVidPid(vid, pid string) ([]*rpc.BoardListItem, error) { var dat map[string]interface{} if err := json.Unmarshal(resp, &dat); err != nil { - return nil, errors.Wrap(err, tr("error processing response from server")) + return nil, fmt.Errorf("%s: %w", tr("error processing response from server"), err) } name, nameFound := dat["name"].(string) fqbn, fbqnFound := dat["fqbn"].(string) diff --git a/commands/daemon/debug.go b/commands/daemon/debug.go index 538d2b171d4..d3de963bae4 100644 --- a/commands/daemon/debug.go +++ b/commands/daemon/debug.go @@ -17,11 +17,11 @@ package daemon import ( "context" + "errors" "os" cmd "github.com/arduino/arduino-cli/commands/debug" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" - "github.com/pkg/errors" ) // Debug returns a stream response that can be used to fetch data from the @@ -37,7 +37,7 @@ func (s *ArduinoCoreServerImpl) Debug(stream rpc.ArduinoCoreService_DebugServer) // Ensure it's a config message and not data req := msg.GetDebugRequest() if req == nil { - return errors.Errorf(tr("First message must contain debug request, not data")) + return errors.New(tr("First message must contain debug request, not data")) } // Launch debug recipe attaching stdin and out to grpc streaming diff --git a/commands/upload/upload.go b/commands/upload/upload.go index 4f21543d994..7a8c08bf6ee 100644 --- a/commands/upload/upload.go +++ b/commands/upload/upload.go @@ -17,6 +17,7 @@ package upload import ( "context" + "errors" "fmt" "io" "path/filepath" @@ -36,7 +37,6 @@ import ( rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -711,14 +711,14 @@ func determineBuildPathAndSketchName(importFile, importDir string, sk *sketch.Sk buildPath := paths.New(importDir) sketchName, err := detectSketchNameFromBuildPath(buildPath) if err != nil { - return nil, "", errors.Errorf(tr("autodetect build artifact: %s"), err) + return nil, "", fmt.Errorf("%s: %w", tr("looking for build artifacts"), err) } return buildPath, sketchName, nil } // Case 3: nothing given... if sk == nil { - return nil, "", fmt.Errorf(tr("no sketch or build directory/file specified")) + return nil, "", errors.New(tr("no sketch or build directory/file specified")) } // Case 4: only sketch specified. In this case we use the generated build path @@ -763,7 +763,7 @@ func detectSketchNameFromBuildPath(buildPath *paths.Path) (string, error) { } if candidateName != name { - return "", errors.Errorf(tr("multiple build artifacts found: '%[1]s' and '%[2]s'"), candidateFile, file) + return "", errors.New(tr("multiple build artifacts found: '%[1]s' and '%[2]s'", candidateFile, file)) } } diff --git a/go.mod b/go.mod index 2d93f0c27d4..998dd49bba7 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ replace github.com/mailru/easyjson => github.com/cmaglie/easyjson v0.8.1 require ( github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 - github.com/arduino/go-paths-helper v1.10.0 + github.com/arduino/go-paths-helper v1.10.1 github.com/arduino/go-properties-orderedmap v1.8.0 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b github.com/arduino/go-win32-utils v1.0.0 @@ -25,7 +25,6 @@ require ( github.com/marcinbor85/gohex v0.0.0-20210308104911-55fb1c624d84 github.com/mattn/go-colorable v0.1.13 github.com/mattn/go-isatty v0.0.20 - github.com/pkg/errors v0.9.1 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 github.com/rogpeppe/go-internal v1.11.0 github.com/schollz/closestmatch v2.1.0+incompatible diff --git a/go.sum b/go.sum index 3ca470ff5fb..85f02b41536 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/arduino/go-paths-helper v1.0.1/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3v5YYu35Yb+w31Ck= -github.com/arduino/go-paths-helper v1.10.0 h1:oeE6Mcl4lsz+knC3lzaCWkRQa3n3FbwdRSeGhy6uGbM= -github.com/arduino/go-paths-helper v1.10.0/go.mod h1:LgEVnv+cqSl05vXD5LaUZGquDsX5OKmPNDJtjTL8928= +github.com/arduino/go-paths-helper v1.10.1 h1:j8InnhLrSeoPiOvTnZL0XMFt7l407ciTBJJJs7W9bs4= +github.com/arduino/go-paths-helper v1.10.1/go.mod h1:jcpW4wr0u69GlXhTYydsdsqAjLaYK5n7oWHfKqOG6LM= github.com/arduino/go-properties-orderedmap v1.8.0 h1:wEfa6hHdpezrVOh787OmClsf/Kd8qB+zE3P2Xbrn0CQ= github.com/arduino/go-properties-orderedmap v1.8.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk= github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4= diff --git a/internal/arduino/builder/archive_compiled_files.go b/internal/arduino/builder/archive_compiled_files.go index b640e3e256e..31caed6df41 100644 --- a/internal/arduino/builder/archive_compiled_files.go +++ b/internal/arduino/builder/archive_compiled_files.go @@ -17,7 +17,6 @@ package builder import ( "github.com/arduino/go-paths-helper" - "github.com/pkg/errors" ) // ArchiveCompiledFiles fixdoc @@ -45,7 +44,7 @@ func (b *Builder) archiveCompiledFiles(buildPath *paths.Path, archiveFile *paths // something changed, rebuild the core archive if rebuildArchive { if err := archiveFilePath.Remove(); err != nil { - return nil, errors.WithStack(err) + return nil, err } } else { if b.logger.Verbose() { @@ -63,11 +62,11 @@ func (b *Builder) archiveCompiledFiles(buildPath *paths.Path, archiveFile *paths command, err := b.prepareCommandForRecipe(properties, "recipe.ar.pattern", false) if err != nil { - return nil, errors.WithStack(err) + return nil, err } if err := b.execCommand(command); err != nil { - return nil, errors.WithStack(err) + return nil, err } } diff --git a/internal/arduino/builder/build_options_manager.go b/internal/arduino/builder/build_options_manager.go index 8c958bad527..0d8c2a36311 100644 --- a/internal/arduino/builder/build_options_manager.go +++ b/internal/arduino/builder/build_options_manager.go @@ -17,6 +17,7 @@ package builder import ( "encoding/json" + "fmt" "path/filepath" "strings" @@ -25,7 +26,6 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" ) // buildOptions fixdoc @@ -100,7 +100,7 @@ func newBuildOptions( func (b *Builder) createBuildOptionsJSON() error { buildOptionsJSON, err := json.MarshalIndent(b.buildOptions.currentOptions, "", " ") if err != nil { - return errors.WithStack(err) + return err } return b.buildOptions.buildPath.Join("build.options.json").WriteFile(buildOptionsJSON) } @@ -110,10 +110,10 @@ func (b *Builder) wipeBuildPath() error { // control when this should be printed. // logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_BUILD_OPTIONS_CHANGED + constants.MSG_REBUILD_ALL) if err := b.buildOptions.buildPath.RemoveAll(); err != nil { - return errors.WithMessage(err, tr("cleaning build path")) + return fmt.Errorf("%s: %w", tr("cleaning build path"), err) } if err := b.buildOptions.buildPath.MkdirAll(); err != nil { - return errors.WithMessage(err, tr("cleaning build path")) + return fmt.Errorf("%s: %w", tr("cleaning build path"), err) } return nil } @@ -125,11 +125,11 @@ func (b *Builder) wipeBuildPathIfBuildOptionsChanged() error { // Load previous build options map var buildOptionsJSONPrevious []byte - var _err error if buildOptionsFile := b.buildOptions.buildPath.Join("build.options.json"); buildOptionsFile.Exist() { - buildOptionsJSONPrevious, _err = buildOptionsFile.ReadFile() - if _err != nil { - return errors.WithStack(_err) + var err error + buildOptionsJSONPrevious, err = buildOptionsFile.ReadFile() + if err != nil { + return err } } diff --git a/internal/arduino/builder/compilation.go b/internal/arduino/builder/compilation.go index 89b4fa9895c..d997c264bcf 100644 --- a/internal/arduino/builder/compilation.go +++ b/internal/arduino/builder/compilation.go @@ -25,7 +25,6 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/go-paths-helper" - "github.com/pkg/errors" ) func (b *Builder) compileFiles( @@ -104,7 +103,7 @@ func (b *Builder) compileFiles( wg.Wait() if len(errorsList) > 0 { // output the first error - return nil, errors.WithStack(errorsList[0]) + return nil, errorsList[0] } objectFiles.Sort() return objectFiles, nil @@ -124,7 +123,7 @@ func (b *Builder) compileFileWithRecipe( properties.SetPath("source_file", source) relativeSource, err := sourcePath.RelTo(source) if err != nil { - return nil, errors.WithStack(err) + return nil, err } depsFile := buildPath.Join(relativeSource.String() + ".d") objectFile := buildPath.Join(relativeSource.String() + ".o") @@ -132,17 +131,17 @@ func (b *Builder) compileFileWithRecipe( properties.SetPath("object_file", objectFile) err = objectFile.Parent().MkdirAll() if err != nil { - return nil, errors.WithStack(err) + return nil, err } objIsUpToDate, err := utils.ObjFileIsUpToDate(source, objectFile, depsFile) if err != nil { - return nil, errors.WithStack(err) + return nil, err } command, err := b.prepareCommandForRecipe(properties, recipe, false) if err != nil { - return nil, errors.WithStack(err) + return nil, err } if b.compilationDatabase != nil { b.compilationDatabase.Add(source, command) @@ -174,7 +173,7 @@ func (b *Builder) compileFileWithRecipe( // ...and then return the error if err != nil { - return nil, errors.WithStack(err) + return nil, err } } else if b.logger.Verbose() { if objIsUpToDate { diff --git a/internal/arduino/builder/core.go b/internal/arduino/builder/core.go index 76058e21c80..102e1be2eac 100644 --- a/internal/arduino/builder/core.go +++ b/internal/arduino/builder/core.go @@ -18,6 +18,7 @@ package builder import ( "crypto/md5" "encoding/hex" + "errors" "fmt" "os" "strings" @@ -27,13 +28,12 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" "github.com/arduino/arduino-cli/internal/buildcache" "github.com/arduino/go-paths-helper" - "github.com/pkg/errors" ) // buildCore fixdoc func (b *Builder) buildCore() error { if err := b.coreBuildPath.MkdirAll(); err != nil { - return errors.WithStack(err) + return err } if b.coreBuildCachePath != nil { @@ -44,13 +44,13 @@ func (b *Builder) buildCore() error { // compileCore function). b.coreBuildCachePath = nil } else if err := b.coreBuildCachePath.MkdirAll(); err != nil { - return errors.WithStack(err) + return err } } archiveFile, objectFiles, err := b.compileCore() if err != nil { - return errors.WithStack(err) + return err } b.buildArtifacts.coreObjectsFiles = objectFiles b.buildArtifacts.coreArchiveFilePath = archiveFile @@ -77,7 +77,7 @@ func (b *Builder) compileCore() (*paths.Path, paths.PathList, error) { includes, ) if err != nil { - return nil, nil, errors.WithStack(err) + return nil, nil, err } } @@ -125,12 +125,12 @@ func (b *Builder) compileCore() (*paths.Path, paths.PathList, error) { includes, ) if err != nil { - return nil, nil, errors.WithStack(err) + return nil, nil, err } archiveFile, err := b.archiveCompiledFiles(b.coreBuildPath, paths.New("core.a"), coreObjectFiles) if err != nil { - return nil, nil, errors.WithStack(err) + return nil, nil, err } // archive core.a diff --git a/internal/arduino/builder/internal/detector/detector.go b/internal/arduino/builder/internal/detector/detector.go index aa8b70635fd..e368edd13b3 100644 --- a/internal/arduino/builder/internal/detector/detector.go +++ b/internal/arduino/builder/internal/detector/detector.go @@ -18,6 +18,7 @@ package detector import ( "bytes" "encoding/json" + "errors" "fmt" "os/exec" "regexp" @@ -37,7 +38,6 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" ) var tr = i18n.Tr @@ -254,7 +254,7 @@ func (l *SketchLibrariesDetector) findIncludes( sketch := sketch mergedfile, err := makeSourceFile(sketchBuildPath, sketchBuildPath, paths.New(sketch.MainFile.Base()+".cpp")) if err != nil { - return errors.WithStack(err) + return err } sourceFileQueue.push(mergedfile) @@ -268,19 +268,19 @@ func (l *SketchLibrariesDetector) findIncludes( err := l.findIncludesUntilDone(cache, sourceFileQueue, buildProperties, sketchBuildPath, librariesBuildPath, platformArch) if err != nil { cachePath.Remove() - return errors.WithStack(err) + return err } } // Finalize the cache cache.ExpectEnd() if err := writeCache(cache, cachePath); err != nil { - return errors.WithStack(err) + return err } } if err := l.failIfImportedLibraryIsWrong(); err != nil { - return errors.WithStack(err) + return err } if d, err := json.Marshal(l.includeFolders); err != nil { @@ -320,7 +320,7 @@ func (l *SketchLibrariesDetector) findIncludesUntilDone( // remove the object file if it is found to be stale? unchanged, err := utils.ObjFileIsUpToDate(sourcePath, objPath, depPath) if err != nil { - return errors.WithStack(err) + return err } first := true @@ -352,12 +352,13 @@ func (l *SketchLibrariesDetector) findIncludesUntilDone( l.logger.WriteStdout(preprocStdout) } // Unwrap error and see if it is an ExitError. + var exitErr *exec.ExitError if preprocErr == nil { // Preprocessor successful, done missingIncludeH = "" - } else if _, isExitErr := errors.Cause(preprocErr).(*exec.ExitError); !isExitErr || preprocStderr == nil { + } else if isExitErr := errors.As(preprocErr, &exitErr); !isExitErr || preprocStderr == nil { // Ignore ExitErrors (e.g. gcc returning non-zero status), but bail out on other errors - return errors.WithStack(preprocErr) + return preprocErr } else { missingIncludeH = IncludesFinderWithRegExp(string(preprocStderr)) if missingIncludeH == "" && l.logger.Verbose() { @@ -391,7 +392,7 @@ func (l *SketchLibrariesDetector) findIncludesUntilDone( } } l.logger.WriteStderr(preprocStderr) - return errors.WithStack(preprocErr) + return preprocErr } // Add this library to the list of libraries, the @@ -429,13 +430,13 @@ func (l *SketchLibrariesDetector) queueSourceFilesFromFolder( } filePaths, err := utils.FindFilesInFolder(folder, recurse, sourceFileExtensions...) if err != nil { - return errors.WithStack(err) + return err } for _, filePath := range filePaths { sourceFile, err := makeSourceFile(sourceDir, buildDir, filePath, extraIncludePath...) if err != nil { - return errors.WithStack(err) + return err } sourceFileQueue.push(sourceFile) } @@ -605,7 +606,7 @@ func LibrariesLoader( builtInLibrariesFolders := builtInLibrariesDirs if builtInLibrariesFolders != nil { if err := builtInLibrariesFolders.ToAbs(); err != nil { - return nil, nil, nil, errors.WithStack(err) + return nil, nil, nil, err } lm.AddLibrariesDir(builtInLibrariesFolders, libraries.IDEBuiltIn) } @@ -617,7 +618,7 @@ func LibrariesLoader( librariesFolders := otherLibrariesDirs if err := librariesFolders.ToAbs(); err != nil { - return nil, nil, nil, errors.WithStack(err) + return nil, nil, nil, err } for _, folder := range librariesFolders { lm.AddLibrariesDir(folder, libraries.User) @@ -636,24 +637,24 @@ func LibrariesLoader( for _, dir := range libraryDirs { // Libraries specified this way have top priority if err := lm.LoadLibraryFromDir(dir, libraries.Unmanaged); err != nil { - return nil, nil, nil, errors.WithStack(err) + return nil, nil, nil, err } } } resolver := librariesresolver.NewCppResolver() if err := resolver.ScanIDEBuiltinLibraries(lm); err != nil { - return nil, nil, nil, errors.WithStack(err) + return nil, nil, nil, err } if err := resolver.ScanUserAndUnmanagedLibraries(lm); err != nil { - return nil, nil, nil, errors.WithStack(err) + return nil, nil, nil, err } if err := resolver.ScanPlatformLibraries(lm, targetPlatform); err != nil { - return nil, nil, nil, errors.WithStack(err) + return nil, nil, nil, err } if actualPlatform != targetPlatform { if err := resolver.ScanPlatformLibraries(lm, actualPlatform); err != nil { - return nil, nil, nil, errors.WithStack(err) + return nil, nil, nil, err } } return lm, resolver, verboseOut.Bytes(), nil @@ -760,11 +761,11 @@ func writeCache(cache *includeCache, path *paths.Path) error { } else { bytes, err := json.MarshalIndent(cache.entries, "", " ") if err != nil { - return errors.WithStack(err) + return err } err = path.WriteFile(bytes) if err != nil { - return errors.WithStack(err) + return err } } return nil diff --git a/internal/arduino/builder/internal/preprocessor/arduino_preprocessor.go b/internal/arduino/builder/internal/preprocessor/arduino_preprocessor.go index c14b3349a42..2c3d61c1397 100644 --- a/internal/arduino/builder/internal/preprocessor/arduino_preprocessor.go +++ b/internal/arduino/builder/internal/preprocessor/arduino_preprocessor.go @@ -18,6 +18,7 @@ package preprocessor import ( "bytes" "context" + "errors" "path/filepath" "runtime" @@ -25,7 +26,6 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" ) // PreprocessSketchWithArduinoPreprocessor performs preprocessing of the arduino sketch @@ -62,7 +62,7 @@ func PreprocessSketchWithArduinoPreprocessor(sk *sketch.Sketch, buildPath *paths commandLine := arduiniPreprocessorProperties.ExpandPropsInString(pattern) parts, err := properties.SplitQuotedString(commandLine, `"'`, false) if err != nil { - return nil, nil, errors.WithStack(err) + return nil, nil, err } command, err := paths.NewProcess(nil, parts...) diff --git a/internal/arduino/builder/internal/preprocessor/ctags.go b/internal/arduino/builder/internal/preprocessor/ctags.go index c35b839f47b..c3c8d150f46 100644 --- a/internal/arduino/builder/internal/preprocessor/ctags.go +++ b/internal/arduino/builder/internal/preprocessor/ctags.go @@ -19,6 +19,7 @@ import ( "bufio" "bytes" "context" + "errors" "fmt" "io" "strconv" @@ -30,7 +31,6 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" ) var tr = i18n.Tr @@ -60,7 +60,7 @@ func PreprocessSketchWithCtags(sketch *sketch.Sketch, buildPath *paths.Path, inc normalOutput.Write(gccStderr) if err != nil { if !onlyUpdateCompilationDatabase { - return normalOutput.Bytes(), verboseOutput.Bytes(), errors.WithStack(err) + return normalOutput.Bytes(), verboseOutput.Bytes(), err } // Do not bail out if we are generating the compile commands database @@ -68,7 +68,7 @@ func PreprocessSketchWithCtags(sketch *sketch.Sketch, buildPath *paths.Path, inc tr("An error occurred adding prototypes"), tr("the compilation database may be incomplete or inaccurate"))) if err := sourceFile.CopyTo(ctagsTarget); err != nil { - return normalOutput.Bytes(), verboseOutput.Bytes(), errors.WithStack(err) + return normalOutput.Bytes(), verboseOutput.Bytes(), err } } @@ -186,7 +186,7 @@ func RunCTags(sourceFile *paths.Path, buildProperties *properties.Map) ([]byte, pattern := ctagsBuildProperties.Get("pattern") if pattern == "" { - return nil, nil, errors.Errorf(tr("%s pattern is missing"), "ctags") + return nil, nil, errors.New(tr("%s pattern is missing", "ctags")) } commandLine := ctagsBuildProperties.ExpandPropsInString(pattern) diff --git a/internal/arduino/builder/internal/preprocessor/gcc.go b/internal/arduino/builder/internal/preprocessor/gcc.go index 13e0e3c59c9..791a3366fba 100644 --- a/internal/arduino/builder/internal/preprocessor/gcc.go +++ b/internal/arduino/builder/internal/preprocessor/gcc.go @@ -17,6 +17,7 @@ package preprocessor import ( "context" + "errors" "fmt" "strings" @@ -24,7 +25,6 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" ) // GCC performs a run of the gcc preprocess (macro/includes expansion). The function outputs the result @@ -54,7 +54,7 @@ func GCC(sourceFilePath *paths.Path, targetFilePath *paths.Path, includes paths. pattern := gccBuildProperties.Get(gccPreprocRecipeProperty) if pattern == "" { - return nil, nil, errors.Errorf(tr("%s pattern is missing"), gccPreprocRecipeProperty) + return nil, nil, errors.New(tr("%s pattern is missing", gccPreprocRecipeProperty)) } commandLine := gccBuildProperties.ExpandPropsInString(pattern) diff --git a/internal/arduino/builder/internal/utils/utils.go b/internal/arduino/builder/internal/utils/utils.go index 8746623a821..630172e2410 100644 --- a/internal/arduino/builder/internal/utils/utils.go +++ b/internal/arduino/builder/internal/utils/utils.go @@ -22,7 +22,6 @@ import ( f "github.com/arduino/arduino-cli/internal/algorithms" "github.com/arduino/go-paths-helper" - "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/text/runes" "golang.org/x/text/transform" @@ -40,7 +39,7 @@ func ObjFileIsUpToDate(sourceFile, objectFile, dependencyFile *paths.Path) (bool sourceFile = sourceFile.Clean() sourceFileStat, err := sourceFile.Stat() if err != nil { - return false, errors.WithStack(err) + return false, err } objectFile = objectFile.Clean() @@ -50,7 +49,7 @@ func ObjFileIsUpToDate(sourceFile, objectFile, dependencyFile *paths.Path) (bool logrus.Debugf("Not found: %v", objectFile) return false, nil } - return false, errors.WithStack(err) + return false, err } dependencyFile = dependencyFile.Clean() @@ -60,7 +59,7 @@ func ObjFileIsUpToDate(sourceFile, objectFile, dependencyFile *paths.Path) (bool logrus.Debugf("Not found: %v", dependencyFile) return false, nil } - return false, errors.WithStack(err) + return false, err } if sourceFileStat.ModTime().After(objectFileStat.ModTime()) { @@ -74,7 +73,7 @@ func ObjFileIsUpToDate(sourceFile, objectFile, dependencyFile *paths.Path) (bool rows, err := dependencyFile.ReadFileAsLines() if err != nil { - return false, errors.WithStack(err) + return false, err } rows = f.Map(rows, removeEndingBackSlash) diff --git a/internal/arduino/builder/libraries.go b/internal/arduino/builder/libraries.go index bd8a1702eb5..d0a32bf0806 100644 --- a/internal/arduino/builder/libraries.go +++ b/internal/arduino/builder/libraries.go @@ -25,7 +25,6 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" ) // nolint @@ -40,12 +39,12 @@ func (b *Builder) buildLibraries(includesFolders paths.PathList, importedLibrari libs := importedLibraries if err := b.librariesBuildPath.MkdirAll(); err != nil { - return errors.WithStack(err) + return err } librariesObjectFiles, err := b.compileLibraries(libs, includes) if err != nil { - return errors.WithStack(err) + return err } b.buildArtifacts.librariesObjectFiles = librariesObjectFiles return nil @@ -118,7 +117,7 @@ func (b *Builder) compileLibraries(libraries libraries.List, includes []string) for _, library := range libraries { libraryObjectFiles, err := b.compileLibrary(library, includes) if err != nil { - return nil, errors.WithStack(err) + return nil, err } objectFiles.AddAll(libraryObjectFiles) @@ -135,7 +134,7 @@ func (b *Builder) compileLibrary(library *libraries.Library, includes []string) libraryBuildPath := b.librariesBuildPath.Join(library.DirName) if err := libraryBuildPath.MkdirAll(); err != nil { - return nil, errors.WithStack(err) + return nil, err } objectFiles := paths.NewPathList() @@ -153,7 +152,7 @@ func (b *Builder) compileLibrary(library *libraries.Library, includes []string) // Find all libraries in precompiledPath libs, err := precompiledPath.ReadDir() if err != nil { - return nil, errors.WithStack(err) + return nil, err } // Add required LD flags @@ -194,12 +193,12 @@ func (b *Builder) compileLibrary(library *libraries.Library, includes []string) includes, ) if err != nil { - return nil, errors.WithStack(err) + return nil, err } if library.DotALinkage { archiveFile, err := b.archiveCompiledFiles(libraryBuildPath, paths.New(library.DirName+".a"), libObjectFiles) if err != nil { - return nil, errors.WithStack(err) + return nil, err } objectFiles.Add(archiveFile) } else { @@ -215,7 +214,7 @@ func (b *Builder) compileLibrary(library *libraries.Library, includes []string) includes, ) if err != nil { - return nil, errors.WithStack(err) + return nil, err } objectFiles.AddAll(libObjectFiles) @@ -227,7 +226,7 @@ func (b *Builder) compileLibrary(library *libraries.Library, includes []string) includes, ) if err != nil { - return nil, errors.WithStack(err) + return nil, err } objectFiles.AddAll(utilityObjectFiles) } @@ -252,7 +251,7 @@ func (b *Builder) removeUnusedCompiledLibraries(importedLibraries libraries.List files, err := b.librariesBuildPath.ReadDir() if err != nil { - return errors.WithStack(err) + return err } libraryNames := toLibraryNames(importedLibraries) @@ -260,7 +259,7 @@ func (b *Builder) removeUnusedCompiledLibraries(importedLibraries libraries.List if file.IsDir() { if !slices.Contains(libraryNames, file.Base()) { if err := file.RemoveAll(); err != nil { - return errors.WithStack(err) + return err } } } diff --git a/internal/arduino/builder/linker.go b/internal/arduino/builder/linker.go index caad00d02c9..55534503cd4 100644 --- a/internal/arduino/builder/linker.go +++ b/internal/arduino/builder/linker.go @@ -20,7 +20,6 @@ import ( f "github.com/arduino/arduino-cli/internal/algorithms" "github.com/arduino/go-paths-helper" - "github.com/pkg/errors" ) // link fixdoc @@ -39,7 +38,7 @@ func (b *Builder) link() error { coreDotARelPath, err := b.buildPath.RelTo(b.buildArtifacts.coreArchiveFilePath) if err != nil { - return errors.WithStack(err) + return err } wrapWithDoubleQuotes := func(value string) string { return "\"" + value + "\"" } @@ -73,11 +72,11 @@ func (b *Builder) link() error { command, err := b.prepareCommandForRecipe(properties, "recipe.ar.pattern", false) if err != nil { - return errors.WithStack(err) + return err } if err := b.execCommand(command); err != nil { - return errors.WithStack(err) + return err } } diff --git a/internal/arduino/builder/recipe.go b/internal/arduino/builder/recipe.go index 57b137176f1..742b4484682 100644 --- a/internal/arduino/builder/recipe.go +++ b/internal/arduino/builder/recipe.go @@ -21,7 +21,6 @@ import ( "strings" properties "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -40,7 +39,7 @@ func (b *Builder) RunRecipe(prefix, suffix string, skipIfOnlyUpdatingCompilation command, err := b.prepareCommandForRecipe(properties, recipe, false) if err != nil { - return errors.WithStack(err) + return err } if b.onlyUpdateCompilationDatabase && skipIfOnlyUpdatingCompilationDatabase { @@ -51,7 +50,7 @@ func (b *Builder) RunRecipe(prefix, suffix string, skipIfOnlyUpdatingCompilation } if err := b.execCommand(command); err != nil { - return errors.WithStack(err) + return err } } diff --git a/internal/arduino/builder/sizer.go b/internal/arduino/builder/sizer.go index 1be92719914..5814ba3ff4e 100644 --- a/internal/arduino/builder/sizer.go +++ b/internal/arduino/builder/sizer.go @@ -18,6 +18,7 @@ package builder import ( "bytes" "encoding/json" + "errors" "fmt" "regexp" "strconv" @@ -25,7 +26,6 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" ) // ExecutableSectionSize represents a section of the executable output file diff --git a/internal/arduino/builder/sketch.go b/internal/arduino/builder/sketch.go index 930fb11e2c5..9331d93f341 100644 --- a/internal/arduino/builder/sketch.go +++ b/internal/arduino/builder/sketch.go @@ -17,6 +17,7 @@ package builder import ( "bytes" + "errors" "fmt" "math" "regexp" @@ -28,8 +29,6 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" "github.com/arduino/go-paths-helper" "github.com/marcinbor85/gohex" - - "github.com/pkg/errors" ) var ( @@ -42,7 +41,7 @@ var ( // .cpp file still needs to be Arduino-preprocessed to compile). func (b *Builder) prepareSketchBuildPath() error { if err := b.sketchBuildPath.MkdirAll(); err != nil { - return errors.Wrap(err, tr("unable to create a folder to save the sketch")) + return fmt.Errorf("%s: %w", tr("unable to create a folder to save the sketch"), err) } offset, mergedSource, err := b.sketchMergeSources(b.sourceOverrides) @@ -73,7 +72,7 @@ func (b *Builder) sketchMergeSources(overrides map[string]string) (int, string, getSource := func(f *paths.Path) (string, error) { path, err := b.sketch.FullPath.RelTo(f) if err != nil { - return "", errors.Wrap(err, tr("unable to compute relative path to the sketch for the item")) + return "", fmt.Errorf("%s: %w", tr("unable to compute relative path to the sketch for the item"), err) } if override, ok := overrides[path.String()]; ok { return override, nil @@ -117,13 +116,13 @@ func (b *Builder) sketchCopyAdditionalFiles(buildPath *paths.Path, overrides map for _, file := range b.sketch.AdditionalFiles { relpath, err := b.sketch.FullPath.RelTo(file) if err != nil { - return errors.Wrap(err, tr("unable to compute relative path to the sketch for the item")) + return fmt.Errorf("%s: %w", tr("unable to compute relative path to the sketch for the item"), err) } targetPath := buildPath.JoinPath(relpath) // create the directory containing the target if err = targetPath.Parent().MkdirAll(); err != nil { - return errors.Wrap(err, tr("unable to create the folder containing the item")) + return fmt.Errorf("%s: %w", tr("unable to create the folder containing the item"), err) } var sourceBytes []byte @@ -134,7 +133,7 @@ func (b *Builder) sketchCopyAdditionalFiles(buildPath *paths.Path, overrides map // read the source file s, err := file.ReadFile() if err != nil { - return errors.Wrap(err, tr("unable to read contents of the source item")) + return fmt.Errorf("%s: %w", tr("unable to read contents of the source item"), err) } sourceBytes = s } @@ -144,7 +143,7 @@ func (b *Builder) sketchCopyAdditionalFiles(buildPath *paths.Path, overrides map err = writeIfDifferent(sourceBytes, targetPath) if err != nil { - return errors.Wrap(err, tr("unable to write to destination file")) + return fmt.Errorf("%s: %w", tr("unable to write to destination file"), err) } } @@ -161,7 +160,7 @@ func writeIfDifferent(source []byte, destPath *paths.Path) error { // Read the destination file if it exists existingBytes, err := destPath.ReadFile() if err != nil { - return errors.Wrap(err, tr("unable to read contents of the destination item")) + return fmt.Errorf("%s: %w", tr("unable to read contents of the destination item"), err) } // Overwrite if contents are different @@ -178,7 +177,7 @@ func (b *Builder) buildSketch(includesFolders paths.PathList) error { includes := f.Map(includesFolders.AsStrings(), cpp.WrapWithHyphenI) if err := b.sketchBuildPath.MkdirAll(); err != nil { - return errors.WithStack(err) + return err } sketchObjectFiles, err := b.compileFiles( @@ -187,7 +186,7 @@ func (b *Builder) buildSketch(includesFolders paths.PathList) error { includes, ) if err != nil { - return errors.WithStack(err) + return err } // The "src/" subdirectory of a sketch is compiled recursively @@ -199,7 +198,7 @@ func (b *Builder) buildSketch(includesFolders paths.PathList) error { includes, ) if err != nil { - return errors.WithStack(err) + return err } sketchObjectFiles.AddAll(srcObjectFiles) } diff --git a/internal/arduino/cores/packagemanager/download.go b/internal/arduino/cores/packagemanager/download.go index f2e293b3f27..c4a7cb62d59 100644 --- a/internal/arduino/cores/packagemanager/download.go +++ b/internal/arduino/cores/packagemanager/download.go @@ -16,12 +16,12 @@ package packagemanager import ( + "errors" "fmt" "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/internal/arduino/cores" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" - "github.com/pkg/errors" "go.bug.st/downloader/v2" semver "go.bug.st/relaxed-semver" ) diff --git a/internal/arduino/cores/packagemanager/install_uninstall.go b/internal/arduino/cores/packagemanager/install_uninstall.go index 5b2af285ea6..bc29f08fa43 100644 --- a/internal/arduino/cores/packagemanager/install_uninstall.go +++ b/internal/arduino/cores/packagemanager/install_uninstall.go @@ -18,6 +18,7 @@ package packagemanager import ( "bytes" "encoding/json" + "errors" "fmt" "runtime" @@ -26,7 +27,6 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/cores/packageindex" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" - "github.com/pkg/errors" ) // DownloadAndInstallPlatformUpgrades runs a full installation process to upgrade the given platform. @@ -205,7 +205,7 @@ func (pme *Explorer) InstallPlatform(platformRelease *cores.PlatformRelease) err // InstallPlatformInDirectory installs a specific release of a platform in a specific directory. func (pme *Explorer) InstallPlatformInDirectory(platformRelease *cores.PlatformRelease, destDir *paths.Path) error { if err := platformRelease.Resource.Install(pme.DownloadDir, pme.tempDir, destDir); err != nil { - return errors.Errorf(tr("installing platform %[1]s: %[2]s"), platformRelease, err) + return errors.New(tr("installing platform %[1]s: %[2]s", platformRelease, err)) } if d, err := destDir.Abs(); err == nil { platformRelease.InstallDir = d @@ -213,7 +213,7 @@ func (pme *Explorer) InstallPlatformInDirectory(platformRelease *cores.PlatformR return err } if err := pme.cacheInstalledJSON(platformRelease); err != nil { - return errors.Errorf(tr("creating installed.json in %[1]s: %[2]s"), platformRelease.InstallDir, err) + return errors.New(tr("creating installed.json in %[1]s: %[2]s", platformRelease.InstallDir, err)) } return nil } diff --git a/internal/arduino/cores/packagemanager/loader.go b/internal/arduino/cores/packagemanager/loader.go index bc736734bc9..282e07afc60 100644 --- a/internal/arduino/cores/packagemanager/loader.go +++ b/internal/arduino/cores/packagemanager/loader.go @@ -16,6 +16,7 @@ package packagemanager import ( + "errors" "fmt" "os" "path/filepath" @@ -29,7 +30,6 @@ import ( "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" semver "go.bug.st/relaxed-semver" ) diff --git a/internal/arduino/cores/packagemanager/package_manager.go b/internal/arduino/cores/packagemanager/package_manager.go index 31782dae1bd..4daf8984f30 100644 --- a/internal/arduino/cores/packagemanager/package_manager.go +++ b/internal/arduino/cores/packagemanager/package_manager.go @@ -16,6 +16,7 @@ package packagemanager import ( + "errors" "fmt" "net/url" "os" @@ -35,7 +36,6 @@ import ( paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" "github.com/arduino/go-timeutils" - "github.com/pkg/errors" "github.com/sirupsen/logrus" semver "go.bug.st/relaxed-semver" ) diff --git a/internal/arduino/discovery/discovery.go b/internal/arduino/discovery/discovery.go index 665e527932a..a1b719db3ee 100644 --- a/internal/arduino/discovery/discovery.go +++ b/internal/arduino/discovery/discovery.go @@ -17,6 +17,7 @@ package discovery import ( "encoding/json" + "errors" "fmt" "io" "strings" @@ -28,7 +29,6 @@ import ( "github.com/arduino/arduino-cli/version" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -345,13 +345,13 @@ func (disc *PluggableDiscovery) Run() (err error) { if msg, err := disc.waitMessage(time.Second * 10); err != nil { return fmt.Errorf(tr("calling %[1]s: %[2]w"), "HELLO", err) } else if msg.EventType != "hello" { - return errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "hello", msg.EventType) + return errors.New(tr("communication out of sync, expected '%[1]s', received '%[2]s'", "hello", msg.EventType)) } else if msg.Error { - return errors.Errorf(tr("command failed: %s"), msg.Message) + return errors.New(tr("command failed: %s", msg.Message)) } else if strings.ToUpper(msg.Message) != "OK" { - return errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "OK", msg.Message) + return errors.New(tr("communication out of sync, expected '%[1]s', received '%[2]s'", "OK", msg.Message)) } else if msg.ProtocolVersion > 1 { - return errors.Errorf(tr("protocol version not supported: requested 1, got %d"), msg.ProtocolVersion) + return errors.New(tr("protocol version not supported: requested 1, got %d", msg.ProtocolVersion)) } disc.statusMutex.Lock() defer disc.statusMutex.Unlock() @@ -366,13 +366,13 @@ func (disc *PluggableDiscovery) Start() error { return err } if msg, err := disc.waitMessage(time.Second * 10); err != nil { - return fmt.Errorf(tr("calling %[1]s: %[2]w"), "START", err) + return errors.New(tr("calling %[1]s: %[2]w", "START", err)) } else if msg.EventType != "start" { - return errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "start", msg.EventType) + return errors.New(tr("communication out of sync, expected '%[1]s', received '%[2]s'", "start", msg.EventType)) } else if msg.Error { - return errors.Errorf(tr("command failed: %s"), msg.Message) + return errors.New(tr("command failed: %s", msg.Message)) } else if strings.ToUpper(msg.Message) != "OK" { - return errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "OK", msg.Message) + return errors.New(tr("communication out of sync, expected '%[1]s', received '%[2]s'", "OK", msg.Message)) } disc.statusMutex.Lock() defer disc.statusMutex.Unlock() @@ -388,13 +388,13 @@ func (disc *PluggableDiscovery) Stop() error { return err } if msg, err := disc.waitMessage(time.Second * 10); err != nil { - return fmt.Errorf(tr("calling %[1]s: %[2]w"), "STOP", err) + return errors.New(tr("calling %[1]s: %[2]w", "STOP", err)) } else if msg.EventType != "stop" { - return errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "stop", msg.EventType) + return errors.New(tr("communication out of sync, expected '%[1]s', received '%[2]s'", "stop", msg.EventType)) } else if msg.Error { - return errors.Errorf(tr("command failed: %s"), msg.Message) + return errors.New(tr("command failed: %s", msg.Message)) } else if strings.ToUpper(msg.Message) != "OK" { - return errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "OK", msg.Message) + return errors.New(tr("communication out of sync, expected '%[1]s', received '%[2]s'", "OK", msg.Message)) } disc.statusMutex.Lock() defer disc.statusMutex.Unlock() @@ -428,11 +428,11 @@ func (disc *PluggableDiscovery) List() ([]*Port, error) { return nil, err } if msg, err := disc.waitMessage(time.Second * 10); err != nil { - return nil, fmt.Errorf(tr("calling %[1]s: %[2]w"), "LIST", err) + return nil, errors.New(tr("calling %[1]s: %[2]w", "LIST", err)) } else if msg.EventType != "list" { - return nil, errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "list", msg.EventType) + return nil, errors.New(tr("communication out of sync, expected '%[1]s', received '%[2]s'", "list", msg.EventType)) } else if msg.Error { - return nil, errors.Errorf(tr("command failed: %s"), msg.Message) + return nil, errors.New(tr("command failed: %s", msg.Message)) } else { return msg.Ports, nil } @@ -454,13 +454,13 @@ func (disc *PluggableDiscovery) StartSync(size int) (<-chan *Event, error) { } if msg, err := disc.waitMessage(time.Second * 10); err != nil { - return nil, fmt.Errorf(tr("calling %[1]s: %[2]w"), "START_SYNC", err) + return nil, errors.New(tr("calling %[1]s: %[2]w", "START_SYNC", err)) } else if msg.EventType != "start_sync" { - return nil, errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "start_sync", msg.EventType) + return nil, errors.New(tr("communication out of sync, expected '%[1]s', received '%[2]s'", "start_sync", msg.EventType)) } else if msg.Error { - return nil, errors.Errorf(tr("command failed: %s"), msg.Message) + return nil, errors.New(tr("command failed: %s", msg.Message)) } else if strings.ToUpper(msg.Message) != "OK" { - return nil, errors.Errorf(tr("communication out of sync, expected '%[1]s', received '%[2]s'"), "OK", msg.Message) + return nil, errors.New(tr("communication out of sync, expected '%[1]s', received '%[2]s'", "OK", msg.Message)) } disc.state = Syncing diff --git a/internal/arduino/discovery/discoverymanager/discoverymanager.go b/internal/arduino/discovery/discoverymanager/discoverymanager.go index a52d65e5ab7..32596a39ffa 100644 --- a/internal/arduino/discovery/discoverymanager/discoverymanager.go +++ b/internal/arduino/discovery/discoverymanager/discoverymanager.go @@ -16,13 +16,13 @@ package discoverymanager import ( + "errors" "fmt" "sync" "time" "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/discovery" - "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -123,7 +123,7 @@ func (dm *DiscoveryManager) Add(d *discovery.PluggableDiscovery) error { id := d.GetID() if _, has := dm.discoveries[id]; has { - return errors.Errorf(tr("pluggable discovery already added: %s"), id) + return errors.New(tr("pluggable discovery already added: %s", id)) } dm.discoveries[id] = d diff --git a/internal/arduino/libraries/loader.go b/internal/arduino/libraries/loader.go index cb4c1c59a3b..61f71f4928f 100644 --- a/internal/arduino/libraries/loader.go +++ b/internal/arduino/libraries/loader.go @@ -16,13 +16,13 @@ package libraries import ( + "errors" "fmt" "strings" "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" - "github.com/pkg/errors" semver "go.bug.st/relaxed-semver" ) @@ -113,7 +113,7 @@ func makeNewLibrary(libraryDir *paths.Path, location LibraryLocation) (*Library, } if err := addExamples(library); err != nil { - return nil, errors.Errorf(tr("scanning examples: %s"), err) + return nil, fmt.Errorf("%s: %w", tr("scanning sketch examples"), err) } library.DirName = libraryDir.Base() library.Name = strings.TrimSpace(libProperties.Get("name")) @@ -136,7 +136,7 @@ func makeLegacyLibrary(path *paths.Path, location LibraryLocation) (*Library, er if foundHeader, err := containsHeaderFile(path); err != nil { return nil, err } else if !foundHeader { - return nil, errors.Errorf(tr("invalid library: no header files found")) + return nil, errors.New(tr("invalid library: no header files found")) } library := &Library{ InstallDir: path.Canonical(), @@ -151,7 +151,7 @@ func makeLegacyLibrary(path *paths.Path, location LibraryLocation) (*Library, er InDevelopment: path.Join(".development").Exist(), } if err := addExamples(library); err != nil { - return nil, errors.Errorf(tr("scanning examples: %s"), err) + return nil, fmt.Errorf("%s: %w", tr("scanning sketch examples"), err) } addUtilityDirectory(library) return library, nil diff --git a/internal/arduino/serialutils/serialutils.go b/internal/arduino/serialutils/serialutils.go index 7c6bac6ea98..c3d5f8521e3 100644 --- a/internal/arduino/serialutils/serialutils.go +++ b/internal/arduino/serialutils/serialutils.go @@ -22,7 +22,6 @@ import ( "time" "github.com/arduino/arduino-cli/i18n" - "github.com/pkg/errors" "go.bug.st/serial" ) @@ -35,7 +34,7 @@ func TouchSerialPortAt1200bps(port string) error { // Open port p, err := serial.Open(port, &serial.Mode{BaudRate: 1200}) if err != nil { - return errors.WithMessage(err, tr("opening port at 1200bps")) + return fmt.Errorf("%s: %w", tr("opening port at 1200bps"), err) } if runtime.GOOS != "windows" { @@ -45,7 +44,7 @@ func TouchSerialPortAt1200bps(port string) error { // Set DTR to false if err = p.SetDTR(false); err != nil { p.Close() - return errors.WithMessage(err, tr("setting DTR to OFF")) + return fmt.Errorf("%s: %w", tr("setting DTR to OFF"), err) } } @@ -64,7 +63,7 @@ func TouchSerialPortAt1200bps(port string) error { func getPortMap() (map[string]bool, error) { ports, err := serial.GetPortsList() if err != nil { - return nil, errors.WithMessage(err, tr("listing serial ports")) + return nil, fmt.Errorf("%s: %w", tr("listing serial ports"), err) } res := map[string]bool{} for _, port := range ports { @@ -138,7 +137,7 @@ func Reset(portToTouch string, wait bool, cb *ResetProgressCallbacks, dryRun boo // do nothing! } else { if err := TouchSerialPortAt1200bps(portToTouch); err != nil && !wait { - return "", errors.Errorf(tr("TOUCH: error during reset: %s", err)) + return "", fmt.Errorf("%s: %w", tr("error during board reset"), err) } } } diff --git a/internal/arduino/sketch/sketch.go b/internal/arduino/sketch/sketch.go index 28f7e972122..046f96c4623 100644 --- a/internal/arduino/sketch/sketch.go +++ b/internal/arduino/sketch/sketch.go @@ -18,6 +18,7 @@ package sketch import ( "crypto/md5" "encoding/hex" + "errors" "fmt" "sort" "strings" @@ -25,7 +26,6 @@ import ( "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/go-paths-helper" - "github.com/pkg/errors" ) // Sketch holds all the files composing a sketch @@ -65,10 +65,10 @@ func New(path *paths.Path) (*Sketch, error) { if mainFile == nil { mainFile = candidateSketchMainFile } else { - return nil, errors.Errorf(tr("multiple main sketch files found (%[1]v, %[2]v)"), + return nil, errors.New(tr("multiple main sketch files found (%[1]v, %[2]v)", mainFile, candidateSketchMainFile, - ) + )) } } } @@ -144,7 +144,7 @@ func New(path *paths.Path) (*Sketch, error) { sketch.RootFolderFiles.Add(p) } } else { - return nil, errors.Errorf(tr("unknown sketch file extension '%s'"), ext) + return nil, errors.New(tr("unknown sketch file extension '%s'", ext)) } } @@ -206,7 +206,7 @@ func (s *Sketch) GetProfile(profileName string) *Profile { func (s *Sketch) checkSketchCasing() error { files, err := s.FullPath.ReadDir() if err != nil { - return errors.Errorf(tr("reading files: %v"), err) + return fmt.Errorf("%s: %w", tr("reading files"), err) } files.FilterOutDirs() diff --git a/internal/buildcache/build_cache.go b/internal/buildcache/build_cache.go index dc690e2cbc2..e61488a4cc6 100644 --- a/internal/buildcache/build_cache.go +++ b/internal/buildcache/build_cache.go @@ -19,7 +19,6 @@ import ( "time" "github.com/arduino/go-paths-helper" - "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -108,6 +107,6 @@ func removeIfExpired(dir *paths.Path, ttl time.Duration) { logrus.Tracef(`Purging cache directory "%s". Expired by %s`, dir, lifeExpectancy.Abs()) err = dir.RemoveAll() if err != nil { - logrus.Tracef(`Error while pruning cache directory "%s": %s`, dir, errors.WithStack(err)) + logrus.Tracef(`Error while pruning cache directory "%s": %s`, dir, err) } } From 66f32e4149edd72cd04eeeecedc946355b82034a Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 7 Dec 2023 15:35:17 +0100 Subject: [PATCH 07/11] Update easyjson task and generated files --- Taskfile.yml | 4 +- .../cores/packageindex/index_easyjson.go | 132 +++++++++--------- .../libraries/librariesindex/json_easyjson.go | 36 ++--- 3 files changed, 86 insertions(+), 86 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index 0616b126024..0891c6ffa16 100755 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -130,8 +130,8 @@ tasks: desc: Run easyjson code generation cmds: - go install github.com/mailru/easyjson/...@v0.7.7 - - easyjson arduino/cores/packageindex/index.go - - easyjson arduino/libraries/librariesindex/json.go + - easyjson internal/arduino/cores/packageindex/index.go + - easyjson internal/arduino/libraries/librariesindex/json.go go:add-license-headers: desc: Add missing go license headers diff --git a/internal/arduino/cores/packageindex/index_easyjson.go b/internal/arduino/cores/packageindex/index_easyjson.go index 7f47a9b62e2..e151cf9ede7 100644 --- a/internal/arduino/cores/packageindex/index_easyjson.go +++ b/internal/arduino/cores/packageindex/index_easyjson.go @@ -19,7 +19,7 @@ var ( _ easyjson.Marshaler ) -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex(in *jlexer.Lexer, out *indexToolReleaseFlavour) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex(in *jlexer.Lexer, out *indexToolReleaseFlavour) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -71,7 +71,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex(in in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex(out *jwriter.Writer, in indexToolReleaseFlavour) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex(out *jwriter.Writer, in indexToolReleaseFlavour) { out.RawByte('{') first := true _ = first @@ -106,27 +106,27 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex(ou // MarshalJSON supports json.Marshaler interface func (v indexToolReleaseFlavour) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexToolReleaseFlavour) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexToolReleaseFlavour) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexToolReleaseFlavour) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex(l, v) } -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex1(in *jlexer.Lexer, out *indexToolRelease) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex1(in *jlexer.Lexer, out *indexToolRelease) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -232,7 +232,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex1(i in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex1(out *jwriter.Writer, in indexToolRelease) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex1(out *jwriter.Writer, in indexToolRelease) { out.RawByte('{') first := true _ = first @@ -272,27 +272,27 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex1(o // MarshalJSON supports json.Marshaler interface func (v indexToolRelease) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex1(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex1(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexToolRelease) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex1(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex1(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexToolRelease) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex1(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex1(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexToolRelease) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex1(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex1(l, v) } -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex2(in *jlexer.Lexer, out *indexToolDependency) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex2(in *jlexer.Lexer, out *indexToolDependency) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -356,7 +356,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex2(i in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex2(out *jwriter.Writer, in indexToolDependency) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex2(out *jwriter.Writer, in indexToolDependency) { out.RawByte('{') first := true _ = first @@ -385,27 +385,27 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex2(o // MarshalJSON supports json.Marshaler interface func (v indexToolDependency) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex2(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex2(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexToolDependency) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex2(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex2(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexToolDependency) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex2(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex2(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexToolDependency) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex2(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex2(l, v) } -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex3(in *jlexer.Lexer, out *indexPlatformRelease) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex3(in *jlexer.Lexer, out *indexPlatformRelease) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -681,7 +681,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex3(i in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex3(out *jwriter.Writer, in indexPlatformRelease) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex3(out *jwriter.Writer, in indexPlatformRelease) { out.RawByte('{') first := true _ = first @@ -809,27 +809,27 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex3(o // MarshalJSON supports json.Marshaler interface func (v indexPlatformRelease) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex3(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex3(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexPlatformRelease) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex3(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex3(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexPlatformRelease) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex3(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex3(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexPlatformRelease) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex3(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex3(l, v) } -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex4(in *jlexer.Lexer, out *indexPackage) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex4(in *jlexer.Lexer, out *indexPackage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1009,7 +1009,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex4(i in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex4(out *jwriter.Writer, in indexPackage) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex4(out *jwriter.Writer, in indexPackage) { out.RawByte('{') first := true _ = first @@ -1089,27 +1089,27 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex4(o // MarshalJSON supports json.Marshaler interface func (v indexPackage) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex4(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex4(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexPackage) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex4(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex4(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexPackage) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex4(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex4(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexPackage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex4(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex4(l, v) } -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex5(in *jlexer.Lexer, out *indexMonitorDependency) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex5(in *jlexer.Lexer, out *indexMonitorDependency) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1149,7 +1149,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex5(i in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex5(out *jwriter.Writer, in indexMonitorDependency) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex5(out *jwriter.Writer, in indexMonitorDependency) { out.RawByte('{') first := true _ = first @@ -1169,27 +1169,27 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex5(o // MarshalJSON supports json.Marshaler interface func (v indexMonitorDependency) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex5(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex5(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexMonitorDependency) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex5(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex5(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexMonitorDependency) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex5(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex5(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexMonitorDependency) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex5(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex5(l, v) } -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex6(in *jlexer.Lexer, out *indexHelp) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex6(in *jlexer.Lexer, out *indexHelp) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1225,7 +1225,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex6(i in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex6(out *jwriter.Writer, in indexHelp) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex6(out *jwriter.Writer, in indexHelp) { out.RawByte('{') first := true _ = first @@ -1241,27 +1241,27 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex6(o // MarshalJSON supports json.Marshaler interface func (v indexHelp) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex6(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex6(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexHelp) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex6(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex6(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexHelp) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex6(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex6(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexHelp) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex6(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex6(l, v) } -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex7(in *jlexer.Lexer, out *indexDiscoveryDependency) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex7(in *jlexer.Lexer, out *indexDiscoveryDependency) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1301,7 +1301,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex7(i in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex7(out *jwriter.Writer, in indexDiscoveryDependency) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex7(out *jwriter.Writer, in indexDiscoveryDependency) { out.RawByte('{') first := true _ = first @@ -1321,27 +1321,27 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex7(o // MarshalJSON supports json.Marshaler interface func (v indexDiscoveryDependency) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex7(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex7(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexDiscoveryDependency) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex7(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex7(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexDiscoveryDependency) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex7(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex7(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexDiscoveryDependency) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex7(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex7(l, v) } -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex8(in *jlexer.Lexer, out *indexBoardID) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex8(in *jlexer.Lexer, out *indexBoardID) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1377,7 +1377,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex8(i in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex8(out *jwriter.Writer, in indexBoardID) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex8(out *jwriter.Writer, in indexBoardID) { out.RawByte('{') first := true _ = first @@ -1392,27 +1392,27 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex8(o // MarshalJSON supports json.Marshaler interface func (v indexBoardID) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex8(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex8(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexBoardID) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex8(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex8(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexBoardID) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex8(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex8(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexBoardID) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex8(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex8(l, v) } -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex9(in *jlexer.Lexer, out *indexBoard) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex9(in *jlexer.Lexer, out *indexBoard) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1494,7 +1494,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex9(i in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex9(out *jwriter.Writer, in indexBoard) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex9(out *jwriter.Writer, in indexBoard) { out.RawByte('{') first := true _ = first @@ -1523,27 +1523,27 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex9(o // MarshalJSON supports json.Marshaler interface func (v indexBoard) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex9(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex9(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexBoard) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex9(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex9(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexBoard) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex9(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex9(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexBoard) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex9(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex9(l, v) } -func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex10(in *jlexer.Lexer, out *Index) { +func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex10(in *jlexer.Lexer, out *Index) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1641,7 +1641,7 @@ func easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex10( in.Consumed() } } -func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex10(out *jwriter.Writer, in Index) { +func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex10(out *jwriter.Writer, in Index) { out.RawByte('{') first := true _ = first @@ -1676,23 +1676,23 @@ func easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex10( // MarshalJSON supports json.Marshaler interface func (v Index) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex10(&w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex10(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v Index) MarshalEasyJSON(w *jwriter.Writer) { - easyjsonE2a549a6EncodeGithubComArduinoArduinoCliArduinoCoresPackageindex10(w, v) + easyjsonE2a549a6EncodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex10(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *Index) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex10(&r, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex10(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *Index) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjsonE2a549a6DecodeGithubComArduinoArduinoCliArduinoCoresPackageindex10(l, v) + easyjsonE2a549a6DecodeGithubComArduinoArduinoCliInternalArduinoCoresPackageindex10(l, v) } diff --git a/internal/arduino/libraries/librariesindex/json_easyjson.go b/internal/arduino/libraries/librariesindex/json_easyjson.go index 197c24412fa..5af24fa5fdd 100644 --- a/internal/arduino/libraries/librariesindex/json_easyjson.go +++ b/internal/arduino/libraries/librariesindex/json_easyjson.go @@ -19,7 +19,7 @@ var ( _ easyjson.Marshaler ) -func easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex(in *jlexer.Lexer, out *indexRelease) { +func easyjson42239ddeDecodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex(in *jlexer.Lexer, out *indexRelease) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -323,7 +323,7 @@ func easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesin in.Consumed() } } -func easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex(out *jwriter.Writer, in indexRelease) { +func easyjson42239ddeEncodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex(out *jwriter.Writer, in indexRelease) { out.RawByte('{') first := true _ = first @@ -468,27 +468,27 @@ func easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesin // MarshalJSON supports json.Marshaler interface func (v indexRelease) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex(&w, v) + easyjson42239ddeEncodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexRelease) MarshalEasyJSON(w *jwriter.Writer) { - easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex(w, v) + easyjson42239ddeEncodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexRelease) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex(&r, v) + easyjson42239ddeDecodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexRelease) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex(l, v) + easyjson42239ddeDecodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex(l, v) } -func easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex1(in *jlexer.Lexer, out *indexJSON) { +func easyjson42239ddeDecodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex1(in *jlexer.Lexer, out *indexJSON) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -566,7 +566,7 @@ func easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesin in.Consumed() } } -func easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex1(out *jwriter.Writer, in indexJSON) { +func easyjson42239ddeEncodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex1(out *jwriter.Writer, in indexJSON) { out.RawByte('{') first := true _ = first @@ -592,27 +592,27 @@ func easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesin // MarshalJSON supports json.Marshaler interface func (v indexJSON) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex1(&w, v) + easyjson42239ddeEncodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex1(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexJSON) MarshalEasyJSON(w *jwriter.Writer) { - easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex1(w, v) + easyjson42239ddeEncodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex1(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexJSON) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex1(&r, v) + easyjson42239ddeDecodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex1(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexJSON) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex1(l, v) + easyjson42239ddeDecodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex1(l, v) } -func easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex2(in *jlexer.Lexer, out *indexDependency) { +func easyjson42239ddeDecodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex2(in *jlexer.Lexer, out *indexDependency) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -652,7 +652,7 @@ func easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesin in.Consumed() } } -func easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex2(out *jwriter.Writer, in indexDependency) { +func easyjson42239ddeEncodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex2(out *jwriter.Writer, in indexDependency) { out.RawByte('{') first := true _ = first @@ -672,23 +672,23 @@ func easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesin // MarshalJSON supports json.Marshaler interface func (v indexDependency) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex2(&w, v) + easyjson42239ddeEncodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex2(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v indexDependency) MarshalEasyJSON(w *jwriter.Writer) { - easyjson42239ddeEncodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex2(w, v) + easyjson42239ddeEncodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex2(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *indexDependency) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex2(&r, v) + easyjson42239ddeDecodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex2(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *indexDependency) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson42239ddeDecodeGithubComArduinoArduinoCliArduinoLibrariesLibrariesindex2(l, v) + easyjson42239ddeDecodeGithubComArduinoArduinoCliInternalArduinoLibrariesLibrariesindex2(l, v) } From fa8740805464bc94d5973ff53a018529a9ff4d15 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 7 Dec 2023 16:09:47 +0100 Subject: [PATCH 08/11] Move the terminal detection subroutines in feedback package This also fix the linter errors: internal/cli/configuration/term.go:25:39: use of `os.Stdin` forbidden because "in cli package use `feedback.*` instead" (forbidigo) var IsInteractive = isatty.IsTerminal(os.Stdin.Fd()) || isatty.IsCygwinTerminal(os.Stdin.Fd()) ^ internal/cli/configuration/term.go:28:36: use of `os.Stdout` forbidden because "in cli package use `feedback.*` instead" (forbidigo) var HasConsole = isatty.IsTerminal(os.Stdout.Fd()) || isatty.IsCygwinTerminal(os.Stdout.Fd()) --- internal/cli/arguments/pre_post_script.go | 6 ++--- internal/cli/configuration/term.go | 28 ----------------------- internal/cli/feedback/terminal.go | 24 +++++++++++++++---- internal/cli/monitor/monitor.go | 5 ++-- internal/cli/updater/updater.go | 10 +------- 5 files changed, 25 insertions(+), 48 deletions(-) delete mode 100644 internal/cli/configuration/term.go diff --git a/internal/cli/arguments/pre_post_script.go b/internal/cli/arguments/pre_post_script.go index eb36dd64be8..ec96711dfa4 100644 --- a/internal/cli/arguments/pre_post_script.go +++ b/internal/cli/arguments/pre_post_script.go @@ -16,7 +16,7 @@ package arguments import ( - "github.com/arduino/arduino-cli/internal/cli/configuration" + "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) @@ -71,7 +71,7 @@ func (p *PrePostScriptsFlags) DetectSkipPostInstallValue() bool { return true } - if !configuration.IsInteractive { + if !feedback.IsInteractive() { logrus.Info("Not running from console, will skip post-install by default") return true } @@ -90,7 +90,7 @@ func (p *PrePostScriptsFlags) DetectSkipPreUninstallValue() bool { return true } - if !configuration.IsInteractive { + if !feedback.IsInteractive() { logrus.Info("Not running from console, will skip pre-uninstall by default") return true } diff --git a/internal/cli/configuration/term.go b/internal/cli/configuration/term.go deleted file mode 100644 index 5d83f50e7fa..00000000000 --- a/internal/cli/configuration/term.go +++ /dev/null @@ -1,28 +0,0 @@ -// 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 configuration - -import ( - "os" - - "github.com/mattn/go-isatty" -) - -// IsInteractive is set to true if the CLI is interactive (it can receive inputs from terminal/console) -var IsInteractive = isatty.IsTerminal(os.Stdin.Fd()) || isatty.IsCygwinTerminal(os.Stdin.Fd()) - -// HasConsole is set to true if the CLI outputs to a terminal/console -var HasConsole = isatty.IsTerminal(os.Stdout.Fd()) || isatty.IsCygwinTerminal(os.Stdout.Fd()) diff --git a/internal/cli/feedback/terminal.go b/internal/cli/feedback/terminal.go index 09dc0212f4a..9b60b80cc11 100644 --- a/internal/cli/feedback/terminal.go +++ b/internal/cli/feedback/terminal.go @@ -22,6 +22,7 @@ import ( "io" "os" + "github.com/mattn/go-isatty" "golang.org/x/term" ) @@ -46,7 +47,7 @@ func SetRawModeStdin() error { if oldStateStdin != nil { panic("terminal already in RAW mode") } - if !IsTerminal() { + if !IsInteractive() { return errors.New(tr("not running in a terminal")) } old, err := term.MakeRaw(int(os.Stdin.Fd())) @@ -68,9 +69,22 @@ func RestoreModeStdin() { oldStateStdin = nil } -// IsTerminal returns true if there is an interactive terminal -func IsTerminal() bool { - return term.IsTerminal(int(os.Stdin.Fd())) +// IsInteractive returns true if the CLI is interactive (it can receive inputs from terminal/console) +func IsInteractive() bool { + return isatty.IsTerminal(os.Stdin.Fd()) || isatty.IsCygwinTerminal(os.Stdin.Fd()) +} + +// HasConsole returns true if the CLI outputs to a terminal/console +func HasConsole() bool { + return isatty.IsTerminal(os.Stdout.Fd()) || isatty.IsCygwinTerminal(os.Stdout.Fd()) +} + +// IsCI returns true if running on CI environments. +// (based on https://github.com/watson/ci-info/blob/HEAD/index.js) +func IsCI() bool { + return os.Getenv("CI") != "" || // GitHub Actions, Travis CI, CircleCI, Cirrus CI, GitLab CI, AppVeyor, CodeShip, dsari + os.Getenv("BUILD_NUMBER") != "" || // Jenkins, TeamCity + os.Getenv("RUN_ID") != "" // TaskCluster, dsari } // InputUserField prompts the user to input the provided user field. @@ -78,7 +92,7 @@ func InputUserField(prompt string, secret bool) (string, error) { if format != Text { return "", errors.New(tr("user input not supported for the '%s' output format", format)) } - if !IsTerminal() { + if !IsInteractive() { return "", errors.New(tr("user input not supported in non interactive mode")) } diff --git a/internal/cli/monitor/monitor.go b/internal/cli/monitor/monitor.go index 6381d773983..44dca503715 100644 --- a/internal/cli/monitor/monitor.go +++ b/internal/cli/monitor/monitor.go @@ -30,7 +30,6 @@ import ( sk "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/arguments" - "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" "github.com/arduino/arduino-cli/internal/cli/feedback/table" @@ -88,7 +87,7 @@ func runMonitorCmd( ) { logrus.Info("Executing `arduino-cli monitor`") - if !configuration.HasConsole { + if !feedback.HasConsole() { quiet = true } @@ -230,7 +229,7 @@ func runMonitorCmd( ctx, cancel := cleanup.InterruptableContext(context.Background()) if raw { - if feedback.IsTerminal() { + if feedback.IsInteractive() { if err := feedback.SetRawModeStdin(); err != nil { feedback.Warning(tr("Error setting raw mode: %s", err.Error())) } diff --git a/internal/cli/updater/updater.go b/internal/cli/updater/updater.go index bbedb1a2378..8b8a54a0f85 100644 --- a/internal/cli/updater/updater.go +++ b/internal/cli/updater/updater.go @@ -17,7 +17,6 @@ package updater import ( "fmt" - "os" "strings" "time" @@ -94,14 +93,7 @@ func shouldCheckForUpdate(currentVersion *semver.Version) bool { } // Don't check when running on CI or on non interactive consoles - return !isCI() && configuration.IsInteractive && configuration.HasConsole -} - -// based on https://github.com/watson/ci-info/blob/HEAD/index.js -func isCI() bool { - return os.Getenv("CI") != "" || // GitHub Actions, Travis CI, CircleCI, Cirrus CI, GitLab CI, AppVeyor, CodeShip, dsari - os.Getenv("BUILD_NUMBER") != "" || // Jenkins, TeamCity - os.Getenv("RUN_ID") != "" // TaskCluster, dsari + return !feedback.IsCI() && feedback.IsInteractive() && feedback.HasConsole() } // getLatestRelease queries the official Arduino download server for the latest release, From 2a8bf6fe6107ea45c3bb321d189255a5a3cf64e4 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 7 Dec 2023 16:11:44 +0100 Subject: [PATCH 09/11] Fix linter warning --- internal/cli/arguments/sketch.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/cli/arguments/sketch.go b/internal/cli/arguments/sketch.go index 9b43173e7db..32eb0cae478 100644 --- a/internal/cli/arguments/sketch.go +++ b/internal/cli/arguments/sketch.go @@ -19,7 +19,6 @@ import ( "context" "github.com/arduino/arduino-cli/commands/sketch" - sk "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/internal/cli/feedback" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" @@ -41,7 +40,7 @@ func InitSketchPath(path string, printWarnings bool) (sketchPath *paths.Path) { sketchPath = wd } if printWarnings { - if msg := sk.WarnDeprecatedFiles(sketchPath); msg != "" { + if msg := sketch.WarnDeprecatedFiles(sketchPath); msg != "" { feedback.Warning(msg) } } From 42404aa6231f732c87e2e7c94dd4413f12cb894f Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 7 Dec 2023 16:16:58 +0100 Subject: [PATCH 10/11] Fixed docs:include-configuration-json-schema task --- DistTasks.yml | 2 +- Taskfile.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DistTasks.yml b/DistTasks.yml index 2231c439dc7..7aaaff47a26 100644 --- a/DistTasks.yml +++ b/DistTasks.yml @@ -258,4 +258,4 @@ tasks: desc: Copy the JSON schema to dist folder cmds: - mkdir --parents {{.DIST_DIR}} - - cp ./configuration/configuration.schema.json {{.DIST_DIR}}/{{.PROJECT_NAME}}_{{.VERSION}}_configuration.schema.json + - cp ./internal/cli/configuration/configuration.schema.json {{.DIST_DIR}}/{{.PROJECT_NAME}}_{{.VERSION}}_configuration.schema.json diff --git a/Taskfile.yml b/Taskfile.yml index 0891c6ffa16..0c80f449e21 100755 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -246,7 +246,7 @@ tasks: docs:include-configuration-json-schema: desc: Copy configuration JSON schema to make it available in documentation cmds: - - cp ./configuration/configuration.schema.json ./docs/configuration.schema.json + - cp ./internal/cli/configuration/configuration.schema.json ./docs/configuration.schema.json protoc:check: desc: Perform linting of the protobuf definitions From 072ee89dc519c6f8dcf4d223481bbd091503211d Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 7 Dec 2023 16:23:10 +0100 Subject: [PATCH 11/11] Fixed build test for discovery_client --- .github/workflows/check-go-task.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-go-task.yml b/.github/workflows/check-go-task.yml index 69af9533201..9e544fdead9 100644 --- a/.github/workflows/check-go-task.yml +++ b/.github/workflows/check-go-task.yml @@ -235,7 +235,7 @@ jobs: matrix: module: - - path: arduino/discovery/discovery_client + - path: internal/arduino/discovery/discovery_client - path: client_example - path: commands/daemon/term_example