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.

Author: per1234

.prettierignore

@@ -5,7 +5,7 @@
 .ionide/
 
 # Test files
-/internal/check/checkdata/schema/testdata/input/invalid-schema.json
-/internal/check/checkdata/testdata/packageindexes/invalid-JSON/package_foo_index.json
+/internal/check/schema/testdata/input/invalid-schema.json
+/internal/project/checkdata/testdata/packageindexes/invalid-JSON/package_foo_index.json
 /internal/check/checkfunctions/testdata/packageindexes/invalid-JSON/package_foo_index.json
 /internal/check/checkfunctions/testdata/sketches/InvalidJSONMetadataFile/sketch.json

Taskfile.yml

@@ -17,8 +17,8 @@ tasks:
     desc: Generate Go code
     cmds:
       - go get -u "github.com/go-bindata/go-bindata/...@v3.1.1"
-      - go-bindata -nocompress -nometadata -o "./internal/check/checkdata/schema/schemadata/bindata.go" --pkg schemadata --prefix "./etc/schemas/" "./etc/schemas/"
-      - 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/"
+      - go-bindata -nocompress -nometadata -o "./internal/check/schema/schemadata/bindata.go" --pkg schemadata --prefix "./etc/schemas/" "./etc/schemas/"
+      - go-bindata -nocompress -nometadata -o "./internal/check/schema/testdata/bindata.go" --pkg testdata --prefix "./internal/check/schema/testdata/input/" "./internal/check/schema/testdata/input/"
       - go get -u golang.org/x/tools/cmd/stringer@v0.0.0-20201211192254-72fbef54948b
       - go generate ./...
       - task: go:format

internal/check/check.go

@@ -20,11 +20,11 @@ import (
 	"fmt"
 
 	"github.com/arduino/arduino-lint/internal/check/checkconfigurations"
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
 	"github.com/arduino/arduino-lint/internal/configuration"
 	"github.com/arduino/arduino-lint/internal/configuration/checkmode"
 	"github.com/arduino/arduino-lint/internal/project"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 	"github.com/arduino/arduino-lint/internal/result"
 	"github.com/arduino/arduino-lint/internal/result/feedback"
 	"github.com/sirupsen/logrus"

internal/check/checkfunctions/checkfunctions.go

@@ -22,8 +22,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 	"github.com/arduino/arduino-lint/internal/project/sketch"
 	"github.com/arduino/go-paths-helper"
 )

internal/check/checkfunctions/checkfunctions_test.go

@@ -20,9 +20,9 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
 	"github.com/arduino/arduino-lint/internal/project"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 	"github.com/arduino/arduino-lint/internal/project/projecttype"
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/assert"

internal/check/checkfunctions/library.go

@@ -26,10 +26,10 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/arduino/utils"
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
-	"github.com/arduino/arduino-lint/internal/check/checkdata/schema"
-	"github.com/arduino/arduino-lint/internal/check/checkdata/schema/compliancelevel"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
+	"github.com/arduino/arduino-lint/internal/check/schema"
+	"github.com/arduino/arduino-lint/internal/check/schema/compliancelevel"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 	"github.com/arduino/arduino-lint/internal/project/library"
 	"github.com/arduino/arduino-lint/internal/project/sketch"
 	"github.com/go-git/go-git/v5"

internal/check/checkfunctions/library_test.go

@@ -21,9 +21,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
 	"github.com/arduino/arduino-lint/internal/project"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 	"github.com/arduino/arduino-lint/internal/project/projecttype"
 	"github.com/arduino/go-paths-helper"
 	"github.com/go-git/go-git/v5"

internal/check/checkfunctions/packageindex.go

@@ -16,8 +16,8 @@
 package checkfunctions
 
 import (
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 )
 
 // The check functions for package indexes.

internal/check/checkfunctions/packageindex_test.go

@@ -19,9 +19,9 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
 	"github.com/arduino/arduino-lint/internal/project"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 	"github.com/arduino/arduino-lint/internal/project/projecttype"
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/assert"

internal/check/checkfunctions/platform.go

@@ -16,8 +16,8 @@
 package checkfunctions
 
 import (
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 )
 
 // The check functions for platforms.

internal/check/checkfunctions/platform_test.go

@@ -19,9 +19,9 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
 	"github.com/arduino/arduino-lint/internal/project"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 	"github.com/arduino/arduino-lint/internal/project/projecttype"
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/assert"

internal/check/checkfunctions/sketch.go

@@ -21,8 +21,8 @@ import (
 	"strings"
 
 	"github.com/arduino/arduino-cli/arduino/globals"
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 	"github.com/arduino/arduino-lint/internal/project/sketch"
 )
 

internal/check/checkfunctions/sketch_test.go

@@ -20,9 +20,9 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/arduino/arduino-lint/internal/check/checkdata"
 	"github.com/arduino/arduino-lint/internal/check/checkresult"
 	"github.com/arduino/arduino-lint/internal/project"
+	"github.com/arduino/arduino-lint/internal/project/checkdata"
 	"github.com/arduino/arduino-lint/internal/project/projecttype"
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/assert"

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

@@ -19,7 +19,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/arduino/arduino-lint/internal/check/checkdata/schema/testdata"
+	"github.com/arduino/arduino-lint/internal/check/schema/testdata"
 	"github.com/arduino/go-properties-orderedmap"
 	"github.com/ory/jsonschema/v3"
 	"github.com/stretchr/testify/require"
@@ -199,14 +199,14 @@ func Test_schemaID(t *testing.T) {
 	require.NotNil(t, err)
 
 	id, err := schemaID("valid-schema.json", testdata.Asset)
-	require.Equal(t, "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/schema-with-references.json", id)
+	require.Equal(t, "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/schema/testdata/schema-with-references.json", id)
 	require.Nil(t, err)
 }
 
 func Test_validationErrorSchemaPointerValue(t *testing.T) {
 	validationError := ValidationResult{
 		Result: &jsonschema.ValidationError{
-			SchemaURL: "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/referenced-schema-1.json",
+			SchemaURL: "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/schema/testdata/referenced-schema-1.json",
 			SchemaPtr: "#/definitions/patternObject/pattern",
 		},
 		dataLoader: testdata.Asset,

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

@@ -1,11 +1,11 @@
 // Package testdata Code generated by go-bindata. (@generated) DO NOT EDIT.
 // sources:
-// internal/check/checkdata/schema/testdata/input/invalid-schema.json
-// internal/check/checkdata/schema/testdata/input/referenced-schema-1.json
-// internal/check/checkdata/schema/testdata/input/referenced-schema-2.json
-// internal/check/checkdata/schema/testdata/input/schema-without-id.json
-// internal/check/checkdata/schema/testdata/input/valid-schema-with-references.json
-// internal/check/checkdata/schema/testdata/input/valid-schema.json
+// internal/check/schema/testdata/input/invalid-schema.json
+// internal/check/schema/testdata/input/referenced-schema-1.json
+// internal/check/schema/testdata/input/referenced-schema-2.json
+// internal/check/schema/testdata/input/schema-without-id.json
+// internal/check/schema/testdata/input/valid-schema-with-references.json
+// internal/check/schema/testdata/input/valid-schema.json
 package testdata
 
 import (
@@ -82,7 +82,7 @@ func invalidSchemaJson() (*asset, error) {
 
 var _referencedSchema1Json = []byte(`{
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/referenced-schema-1.json",
+  "$id": "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/schema/testdata/referenced-schema-1.json",
   "title": "Schema for use in unit tests",
   "definitions": {
     "patternObject": {
@@ -112,7 +112,7 @@ func referencedSchema1Json() (*asset, error) {
 
 var _referencedSchema2Json = []byte(`{
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/referenced-schema-2.json",
+  "$id": "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/schema/testdata/referenced-schema-2.json",
   "title": "Schema for use in unit tests",
   "definitions": {
     "minLengthObject": {
@@ -182,7 +182,7 @@ func schemaWithoutIdJson() (*asset, error) {
 
 var _validSchemaWithReferencesJson = []byte(`{
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/schema-with-references.json",
+  "$id": "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/schema/testdata/schema-with-references.json",
   "title": "Schema for use in unit tests",
   "type": "object",
   "properties": {
@@ -242,7 +242,7 @@ func validSchemaWithReferencesJson() (*asset, error) {
 
 var _validSchemaJson = []byte(`{
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/schema-with-references.json",
+  "$id": "https://raw-hub.myxuebi.top/arduino/arduino-lint/main/internal/check/schema/testdata/schema-with-references.json",
   "title": "Schema for use in unit tests",
   "type": "object",
   "properties": {

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/referenced-schema-1.json",
+  "$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/referenced-schema-1.json",
   "title": "Schema for use in unit tests",
   "definitions": {
     "patternObject": {

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/referenced-schema-2.json",
+  "$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/referenced-schema-2.json",
   "title": "Schema for use in unit tests",
   "definitions": {
     "minLengthObject": {

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/schema-with-references.json",
+  "$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/schema-with-references.json",
   "title": "Schema for use in unit tests",
   "type": "object",
   "properties": {

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/checkdata/schema/testdata/schema-with-references.json",
+  "$id": "https://raw.githubusercontent.com/arduino/arduino-lint/main/internal/check/schema/testdata/schema-with-references.json",
   "title": "Schema for use in unit tests",
   "type": "object",
   "properties": {

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

@@ -22,8 +22,8 @@ import (
 	"os"
 
 	"github.com/arduino/arduino-cli/arduino/libraries"
-	"github.com/arduino/arduino-lint/internal/check/checkdata/schema"
-	"github.com/arduino/arduino-lint/internal/check/checkdata/schema/compliancelevel"
+	"github.com/arduino/arduino-lint/internal/check/schema"
+	"github.com/arduino/arduino-lint/internal/check/schema/compliancelevel"
 	"github.com/arduino/arduino-lint/internal/project"
 	"github.com/arduino/arduino-lint/internal/project/library/libraryproperties"
 	"github.com/arduino/arduino-lint/internal/result/feedback"

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

@@ -17,9 +17,9 @@
 package libraryproperties
 
 import (
-	"github.com/arduino/arduino-lint/internal/check/checkdata/schema"
-	"github.com/arduino/arduino-lint/internal/check/checkdata/schema/compliancelevel"
-	"github.com/arduino/arduino-lint/internal/check/checkdata/schema/schemadata"
+	"github.com/arduino/arduino-lint/internal/check/schema"
+	"github.com/arduino/arduino-lint/internal/check/schema/compliancelevel"
+	"github.com/arduino/arduino-lint/internal/check/schema/schemadata"
 	"github.com/arduino/go-paths-helper"
 	"github.com/arduino/go-properties-orderedmap"
 )

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

@@ -21,8 +21,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/arduino/arduino-lint/internal/check/checkdata/schema"
-	"github.com/arduino/arduino-lint/internal/check/checkdata/schema/compliancelevel"
+	"github.com/arduino/arduino-lint/internal/check/schema"
+	"github.com/arduino/arduino-lint/internal/check/schema/compliancelevel"
 	"github.com/arduino/arduino-lint/internal/project/library/libraryproperties"
 	"github.com/arduino/go-properties-orderedmap"