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

.github/workflows/check-go-task.yml

Lines changed: 1 addition & 1 deletion
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:

.github/workflows/deploy-cobra-mkdocs-versioned-poetry.yml

Lines changed: 1 addition & 1 deletion
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"

.gitignore

Lines changed: 5 additions & 5 deletions
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

Taskfile.yml

Lines changed: 7 additions & 7 deletions
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:

commands/board/board.go

Lines changed: 1 addition & 1 deletion
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

commands/cmderrors/cmderrors.go

Lines changed: 1 addition & 1 deletion
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"

commands/compile/compile.go

Lines changed: 1 addition & 1 deletion
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"

commands/core/download.go

Lines changed: 1 addition & 1 deletion
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

commands/daemon/daemon.go

Lines changed: 1 addition & 1 deletion
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"

commands/debug/debug.go

Lines changed: 1 addition & 1 deletion
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"

0 commit comments

Comments
 (0)