Fix schema

dice-group · Sep 11, 2024 · b08f77a · b08f77a
1 parent a2ae16f
commit b08f77a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/graalvm/generate-config.sh b/graalvm/generate-config.sh
@@ -43,9 +43,9 @@ if [ -f "$TARGET_DIR"/native/agent-output/test/resource-config.json ]; then
 fi
 
 # Run through multiple different execution paths, so that the tracing agent can generate complete configuration files.
-"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --help             #> /dev/null
-"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --dry-run -is "$SUITE" #> /dev/null
-"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --dry-run "$SUITE"     #> /dev/null
+"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --help             > /dev/null
+"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --dry-run -is "$SUITE" > /dev/null
+"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --dry-run "$SUITE"     > /dev/null
 
 # there is a bug in the tracing agent that outputs wrong formatted lines in the resource-config.json file (https://github.com/oracle/graal/issues/7985)
 sed 's/\\\\E//g' src/main/resources/META-INF/native-image/resource-config.json | sed 's/\\\\Q//g' > src/main/resources/META-INF/native-image/resource-config.json.tmp

diff --git a/schema/iguana-schema.json b/schema/iguana-schema.json
@@ -338,7 +338,7 @@
         "duration"
       ]
     },
-    "Pattern": {
+    "Template": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
@@ -356,7 +356,7 @@
       "required": [
         "endpoint"
       ],
-      "title": "Pattern"
+      "title": "Template"
     },
     "QueryMixes": {
       "properties": {
@@ -400,8 +400,8 @@
           "type": "string",
           "enum": [ "", "SPARQL" ]
         },
-        "pattern": {
-          "$ref": "#/definitions/Pattern"
+        "template": {
+          "$ref": "#/definitions/Template"
         }
       },
       "required": [

diff --git a/src/main/resources/iguana-schema.json b/src/main/resources/iguana-schema.json
@@ -338,7 +338,7 @@
         "duration"
       ]
     },
-    "Pattern": {
+    "Template": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
@@ -356,7 +356,7 @@
       "required": [
           "endpoint"
       ],
-      "title": "Pattern"
+      "title": "Template"
     },
     "QueryMixes": {
       "properties": {
@@ -400,8 +400,8 @@
           "type": "string",
           "enum": [ "", "SPARQL" ]
         },
-        "pattern": {
-          "$ref": "#/definitions/Pattern"
+        "template": {
+          "$ref": "#/definitions/Template"
         }
       },
       "required": [

diff --git a/src/test/resources/suite-configs/valid/config-full.yaml b/src/test/resources/suite-configs/valid/config-full.yaml
@@ -53,7 +53,7 @@ tasks:
           path: "./example/suite/queries/"
           format: "folder"
           order: "random"
-          pattern:
+          template:
             endpoint: "http://localhost:3030/sp2b"
             limit: 2000
             save: false