Move schema pattern for not starting with "arduino" to the general definitions file

per1234 · per1234 · commit 004a3306ecab · 2021-06-07T01:23:25.000-07:00
Since this was previously only used for library.properties, it was in that schema file, but now it will be shared with
the package index schema, and so should be in the appropriate file for that usage.
diff --git a/etc/schemas/arduino-library-properties-definitions-schema.json b/etc/schemas/arduino-library-properties-definitions-schema.json
@@ -6,11 +6,6 @@
   "definitions": {
     "general": {
       "patternObjects": {
-        "notStartsWithArduino": {
-          "not": {
-            "pattern": "^[aA][rR][dD][uU][iI][nN][oO].*$"
-          }
-        },
         "notContainsArduino": {
           "not": {
             "pattern": "^.+[aA][rR][dD][uU][iI][nN][oO].*$"
@@ -69,7 +64,7 @@
               },
               {
                 "$comment": "Only official Arduino libraries are allowed to have names starting with \"Arduino\"",
-                "$ref": "#/definitions/general/patternObjects/notStartsWithArduino"
+                "$ref": "general-definitions-schema.json#/definitions/patternObjects/notStartsWithArduino"
               }
             ]
           }
@@ -228,7 +223,7 @@
               },
               {
                 "$comment": "Only official Arduino libraries are allowed to have maintainer field starting with \"Arduino\"",
-                "$ref": "#/definitions/general/patternObjects/notStartsWithArduino"
+                "$ref": "general-definitions-schema.json#/definitions/patternObjects/notStartsWithArduino"
               }
             ]
           }
diff --git a/etc/schemas/general-definitions-schema.json b/etc/schemas/general-definitions-schema.json
@@ -17,6 +17,11 @@
       "containsPropertyReference": {
         "$comment": "https://arduino.github.io/arduino-cli/dev/platform-specification/#configuration-files-format",
         "pattern": "{.+}"
+      },
+      "notStartsWithArduino": {
+        "not": {
+          "pattern": "^[aA][rR][dD][uU][iI][nN][oO].*$"
+        }
       }
     }
   }
diff --git a/internal/rule/schema/schemadata/bindata.go b/internal/rule/schema/schemadata/bindata.go
@@ -1425,11 +1425,6 @@ var _arduinoLibraryPropertiesDefinitionsSchemaJson = []byte(`{
   "definitions": {
     "general": {
       "patternObjects": {
-        "notStartsWithArduino": {
-          "not": {
-            "pattern": "^[aA][rR][dD][uU][iI][nN][oO].*$"
-          }
-        },
         "notContainsArduino": {
           "not": {
             "pattern": "^.+[aA][rR][dD][uU][iI][nN][oO].*$"
@@ -1488,7 +1483,7 @@ var _arduinoLibraryPropertiesDefinitionsSchemaJson = []byte(`{
               },
               {
                 "$comment": "Only official Arduino libraries are allowed to have names starting with \"Arduino\"",
-                "$ref": "#/definitions/general/patternObjects/notStartsWithArduino"
+                "$ref": "general-definitions-schema.json#/definitions/patternObjects/notStartsWithArduino"
               }
             ]
           }
@@ -1647,7 +1642,7 @@ var _arduinoLibraryPropertiesDefinitionsSchemaJson = []byte(`{
               },
               {
                 "$comment": "Only official Arduino libraries are allowed to have maintainer field starting with \"Arduino\"",
-                "$ref": "#/definitions/general/patternObjects/notStartsWithArduino"
+                "$ref": "general-definitions-schema.json#/definitions/patternObjects/notStartsWithArduino"
               }
             ]
           }
@@ -4370,6 +4365,11 @@ var _generalDefinitionsSchemaJson = []byte(`{
       "containsPropertyReference": {
         "$comment": "https://arduino.github.io/arduino-cli/dev/platform-specification/#configuration-files-format",
         "pattern": "{.+}"
+      },
+      "notStartsWithArduino": {
+        "not": {
+          "pattern": "^[aA][rR][dD][uU][iI][nN][oO].*$"
+        }
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,6 @@`
`6`	`6`	`"definitions": {`
`7`	`7`	`"general": {`
`8`	`8`	`"patternObjects": {`
`9`		`- "notStartsWithArduino": {`
`10`		`- "not": {`
`11`		`- "pattern": "^[aA][rR][dD][uU][iI][nN][oO].*$"`
`12`		`- }`
`13`		`- },`
`14`	`9`	`"notContainsArduino": {`
`15`	`10`	`"not": {`
`16`	`11`	`"pattern": "^.+[aA][rR][dD][uU][iI][nN][oO].*$"`
`@@ -69,7 +64,7 @@`
`69`	`64`	`},`
`70`	`65`	`{`
`71`	`66`	`"$comment": "Only official Arduino libraries are allowed to have names starting with \"Arduino\"",`
`72`		`- "$ref": "#/definitions/general/patternObjects/notStartsWithArduino"`
	`67`	`+ "$ref": "general-definitions-schema.json#/definitions/patternObjects/notStartsWithArduino"`
`73`	`68`	`}`
`74`	`69`	`]`
`75`	`70`	`}`
`@@ -228,7 +223,7 @@`
`228`	`223`	`},`
`229`	`224`	`{`
`230`	`225`	`"$comment": "Only official Arduino libraries are allowed to have maintainer field starting with \"Arduino\"",`
`231`		`- "$ref": "#/definitions/general/patternObjects/notStartsWithArduino"`
	`226`	`+ "$ref": "general-definitions-schema.json#/definitions/patternObjects/notStartsWithArduino"`
`232`	`227`	`}`
`233`	`228`	`]`
`234`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,11 @@`
`17`	`17`	`"containsPropertyReference": {`
`18`	`18`	`"$comment": "https://arduino.github.io/arduino-cli/dev/platform-specification/#configuration-files-format",`
`19`	`19`	`"pattern": "{.+}"`
	`20`	`+ },`
	`21`	`+ "notStartsWithArduino": {`
	`22`	`+ "not": {`
	`23`	`+ "pattern": "^[aA][rR][dD][uU][iI][nN][oO].*$"`
	`24`	`+ }`
`20`	`25`	`}`
`21`	`26`	`}`
`22`	`27`	`}`
Original file line number	Diff line number	Diff line change
@@ -1425,11 +1425,6 @@ var _arduinoLibraryPropertiesDefinitionsSchemaJson = []byte(`{
`1425`	`1425`	`"definitions": {`
`1426`	`1426`	`"general": {`
`1427`	`1427`	`"patternObjects": {`
`1428`		`- "notStartsWithArduino": {`
`1429`		`- "not": {`
`1430`		`- "pattern": "^[aA][rR][dD][uU][iI][nN][oO].*$"`
`1431`		`- }`
`1432`		`- },`
`1433`	`1428`	`"notContainsArduino": {`
`1434`	`1429`	`"not": {`
`1435`	`1430`	`"pattern": "^.+[aA][rR][dD][uU][iI][nN][oO].*$"`
@@ -1488,7 +1483,7 @@ var _arduinoLibraryPropertiesDefinitionsSchemaJson = []byte(`{
`1488`	`1483`	`},`
`1489`	`1484`	`{`
`1490`	`1485`	`"$comment": "Only official Arduino libraries are allowed to have names starting with \"Arduino\"",`
`1491`		`- "$ref": "#/definitions/general/patternObjects/notStartsWithArduino"`
	`1486`	`+ "$ref": "general-definitions-schema.json#/definitions/patternObjects/notStartsWithArduino"`
`1492`	`1487`	`}`
`1493`	`1488`	`]`
`1494`	`1489`	`}`
@@ -1647,7 +1642,7 @@ var _arduinoLibraryPropertiesDefinitionsSchemaJson = []byte(`{
`1647`	`1642`	`},`
`1648`	`1643`	`{`
`1649`	`1644`	`"$comment": "Only official Arduino libraries are allowed to have maintainer field starting with \"Arduino\"",`
`1650`		`- "$ref": "#/definitions/general/patternObjects/notStartsWithArduino"`
	`1645`	`+ "$ref": "general-definitions-schema.json#/definitions/patternObjects/notStartsWithArduino"`
`1651`	`1646`	`}`
`1652`	`1647`	`]`
`1653`	`1648`	`}`
@@ -4370,6 +4365,11 @@ var _generalDefinitionsSchemaJson = []byte(`{
`4370`	`4365`	`"containsPropertyReference": {`
`4371`	`4366`	`"$comment": "https://arduino.github.io/arduino-cli/dev/platform-specification/#configuration-files-format",`
`4372`	`4367`	`"pattern": "{.+}"`
	`4368`	`+ },`
	`4369`	`+ "notStartsWithArduino": {`
	`4370`	`+ "not": {`
	`4371`	`+ "pattern": "^[aA][rR][dD][uU][iI][nN][oO].*$"`
	`4372`	`+ }`
`4373`	`4373`	`}`
`4374`	`4374`	`}`
`4375`	`4375`	`}`