Skip to content

Commit 2fe6726

Browse files
per1234per1234
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.

‎internal/check/checkfunctions/platform_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/sketch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"strings"
2222

2323
"github.com/arduino/arduino-cli/arduino/globals"
24-
"github.com/arduino/arduino-lint/internal/check/checkdata"
2524
"github.com/arduino/arduino-lint/internal/check/checkresult"
25+
"github.com/arduino/arduino-lint/internal/project/checkdata"
2626
"github.com/arduino/arduino-lint/internal/project/sketch"
2727
)
2828

‎internal/check/checkfunctions/sketch_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/checkdata/schema/compliancelevel/compliancelevel.go renamed to ‎internal/check/schema/compliancelevel/compliancelevel.go

File renamed without changes.

‎internal/check/checkdata/schema/compliancelevel/type_string.go renamed to ‎internal/check/schema/compliancelevel/type_string.go

File renamed without changes.

‎internal/check/checkdata/schema/parsevalidationresult.go renamed to ‎internal/check/schema/parsevalidationresult.go

File renamed without changes.

‎internal/check/checkdata/schema/schema.go renamed to ‎internal/check/schema/schema.go

File renamed without changes.

‎internal/check/checkdata/schema/schema_test.go renamed to ‎internal/check/schema/schema_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"regexp"
2020
"testing"
2121

22-
"github.com/arduino/arduino-lint/internal/check/checkdata/schema/testdata"
22+
"github.com/arduino/arduino-lint/internal/check/schema/testdata"
2323
"github.com/arduino/go-properties-orderedmap"
2424
"github.com/ory/jsonschema/v3"
2525
"github.com/stretchr/testify/require"
@@ -199,14 +199,14 @@ func Test_schemaID(t *testing.T) {
199199
require.NotNil(t, err)
200200

201201
id, err := schemaID("valid-schema.json", testdata.Asset)
202-
require.Equal(t, "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/schema-with-references.json", id)
202+
require.Equal(t, "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/schema-with-references.json", id)
203203
require.Nil(t, err)
204204
}
205205

206206
func Test_validationErrorSchemaPointerValue(t *testing.T) {
207207
validationError := ValidationResult{
208208
Result: &jsonschema.ValidationError{
209-
SchemaURL: "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/referenced-schema-1.json",
209+
SchemaURL: "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/referenced-schema-1.json",
210210
SchemaPtr: "#/definitions/patternObject/pattern",
211211
},
212212
dataLoader: testdata.Asset,

‎internal/check/checkdata/schema/schemadata/bindata.go renamed to ‎internal/check/schema/schemadata/bindata.go

File renamed without changes.

‎internal/check/checkdata/schema/schemadata/schemadata.go renamed to ‎internal/check/schema/schemadata/schemadata.go

File renamed without changes.

‎internal/check/checkdata/schema/testdata/bindata.go renamed to ‎internal/check/schema/testdata/bindata.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Package testdata Code generated by go-bindata. (@generated) DO NOT EDIT.
22
// sources:
3-
// internal/check/checkdata/schema/testdata/input/invalid-schema.json
4-
// internal/check/checkdata/schema/testdata/input/referenced-schema-1.json
5-
// internal/check/checkdata/schema/testdata/input/referenced-schema-2.json
6-
// internal/check/checkdata/schema/testdata/input/schema-without-id.json
7-
// internal/check/checkdata/schema/testdata/input/valid-schema-with-references.json
8-
// internal/check/checkdata/schema/testdata/input/valid-schema.json
3+
// internal/check/schema/testdata/input/invalid-schema.json
4+
// internal/check/schema/testdata/input/referenced-schema-1.json
5+
// internal/check/schema/testdata/input/referenced-schema-2.json
6+
// internal/check/schema/testdata/input/schema-without-id.json
7+
// internal/check/schema/testdata/input/valid-schema-with-references.json
8+
// internal/check/schema/testdata/input/valid-schema.json
99
package testdata
1010

1111
import (
@@ -82,7 +82,7 @@ func invalidSchemaJson() (*asset, error) {
8282

8383
var _referencedSchema1Json = []byte(`{
8484
"$schema": "http://json-schema.org/draft-07/schema#",
85-
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/referenced-schema-1.json",
85+
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/referenced-schema-1.json",
8686
"title": "Schema for use in unit tests",
8787
"definitions": {
8888
"patternObject": {
@@ -112,7 +112,7 @@ func referencedSchema1Json() (*asset, error) {
112112

113113
var _referencedSchema2Json = []byte(`{
114114
"$schema": "http://json-schema.org/draft-07/schema#",
115-
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/referenced-schema-2.json",
115+
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/referenced-schema-2.json",
116116
"title": "Schema for use in unit tests",
117117
"definitions": {
118118
"minLengthObject": {
@@ -182,7 +182,7 @@ func schemaWithoutIdJson() (*asset, error) {
182182

183183
var _validSchemaWithReferencesJson = []byte(`{
184184
"$schema": "http://json-schema.org/draft-07/schema#",
185-
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/schema-with-references.json",
185+
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/schema-with-references.json",
186186
"title": "Schema for use in unit tests",
187187
"type": "object",
188188
"properties": {
@@ -242,7 +242,7 @@ func validSchemaWithReferencesJson() (*asset, error) {
242242

243243
var _validSchemaJson = []byte(`{
244244
"$schema": "http://json-schema.org/draft-07/schema#",
245-
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/schema-with-references.json",
245+
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/schema-with-references.json",
246246
"title": "Schema for use in unit tests",
247247
"type": "object",
248248
"properties": {

‎internal/check/checkdata/schema/testdata/input/invalid-schema.json renamed to ‎internal/check/schema/testdata/input/invalid-schema.json

File renamed without changes.

‎internal/check/checkdata/schema/testdata/input/referenced-schema-1.json renamed to ‎internal/check/schema/testdata/input/referenced-schema-1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/referenced-schema-1.json",
3+
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/referenced-schema-1.json",
44
"title": "Schema for use in unit tests",
55
"definitions": {
66
"patternObject": {

‎internal/check/checkdata/schema/testdata/input/referenced-schema-2.json renamed to ‎internal/check/schema/testdata/input/referenced-schema-2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/referenced-schema-2.json",
3+
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/referenced-schema-2.json",
44
"title": "Schema for use in unit tests",
55
"definitions": {
66
"minLengthObject": {

‎internal/check/checkdata/schema/testdata/input/schema-without-id.json renamed to ‎internal/check/schema/testdata/input/schema-without-id.json

File renamed without changes.

‎internal/check/checkdata/schema/testdata/input/valid-schema-with-references.json renamed to ‎internal/check/schema/testdata/input/valid-schema-with-references.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/schema-with-references.json",
3+
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/schema-with-references.json",
44
"title": "Schema for use in unit tests",
55
"type": "object",
66
"properties": {

‎internal/check/checkdata/schema/testdata/input/valid-schema.json renamed to ‎internal/check/schema/testdata/input/valid-schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/schema-with-references.json",
3+
"$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/schema-with-references.json",
44
"title": "Schema for use in unit tests",
55
"type": "object",
66
"properties": {

‎internal/check/checkdata/schema/testdata/testdata.go renamed to ‎internal/check/schema/testdata/testdata.go

File renamed without changes.

‎internal/check/checkdata/checkdata.go renamed to ‎internal/project/checkdata/checkdata.go

File renamed without changes.

‎internal/check/checkdata/library.go renamed to ‎internal/project/checkdata/library.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"os"
2323

2424
"github.com/arduino/arduino-cli/arduino/libraries"
25-
"github.com/arduino/arduino-lint/internal/check/checkdata/schema"
26-
"github.com/arduino/arduino-lint/internal/check/checkdata/schema/compliancelevel"
25+
"github.com/arduino/arduino-lint/internal/check/schema"
26+
"github.com/arduino/arduino-lint/internal/check/schema/compliancelevel"
2727
"github.com/arduino/arduino-lint/internal/project"
2828
"github.com/arduino/arduino-lint/internal/project/library/libraryproperties"
2929
"github.com/arduino/arduino-lint/internal/result/feedback"

‎internal/check/checkdata/packageindex.go renamed to ‎internal/project/checkdata/packageindex.go

File renamed without changes.

‎internal/check/checkdata/packageindex_test.go renamed to ‎internal/project/checkdata/packageindex_test.go

File renamed without changes.

‎internal/check/checkdata/platform.go renamed to ‎internal/project/checkdata/platform.go

File renamed without changes.

‎internal/check/checkdata/platform_test.go renamed to ‎internal/project/checkdata/platform_test.go

File renamed without changes.

‎internal/check/checkdata/sketch.go renamed to ‎internal/project/checkdata/sketch.go

File renamed without changes.

‎internal/check/checkdata/testdata/packageindexes/invalid-JSON/package_foo_index.json renamed to ‎internal/project/checkdata/testdata/packageindexes/invalid-JSON/package_foo_index.json

File renamed without changes.

‎internal/check/checkdata/testdata/packageindexes/invalid-package-index/package_foo_index.json renamed to ‎internal/project/checkdata/testdata/packageindexes/invalid-package-index/package_foo_index.json

File renamed without changes.

‎internal/check/checkdata/testdata/packageindexes/valid-package-index/package_foo_index.json renamed to ‎internal/project/checkdata/testdata/packageindexes/valid-package-index/package_foo_index.json

File renamed without changes.

‎internal/check/checkdata/testdata/platforms/invalid-boards.txt/boards.txt renamed to ‎internal/project/checkdata/testdata/platforms/invalid-boards.txt/boards.txt

File renamed without changes.

‎internal/check/checkdata/testdata/platforms/missing-boards.txt/.gitkeep renamed to ‎internal/project/checkdata/testdata/platforms/missing-boards.txt/.gitkeep

File renamed without changes.

‎internal/check/checkdata/testdata/platforms/valid-boards.txt/boards.txt renamed to ‎internal/project/checkdata/testdata/platforms/valid-boards.txt/boards.txt

File renamed without changes.

‎internal/project/library/libraryproperties/libraryproperties.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package libraryproperties
1818

1919
import (
20-
"github.com/arduino/arduino-lint/internal/check/checkdata/schema"
21-
"github.com/arduino/arduino-lint/internal/check/checkdata/schema/compliancelevel"
22-
"github.com/arduino/arduino-lint/internal/check/checkdata/schema/schemadata"
20+
"github.com/arduino/arduino-lint/internal/check/schema"
21+
"github.com/arduino/arduino-lint/internal/check/schema/compliancelevel"
22+
"github.com/arduino/arduino-lint/internal/check/schema/schemadata"
2323
"github.com/arduino/go-paths-helper"
2424
"github.com/arduino/go-properties-orderedmap"
2525
)

‎internal/project/library/libraryproperties/librarypropertiesschemas_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"strings"
2222
"testing"
2323

24-
"github.com/arduino/arduino-lint/internal/check/checkdata/schema"
25-
"github.com/arduino/arduino-lint/internal/check/checkdata/schema/compliancelevel"
24+
"github.com/arduino/arduino-lint/internal/check/schema"
25+
"github.com/arduino/arduino-lint/internal/check/schema/compliancelevel"
2626
"github.com/arduino/arduino-lint/internal/project/library/libraryproperties"
2727
"github.com/arduino/go-properties-orderedmap"
2828

0 commit comments

Comments
 (0)