Skip to content

Commit 0e21e6f

Browse files
authored
[breaking] refactor: made some golang modules private (part 3) (#2467)
* Internalized 'i18n' module * Internalized 'docsgen' package * Internalized 'client_example' * Updated docs
1 parent b9476de commit 0e21e6f

File tree

121 files changed

+85
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+85
-82
lines changed

Diff for: .github/workflows/check-go-task.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ jobs:
236236
matrix:
237237
module:
238238
- path: internal/arduino/discovery/discovery_client
239-
- path: client_example
239+
- path: rpc/internal/client_example
240240
- path: commands/daemon/term_example
241241

242242
steps:

Diff for: .github/workflows/deploy-cobra-mkdocs-versioned-poetry.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
- "go.sum"
2222
- "Taskfile.ya?ml"
2323
- "**.go"
24-
- "docsgen/**"
24+
- "internal/docsgen/**"
2525
- "rpc/**"
2626
- "mkdocs.ya?ml"
2727
- "poetry.lock"

Diff for: .gitignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ __debug_bin*
1818
.vscode
1919

2020
# gRPC client example folder
21-
/client_example/client_example
22-
/client_example/**/*.bin
23-
/client_example/**/*.elf
21+
/rpc/internal/client_example/client_example
22+
/rpc/internal/client_example/**/*.bin
23+
/rpc/internal/client_example/**/*.elf
2424

2525
# Misc.
2626
.DS_Store
2727

2828
# Mkdocs
2929
/site/
3030
/public/
31-
/docsgen/arduino-cli
32-
/docsgen/arduino-cli.exe
31+
/internal/docsgen/arduino-cli
32+
/internal/docsgen/arduino-cli.exe
3333
/docs/rpc/*.md
3434
/docs/commands/*.md
3535
/docs/configuration.schema.json

Diff for: Taskfile.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ tasks:
5353
# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/deploy-cobra-mkdocs-versioned-poetry/Taskfile.yml
5454
go:cli-docs:
5555
desc: Generate command line interface reference documentation
56-
dir: ./docsgen
56+
dir: ./internal/docsgen
5757
cmds:
5858
# Command examples use os.Args[0] so the docs generation binary must have the same filename as the project
5959
- go build -o {{.PROJECT_NAME}}{{exeExt}}
6060
# The binary is invoked like this instead of `./{{.PROJECT_NAME}}` to remove the `./` chars from the examples
61-
- PATH=. {{.PROJECT_NAME}} ../docs/commands
61+
- PATH=. {{.PROJECT_NAME}} ../../docs/commands
6262

6363
# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/check-go-task/Taskfile.yml
6464
go:fix:
@@ -301,24 +301,24 @@ tasks:
301301
i18n:update:
302302
desc: Updates i18n files
303303
cmds:
304-
- go run ./i18n/cmd/main.go catalog generate . > ./i18n/data/en.po
304+
- go run ./internal/i18n/cmd/main.go catalog generate . > ./internal/i18n/data/en.po
305305

306306
i18n:pull:
307307
desc: Pull i18n files from transifex
308308
cmds:
309-
- go run ./i18n/cmd/main.go transifex pull ./i18n/data
309+
- go run ./internal/i18n/cmd/main.go transifex pull ./internal/i18n/data
310310

311311
i18n:push:
312312
desc: Push i18n files to transifex
313313
cmds:
314-
- go run ./i18n/cmd/main.go transifex push ./i18n/data
314+
- go run ./internal/i18n/cmd/main.go transifex push ./internal/i18n/data
315315

316316
i18n:check:
317317
desc: Check if the i18n message catalog was updated
318318
cmds:
319319
- task: i18n:pull
320-
- git add -N ./i18n/data
321-
- git diff --exit-code ./i18n/data
320+
- git add -N ./internal/i18n/data
321+
- git diff --exit-code ./internal/i18n/data
322322

323323
# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/check-mkdocs-task/Taskfile.yml
324324
website:check:

Diff for: commands/board/board.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515

1616
package board
1717

18-
import "github.com/arduino/arduino-cli/i18n"
18+
import "github.com/arduino/arduino-cli/internal/i18n"
1919

2020
var tr = i18n.Tr

Diff for: commands/cmderrors/cmderrors.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020
"strings"
2121

22-
"github.com/arduino/arduino-cli/i18n"
22+
"github.com/arduino/arduino-cli/internal/i18n"
2323
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2424
"github.com/arduino/go-paths-helper"
2525
"google.golang.org/grpc/codes"

Diff for: commands/compile/compile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import (
2525

2626
"github.com/arduino/arduino-cli/commands/cmderrors"
2727
"github.com/arduino/arduino-cli/commands/internal/instances"
28-
"github.com/arduino/arduino-cli/i18n"
2928
"github.com/arduino/arduino-cli/internal/arduino/builder"
3029
"github.com/arduino/arduino-cli/internal/arduino/cores"
3130
"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager"
3231
"github.com/arduino/arduino-cli/internal/arduino/sketch"
3332
"github.com/arduino/arduino-cli/internal/arduino/utils"
3433
"github.com/arduino/arduino-cli/internal/buildcache"
3534
"github.com/arduino/arduino-cli/internal/cli/configuration"
35+
"github.com/arduino/arduino-cli/internal/i18n"
3636
"github.com/arduino/arduino-cli/internal/inventory"
3737
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
3838
paths "github.com/arduino/go-paths-helper"

Diff for: commands/core/download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"github.com/arduino/arduino-cli/commands"
2222
"github.com/arduino/arduino-cli/commands/cmderrors"
2323
"github.com/arduino/arduino-cli/commands/internal/instances"
24-
"github.com/arduino/arduino-cli/i18n"
2524
"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
25+
"github.com/arduino/arduino-cli/internal/i18n"
2626
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2727
)
2828

Diff for: commands/daemon/daemon.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/arduino/arduino-cli/commands/monitor"
3131
"github.com/arduino/arduino-cli/commands/sketch"
3232
"github.com/arduino/arduino-cli/commands/upload"
33-
"github.com/arduino/arduino-cli/i18n"
33+
"github.com/arduino/arduino-cli/internal/i18n"
3434
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
3535
"github.com/sirupsen/logrus"
3636
"google.golang.org/grpc/metadata"

Diff for: commands/debug/debug.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626

2727
"github.com/arduino/arduino-cli/commands/cmderrors"
2828
"github.com/arduino/arduino-cli/commands/internal/instances"
29-
"github.com/arduino/arduino-cli/i18n"
3029
"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
30+
"github.com/arduino/arduino-cli/internal/i18n"
3131
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
3232
"github.com/arduino/go-paths-helper"
3333
"github.com/sirupsen/logrus"

Diff for: commands/instances.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424

2525
"github.com/arduino/arduino-cli/commands/cmderrors"
2626
"github.com/arduino/arduino-cli/commands/internal/instances"
27-
"github.com/arduino/arduino-cli/i18n"
2827
"github.com/arduino/arduino-cli/internal/arduino/cores"
2928
"github.com/arduino/arduino-cli/internal/arduino/cores/packageindex"
3029
"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
@@ -36,6 +35,7 @@ import (
3635
"github.com/arduino/arduino-cli/internal/arduino/sketch"
3736
"github.com/arduino/arduino-cli/internal/arduino/utils"
3837
"github.com/arduino/arduino-cli/internal/cli/configuration"
38+
"github.com/arduino/arduino-cli/internal/i18n"
3939
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
4040
paths "github.com/arduino/go-paths-helper"
4141
"github.com/sirupsen/logrus"

Diff for: commands/lib/download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020

2121
"github.com/arduino/arduino-cli/commands/cmderrors"
2222
"github.com/arduino/arduino-cli/commands/internal/instances"
23-
"github.com/arduino/arduino-cli/i18n"
2423
"github.com/arduino/arduino-cli/internal/arduino/httpclient"
2524
"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex"
2625
"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager"
26+
"github.com/arduino/arduino-cli/internal/i18n"
2727
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2828
"github.com/sirupsen/logrus"
2929
)

Diff for: commands/monitor/monitor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222

2323
"github.com/arduino/arduino-cli/commands/cmderrors"
2424
"github.com/arduino/arduino-cli/commands/internal/instances"
25-
"github.com/arduino/arduino-cli/i18n"
2625
"github.com/arduino/arduino-cli/internal/arduino/cores"
2726
"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
2827
pluggableMonitor "github.com/arduino/arduino-cli/internal/arduino/monitor"
28+
"github.com/arduino/arduino-cli/internal/i18n"
2929
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
3030
"github.com/arduino/go-properties-orderedmap"
3131
"github.com/sirupsen/logrus"

Diff for: commands/sketch/archive.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"strings"
2424

2525
"github.com/arduino/arduino-cli/commands/cmderrors"
26-
"github.com/arduino/arduino-cli/i18n"
2726
"github.com/arduino/arduino-cli/internal/arduino/sketch"
27+
"github.com/arduino/arduino-cli/internal/i18n"
2828
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2929
paths "github.com/arduino/go-paths-helper"
3030
)

Diff for: commands/upload/upload.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ import (
2626

2727
"github.com/arduino/arduino-cli/commands/cmderrors"
2828
"github.com/arduino/arduino-cli/commands/internal/instances"
29-
"github.com/arduino/arduino-cli/i18n"
3029
f "github.com/arduino/arduino-cli/internal/algorithms"
3130
"github.com/arduino/arduino-cli/internal/arduino/cores"
3231
"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
3332
"github.com/arduino/arduino-cli/internal/arduino/discovery"
3433
"github.com/arduino/arduino-cli/internal/arduino/globals"
3534
"github.com/arduino/arduino-cli/internal/arduino/serialutils"
3635
"github.com/arduino/arduino-cli/internal/arduino/sketch"
36+
"github.com/arduino/arduino-cli/internal/i18n"
3737
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
3838
paths "github.com/arduino/go-paths-helper"
3939
properties "github.com/arduino/go-properties-orderedmap"

Diff for: docs/UPGRADING.md

+3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ The following golang modules are no longer available as public API:
1010

1111
- `github.com/arduino/arduino-cli/arduino`
1212
- `github.com/arduino/arduino-cli/buildcache`
13+
- `github.com/arduino/arduino-cli/client_example`
1314
- `github.com/arduino/arduino-cli/configuration`
15+
- `github.com/arduino/arduino-cli/docsgen`
1416
- `github.com/arduino/arduino-cli/executils`
17+
- `github.com/arduino/arduino-cli/i18n`
1518
- `github.com/arduino/arduino-cli/table`
1619

1720
Most of the `executils` library has been integrated inside the `go-paths` library `github.com/arduino/go-paths-helper`.

Diff for: docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,6 @@ metrics:
349349
```
350350

351351
[configuration documentation]: configuration.md
352-
[client_example]: https://github.com/arduino/arduino-cli/blob/master/client_example
352+
[client_example]: https://github.com/arduino/arduino-cli/blob/master/rpc/internal/client_example
353353
[grpc reference]: rpc/commands.md
354354
[prometheus]: https://prometheus.io/

Diff for: docs/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ services and messages are detailed in the [gRPC reference] pages.
1919

2020
[installation]: installation.md
2121
[getting started guide]: getting-started.md
22-
[client_example]: https://github.com/arduino/arduino-cli/blob/master/client_example
22+
[client_example]: https://github.com/arduino/arduino-cli/blob/master/rpc/internal/client_example
2323
[grpc reference]: rpc/commands.md

Diff for: docs/integration-options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ tracker] if you’ve got a use case that doesn’t fit one of the three pillars.
102102
[grpc interface reference]: rpc/commands.md
103103
[grpc supported languages]: https://grpc.io/docs/languages/
104104
[arduino cli repository]: https://github.com/arduino/arduino-cli
105-
[grpc client example]: https://github.com/arduino/arduino-cli/blob/master/client_example
105+
[grpc client example]: https://github.com/arduino/arduino-cli/blob/master/rpc/internal/client_example
106106
[commands package]: https://github.com/arduino/arduino-cli/tree/master/commands
107107
[issue tracker]: https://github.com/arduino/arduino-cli/issues
108108
[contextual help screenshot]: img/CLI_contextual_help_screenshot.png

Diff for: internal/arduino/builder/internal/compilation/database.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"os"
2222

23-
"github.com/arduino/arduino-cli/i18n"
23+
"github.com/arduino/arduino-cli/internal/i18n"
2424
"github.com/arduino/go-paths-helper"
2525
)
2626

Diff for: internal/arduino/builder/internal/detector/detector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"strings"
2727
"time"
2828

29-
"github.com/arduino/arduino-cli/i18n"
3029
"github.com/arduino/arduino-cli/internal/arduino/builder/internal/logger"
3130
"github.com/arduino/arduino-cli/internal/arduino/builder/internal/preprocessor"
3231
"github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils"
@@ -36,6 +35,7 @@ import (
3635
"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager"
3736
"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesresolver"
3837
"github.com/arduino/arduino-cli/internal/arduino/sketch"
38+
"github.com/arduino/arduino-cli/internal/i18n"
3939
"github.com/arduino/go-paths-helper"
4040
"github.com/arduino/go-properties-orderedmap"
4141
)

Diff for: internal/arduino/builder/internal/preprocessor/ctags.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"strconv"
2626
"strings"
2727

28-
"github.com/arduino/arduino-cli/i18n"
2928
"github.com/arduino/arduino-cli/internal/arduino/builder/cpp"
3029
"github.com/arduino/arduino-cli/internal/arduino/builder/internal/preprocessor/internal/ctags"
3130
"github.com/arduino/arduino-cli/internal/arduino/sketch"
31+
"github.com/arduino/arduino-cli/internal/i18n"
3232
"github.com/arduino/go-paths-helper"
3333
"github.com/arduino/go-properties-orderedmap"
3434
)

Diff for: internal/arduino/builder/sketch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"strconv"
2525
"strings"
2626

27-
"github.com/arduino/arduino-cli/i18n"
2827
f "github.com/arduino/arduino-cli/internal/algorithms"
2928
"github.com/arduino/arduino-cli/internal/arduino/builder/cpp"
29+
"github.com/arduino/arduino-cli/internal/i18n"
3030
"github.com/arduino/go-paths-helper"
3131
"github.com/marcinbor85/gohex"
3232
)

Diff for: internal/arduino/cores/cores.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"sort"
2626
"strings"
2727

28-
"github.com/arduino/arduino-cli/i18n"
2928
"github.com/arduino/arduino-cli/internal/arduino/globals"
3029
"github.com/arduino/arduino-cli/internal/arduino/resources"
3130
"github.com/arduino/arduino-cli/internal/arduino/utils"
31+
"github.com/arduino/arduino-cli/internal/i18n"
3232
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
3333
paths "github.com/arduino/go-paths-helper"
3434
properties "github.com/arduino/go-properties-orderedmap"

Diff for: internal/arduino/cores/packageindex/index.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"encoding/json"
2020
"fmt"
2121

22-
"github.com/arduino/arduino-cli/i18n"
2322
"github.com/arduino/arduino-cli/internal/arduino/cores"
2423
"github.com/arduino/arduino-cli/internal/arduino/resources"
2524
"github.com/arduino/arduino-cli/internal/arduino/security"
25+
"github.com/arduino/arduino-cli/internal/i18n"
2626
"github.com/arduino/go-paths-helper"
2727
easyjson "github.com/mailru/easyjson"
2828
"github.com/sirupsen/logrus"

Diff for: internal/arduino/cores/packagemanager/package_manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828
"time"
2929

3030
"github.com/arduino/arduino-cli/commands/cmderrors"
31-
"github.com/arduino/arduino-cli/i18n"
3231
"github.com/arduino/arduino-cli/internal/arduino/cores"
3332
"github.com/arduino/arduino-cli/internal/arduino/cores/packageindex"
3433
"github.com/arduino/arduino-cli/internal/arduino/discovery/discoverymanager"
3534
"github.com/arduino/arduino-cli/internal/arduino/sketch"
35+
"github.com/arduino/arduino-cli/internal/i18n"
3636
paths "github.com/arduino/go-paths-helper"
3737
properties "github.com/arduino/go-properties-orderedmap"
3838
"github.com/arduino/go-timeutils"

Diff for: internal/arduino/discovery/discovery.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"sync"
2525
"time"
2626

27-
"github.com/arduino/arduino-cli/i18n"
27+
"github.com/arduino/arduino-cli/internal/i18n"
2828
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2929
"github.com/arduino/arduino-cli/version"
3030
"github.com/arduino/go-paths-helper"

Diff for: internal/arduino/discovery/discoverymanager/discoverymanager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"sync"
2222
"time"
2323

24-
"github.com/arduino/arduino-cli/i18n"
2524
"github.com/arduino/arduino-cli/internal/arduino/discovery"
25+
"github.com/arduino/arduino-cli/internal/i18n"
2626
"github.com/sirupsen/logrus"
2727
)
2828

Diff for: internal/arduino/httpclient/httpclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"time"
2222

2323
"github.com/arduino/arduino-cli/commands/cmderrors"
24-
"github.com/arduino/arduino-cli/i18n"
2524
"github.com/arduino/arduino-cli/internal/cli/configuration"
25+
"github.com/arduino/arduino-cli/internal/i18n"
2626
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2727
"github.com/arduino/go-paths-helper"
2828
"github.com/sirupsen/logrus"

Diff for: internal/arduino/libraries/libraries.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ package libraries
1818
import (
1919
"fmt"
2020

21-
"github.com/arduino/arduino-cli/i18n"
2221
"github.com/arduino/arduino-cli/internal/arduino/cores"
2322
"github.com/arduino/arduino-cli/internal/arduino/globals"
23+
"github.com/arduino/arduino-cli/internal/i18n"
2424
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2525
paths "github.com/arduino/go-paths-helper"
2626
properties "github.com/arduino/go-properties-orderedmap"

Diff for: internal/arduino/libraries/librariesindex/json.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package librariesindex
1818
import (
1919
"fmt"
2020

21-
"github.com/arduino/arduino-cli/i18n"
2221
"github.com/arduino/arduino-cli/internal/arduino/resources"
22+
"github.com/arduino/arduino-cli/internal/i18n"
2323
"github.com/arduino/go-paths-helper"
2424
easyjson "github.com/mailru/easyjson"
2525
semver "go.bug.st/relaxed-semver"

Diff for: internal/arduino/libraries/librariesmanager/librariesmanager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"slices"
2323
"strings"
2424

25-
"github.com/arduino/arduino-cli/i18n"
2625
"github.com/arduino/arduino-cli/internal/arduino/cores"
2726
"github.com/arduino/arduino-cli/internal/arduino/libraries"
2827
"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex"
28+
"github.com/arduino/arduino-cli/internal/i18n"
2929
paths "github.com/arduino/go-paths-helper"
3030
"github.com/sirupsen/logrus"
3131
"google.golang.org/grpc/codes"

0 commit comments

Comments
 (0)