Skip to content

Commit 2fe6726

Browse files
committed
Move checkdata package to internal/project
This package is more closely related to the projects than the checks. The schema folder was left in place because it is an implementation of the checks, so most appropriate where it was.
1 parent 7a54ccf commit 2fe6726

Some content is hidden

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

43 files changed

+41
-41
lines changed

.prettierignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.ionide/
66

77
# Test files
8-
/internal/check/checkdata/schema/testdata/input/invalid-schema.json
9-
/internal/check/checkdata/testdata/packageindexes/invalid-JSON/package_foo_index.json
8+
/internal/check/schema/testdata/input/invalid-schema.json
9+
/internal/project/checkdata/testdata/packageindexes/invalid-JSON/package_foo_index.json
1010
/internal/check/checkfunctions/testdata/packageindexes/invalid-JSON/package_foo_index.json
1111
/internal/check/checkfunctions/testdata/sketches/InvalidJSONMetadataFile/sketch.json

Taskfile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ tasks:
1717
desc: Generate Go code
1818
cmds:
1919
- go get -u "github.com/go-bindata/go-bindata/[email protected]"
20-
- go-bindata -nocompress -nometadata -o "./internal/check/checkdata/schema/schemadata/bindata.go" --pkg schemadata --prefix "./etc/schemas/" "./etc/schemas/"
21-
- go-bindata -nocompress -nometadata -o "./internal/check/checkdata/schema/testdata/bindata.go" --pkg testdata --prefix "./internal/check/checkdata/schema/testdata/input/" "./internal/check/checkdata/schema/testdata/input/"
20+
- go-bindata -nocompress -nometadata -o "./internal/check/schema/schemadata/bindata.go" --pkg schemadata --prefix "./etc/schemas/" "./etc/schemas/"
21+
- go-bindata -nocompress -nometadata -o "./internal/check/schema/testdata/bindata.go" --pkg testdata --prefix "./internal/check/schema/testdata/input/" "./internal/check/schema/testdata/input/"
2222
- go get -u golang.org/x/tools/cmd/[email protected]
2323
- go generate ./...
2424
- task: go:format

internal/check/check.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"fmt"
2121

2222
"github.com/arduino/arduino-lint/internal/check/checkconfigurations"
23-
"github.com/arduino/arduino-lint/internal/check/checkdata"
2423
"github.com/arduino/arduino-lint/internal/check/checkresult"
2524
"github.com/arduino/arduino-lint/internal/configuration"
2625
"github.com/arduino/arduino-lint/internal/configuration/checkmode"
2726
"github.com/arduino/arduino-lint/internal/project"
27+
"github.com/arduino/arduino-lint/internal/project/checkdata"
2828
"github.com/arduino/arduino-lint/internal/result"
2929
"github.com/arduino/arduino-lint/internal/result/feedback"
3030
"github.com/sirupsen/logrus"

internal/check/checkfunctions/checkfunctions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"regexp"
2323
"strings"
2424

25-
"github.com/arduino/arduino-lint/internal/check/checkdata"
2625
"github.com/arduino/arduino-lint/internal/check/checkresult"
26+
"github.com/arduino/arduino-lint/internal/project/checkdata"
2727
"github.com/arduino/arduino-lint/internal/project/sketch"
2828
"github.com/arduino/go-paths-helper"
2929
)

internal/check/checkfunctions/checkfunctions_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"regexp"
2121
"testing"
2222

23-
"github.com/arduino/arduino-lint/internal/check/checkdata"
2423
"github.com/arduino/arduino-lint/internal/check/checkresult"
2524
"github.com/arduino/arduino-lint/internal/project"
25+
"github.com/arduino/arduino-lint/internal/project/checkdata"
2626
"github.com/arduino/arduino-lint/internal/project/projecttype"
2727
"github.com/arduino/go-paths-helper"
2828
"github.com/stretchr/testify/assert"

internal/check/checkfunctions/library.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626

2727
"github.com/arduino/arduino-cli/arduino/libraries"
2828
"github.com/arduino/arduino-cli/arduino/utils"
29-
"github.com/arduino/arduino-lint/internal/check/checkdata"
30-
"github.com/arduino/arduino-lint/internal/check/checkdata/schema"
31-
"github.com/arduino/arduino-lint/internal/check/checkdata/schema/compliancelevel"
3229
"github.com/arduino/arduino-lint/internal/check/checkresult"
30+
"github.com/arduino/arduino-lint/internal/check/schema"
31+
"github.com/arduino/arduino-lint/internal/check/schema/compliancelevel"
32+
"github.com/arduino/arduino-lint/internal/project/checkdata"
3333
"github.com/arduino/arduino-lint/internal/project/library"
3434
"github.com/arduino/arduino-lint/internal/project/sketch"
3535
"github.com/go-git/go-git/v5"

internal/check/checkfunctions/library_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"testing"
2222
"time"
2323

24-
"github.com/arduino/arduino-lint/internal/check/checkdata"
2524
"github.com/arduino/arduino-lint/internal/check/checkresult"
2625
"github.com/arduino/arduino-lint/internal/project"
26+
"github.com/arduino/arduino-lint/internal/project/checkdata"
2727
"github.com/arduino/arduino-lint/internal/project/projecttype"
2828
"github.com/arduino/go-paths-helper"
2929
"github.com/go-git/go-git/v5"

internal/check/checkfunctions/packageindex.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package checkfunctions
1717

1818
import (
19-
"github.com/arduino/arduino-lint/internal/check/checkdata"
2019
"github.com/arduino/arduino-lint/internal/check/checkresult"
20+
"github.com/arduino/arduino-lint/internal/project/checkdata"
2121
)
2222

2323
// The check functions for package indexes.

internal/check/checkfunctions/packageindex_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"regexp"
2020
"testing"
2121

22-
"github.com/arduino/arduino-lint/internal/check/checkdata"
2322
"github.com/arduino/arduino-lint/internal/check/checkresult"
2423
"github.com/arduino/arduino-lint/internal/project"
24+
"github.com/arduino/arduino-lint/internal/project/checkdata"
2525
"github.com/arduino/arduino-lint/internal/project/projecttype"
2626
"github.com/arduino/go-paths-helper"
2727
"github.com/stretchr/testify/assert"

internal/check/checkfunctions/platform.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package checkfunctions
1717

1818
import (
19-
"github.com/arduino/arduino-lint/internal/check/checkdata"
2019
"github.com/arduino/arduino-lint/internal/check/checkresult"
20+
"github.com/arduino/arduino-lint/internal/project/checkdata"
2121
)
2222

2323
// The check functions for platforms.

0 commit comments

Comments
 (0)