From a06310927896324d27f9c4816df6de9993558b3b Mon Sep 17 00:00:00 2001 From: Silvia Chen <40706003+silviac98@users.noreply.github.com> Date: Thu, 30 Jan 2025 13:57:58 -0800 Subject: [PATCH] Update schema to draft7. definitions to defs (#163) Co-authored-by: Silvia Chen --- package.json | 2 +- scripts/transform.js | 32 +- src/json-schema/bundled.json | 8 +- src/json-schema/partial/base.json | 11 +- src/json-schema/partial/choice_state.json | 696 ++++++++++---------- src/json-schema/partial/common.json | 28 +- src/json-schema/partial/fail_state.json | 6 +- src/json-schema/partial/map_state.json | 56 +- src/json-schema/partial/parallel_state.json | 22 +- src/json-schema/partial/pass_state.json | 12 +- src/json-schema/partial/states.json | 18 +- src/json-schema/partial/succeed_state.json | 8 +- src/json-schema/partial/task_state.json | 37 +- src/json-schema/partial/wait_state.json | 22 +- 14 files changed, 481 insertions(+), 477 deletions(-) diff --git a/package.json b/package.json index 00d78fffc..f19a233e3 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "watch": "tsc -b -w", "test-watch": " NODE_OPTIONS=--experimental-vm-modules jest --watch", "test": "jest --collectCoverage", - "bundle-schema": "node ./scripts/transform.js" + "bundle-schema": "node ./scripts/transform.js && prettier src/json-schema/bundled.json --write" }, "devDependencies": { "@apidevtools/json-schema-ref-parser": "^11.7.3", diff --git a/scripts/transform.js b/scripts/transform.js index 126168f7e..60899568e 100644 --- a/scripts/transform.js +++ b/scripts/transform.js @@ -3,27 +3,25 @@ * SPDX-License-Identifier: MIT */ -const $RefParser = require('@apidevtools/json-schema-ref-parser'); -const path = require('path'); -const fs = require('fs'); -const util = require('util'); +const $RefParser = require('@apidevtools/json-schema-ref-parser') +const path = require('path') +const fs = require('fs') +const util = require('util') -const writeFile = util.promisify(fs.writeFile); +const writeFile = util.promisify(fs.writeFile) -const SCHEMA_PATH = '../src/json-schema/'; -const BUNDLED_FILE_NAME = 'bundled.json'; +const SCHEMA_PATH = '../src/json-schema/' +const BUNDLED_FILE_NAME = 'bundled.json' async function parseSchema() { + try { + const bundled = await $RefParser.bundle(path.resolve(__dirname, SCHEMA_PATH, 'partial/base.json')) + const bundledJSON = JSON.stringify(bundled, null, 2) - try { - const bundled = await $RefParser.bundle(path.resolve(__dirname, SCHEMA_PATH, 'partial/base.json')); - const bundledJSON = JSON.stringify(bundled, null, '\t'); - - writeFile(path.resolve(__dirname, SCHEMA_PATH, BUNDLED_FILE_NAME), bundledJSON); - } - catch (err) { - console.log(err); - } + writeFile(path.resolve(__dirname, SCHEMA_PATH, BUNDLED_FILE_NAME), bundledJSON) + } catch (err) { + console.log(err) + } } -parseSchema(); +parseSchema() diff --git a/src/json-schema/bundled.json b/src/json-schema/bundled.json index 2d5ad0435..c44379aed 100644 --- a/src/json-schema/bundled.json +++ b/src/json-schema/bundled.json @@ -272,7 +272,8 @@ "arn:aws:states:::sqs:sendMessage.waitForTaskToken", "arn:aws:states:::states:startExecution", "arn:aws:states:::states:startExecution.sync", - "arn:aws:states:::states:startExecution.waitForTaskToken" + "arn:aws:states:::states:startExecution.waitForTaskToken", + "arn:aws:states:::http:invoke" ] }, "Parameters": { @@ -2054,6 +2055,7 @@ "properties": { "ReaderConfig": { "type": "object", + "$id": "mapState/ReaderConfig", "description": "A JSON object that specifies where to read the items instead of from the effective input.", "properties": { "InputType": { @@ -2193,6 +2195,7 @@ }, "ResultWriter": { "type": "object", + "$id": "mapState/ResultWriter", "description": "A JSON object that specifies where to write the results instead of to the Map state's result.", "properties": { "Resource": { @@ -2363,5 +2366,6 @@ "enum": ["JSONata", "JSONPath"] } }, - "required": ["States", "StartAt"] + "required": ["States", "StartAt"], + "$defs": {} } diff --git a/src/json-schema/partial/base.json b/src/json-schema/partial/base.json index c43962ede..81d2acdd4 100755 --- a/src/json-schema/partial/base.json +++ b/src/json-schema/partial/base.json @@ -7,10 +7,10 @@ "enum": ["1.0"] }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" }, "TimeoutSeconds": { - "$ref": "common.json#/definitions/seconds", + "$ref": "common.json#/$defs/seconds", "description": "The maximum number of seconds an execution of the state machine can run. If it runs longer than the specified time, the execution fails with a States.Timeout error." }, "StartAt": { @@ -19,11 +19,12 @@ "minLength": 1 }, "States": { - "$ref": "states.json#/definitions/states" + "$ref": "states.json#/$defs/states" }, "QueryLanguage": { - "$ref": "common.json#/definitions/queryLanguage" + "$ref": "common.json#/$defs/queryLanguage" } }, - "required": ["States", "StartAt"] + "required": ["States", "StartAt"], + "$defs": {} } diff --git a/src/json-schema/partial/choice_state.json b/src/json-schema/partial/choice_state.json index a0276f695..e06e95d7b 100755 --- a/src/json-schema/partial/choice_state.json +++ b/src/json-schema/partial/choice_state.json @@ -1,13 +1,13 @@ { - "definitions": { + "$defs": { "choiceState": { "description": "A Choice state adds branching logic to a state machine.", "allOf": [ { - "$ref": "common.json#/definitions/basics" + "$ref": "common.json#/$defs/basics" }, { - "$ref": "common.json#/definitions/inputOutput" + "$ref": "common.json#/$defs/inputOutput" }, { "properties": { @@ -21,134 +21,134 @@ "items": { "oneOf": [ { - "$ref": "#/definitions/jsonataCondition", + "$ref": "#/$defs/jsonataCondition", "errorMessage": "Incorrect type. Expected a valid choice state condition." }, { - "$ref": "#/definitions/topStringEquals" + "$ref": "#/$defs/topStringEquals" }, { - "$ref": "#/definitions/topStringGreaterThan" + "$ref": "#/$defs/topStringGreaterThan" }, { - "$ref": "#/definitions/topStringGreaterThanEquals" + "$ref": "#/$defs/topStringGreaterThanEquals" }, { - "$ref": "#/definitions/topStringLessThan" + "$ref": "#/$defs/topStringLessThan" }, { - "$ref": "#/definitions/topStringLessThanEquals" + "$ref": "#/$defs/topStringLessThanEquals" }, { - "$ref": "#/definitions/topNumericEquals" + "$ref": "#/$defs/topNumericEquals" }, { - "$ref": "#/definitions/topNumericGreaterThan" + "$ref": "#/$defs/topNumericGreaterThan" }, { - "$ref": "#/definitions/topNumericGreaterThanEquals" + "$ref": "#/$defs/topNumericGreaterThanEquals" }, { - "$ref": "#/definitions/topNumericLessThan" + "$ref": "#/$defs/topNumericLessThan" }, { - "$ref": "#/definitions/topNumericLessThanEquals" + "$ref": "#/$defs/topNumericLessThanEquals" }, { - "$ref": "#/definitions/topBooleanEquals" + "$ref": "#/$defs/topBooleanEquals" }, { - "$ref": "#/definitions/topTimestampEquals" + "$ref": "#/$defs/topTimestampEquals" }, { - "$ref": "#/definitions/topTimestampGreaterThan" + "$ref": "#/$defs/topTimestampGreaterThan" }, { - "$ref": "#/definitions/topTimestampGreaterThanEquals" + "$ref": "#/$defs/topTimestampGreaterThanEquals" }, { - "$ref": "#/definitions/topTimestampLessThan" + "$ref": "#/$defs/topTimestampLessThan" }, { - "$ref": "#/definitions/topTimestampLessThanEquals" + "$ref": "#/$defs/topTimestampLessThanEquals" }, { - "$ref": "#/definitions/topAnd" + "$ref": "#/$defs/topAnd" }, { - "$ref": "#/definitions/topOr" + "$ref": "#/$defs/topOr" }, { - "$ref": "#/definitions/topNot" + "$ref": "#/$defs/topNot" }, { - "$ref": "#/definitions/topStringEqualsPath" + "$ref": "#/$defs/topStringEqualsPath" }, { - "$ref": "#/definitions/topStringGreaterThanPath" + "$ref": "#/$defs/topStringGreaterThanPath" }, { - "$ref": "#/definitions/topStringGreaterThanEqualsPath" + "$ref": "#/$defs/topStringGreaterThanEqualsPath" }, { - "$ref": "#/definitions/topStringLessThanPath" + "$ref": "#/$defs/topStringLessThanPath" }, { - "$ref": "#/definitions/topStringLessThanEqualsPath" + "$ref": "#/$defs/topStringLessThanEqualsPath" }, { - "$ref": "#/definitions/topNumericEqualsPath" + "$ref": "#/$defs/topNumericEqualsPath" }, { - "$ref": "#/definitions/topNumericGreaterThanPath" + "$ref": "#/$defs/topNumericGreaterThanPath" }, { - "$ref": "#/definitions/topNumericGreaterThanEqualsPath" + "$ref": "#/$defs/topNumericGreaterThanEqualsPath" }, { - "$ref": "#/definitions/topNumericLessThanPath" + "$ref": "#/$defs/topNumericLessThanPath" }, { - "$ref": "#/definitions/topNumericLessThanEqualsPath" + "$ref": "#/$defs/topNumericLessThanEqualsPath" }, { - "$ref": "#/definitions/topBooleanEqualsPath" + "$ref": "#/$defs/topBooleanEqualsPath" }, { - "$ref": "#/definitions/topTimestampEqualsPath" + "$ref": "#/$defs/topTimestampEqualsPath" }, { - "$ref": "#/definitions/topTimestampGreaterThanPath" + "$ref": "#/$defs/topTimestampGreaterThanPath" }, { - "$ref": "#/definitions/topTimestampGreaterThanEqualsPath" + "$ref": "#/$defs/topTimestampGreaterThanEqualsPath" }, { - "$ref": "#/definitions/topTimestampLessThanPath" + "$ref": "#/$defs/topTimestampLessThanPath" }, { - "$ref": "#/definitions/topTimestampLessThanEqualsPath" + "$ref": "#/$defs/topTimestampLessThanEqualsPath" }, { - "$ref": "#/definitions/topIsNull" + "$ref": "#/$defs/topIsNull" }, { - "$ref": "#/definitions/topIsPresent" + "$ref": "#/$defs/topIsPresent" }, { - "$ref": "#/definitions/topIsNumeric" + "$ref": "#/$defs/topIsNumeric" }, { - "$ref": "#/definitions/topIsString" + "$ref": "#/$defs/topIsString" }, { - "$ref": "#/definitions/topIsBoolean" + "$ref": "#/$defs/topIsBoolean" }, { - "$ref": "#/definitions/topIsTimestamp" + "$ref": "#/$defs/topIsTimestamp" }, { - "$ref": "#/definitions/topStringMatches" + "$ref": "#/$defs/topStringMatches" } ] }, @@ -159,10 +159,10 @@ "description": "The name of the state to transition to if none of the Choice Rules match." }, "Output": { - "$ref": "common.json#/definitions/output" + "$ref": "common.json#/$defs/output" }, "Assign": { - "$ref": "common.json#/definitions/assign" + "$ref": "common.json#/$defs/assign" } }, "required": ["Choices"] @@ -189,18 +189,18 @@ "errorMessage": "Incorrect type. Expected one of boolean, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ] }, "Assign": { - "$ref": "common.json#/definitions/assign" + "$ref": "common.json#/$defs/assign" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["Condition", "Next"] @@ -212,13 +212,13 @@ "type": "string" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringEquals", "Variable", "Next"] @@ -230,13 +230,13 @@ "type": "string" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringLessThan", "Variable", "Next"] @@ -248,13 +248,13 @@ "type": "string" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringGreaterThan", "Variable", "Next"] @@ -266,13 +266,13 @@ "type": "string" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringLessThanEquals", "Variable", "Next"] @@ -284,13 +284,13 @@ "type": "string" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringGreaterThanEquals", "Variable", "Next"] @@ -302,13 +302,13 @@ "type": "number" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericEquals", "Variable", "Next"] @@ -320,13 +320,13 @@ "type": "number" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericLessThan", "Variable", "Next"] @@ -338,13 +338,13 @@ "type": "number" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericGreaterThan", "Variable", "Next"] @@ -356,13 +356,13 @@ "type": "number" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericLessThanEquals", "Variable", "Next"] @@ -374,13 +374,13 @@ "type": "number" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericGreaterThanEquals", "Variable", "Next"] @@ -392,13 +392,13 @@ "type": "boolean" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["BooleanEquals", "Variable", "Next"] @@ -407,16 +407,16 @@ "type": "object", "properties": { "TimestampEquals": { - "$ref": "common.json#/definitions/timestamp" + "$ref": "common.json#/$defs/timestamp" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampEquals", "Variable", "Next"] @@ -425,16 +425,16 @@ "type": "object", "properties": { "TimestampLessThan": { - "$ref": "common.json#/definitions/timestamp" + "$ref": "common.json#/$defs/timestamp" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampLessThan", "Variable", "Next"] @@ -443,16 +443,16 @@ "type": "object", "properties": { "TimestampGreaterThan": { - "$ref": "common.json#/definitions/timestamp" + "$ref": "common.json#/$defs/timestamp" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampGreaterThan", "Variable", "Next"] @@ -461,16 +461,16 @@ "type": "object", "properties": { "TimestampLessThanEquals": { - "$ref": "common.json#/definitions/timestamp" + "$ref": "common.json#/$defs/timestamp" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampLessThanEquals", "Variable", "Next"] @@ -479,16 +479,16 @@ "type": "object", "properties": { "TimestampGreaterThanEquals": { - "$ref": "common.json#/definitions/timestamp" + "$ref": "common.json#/$defs/timestamp" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampGreaterThanEquals", "Variable", "Next"] @@ -497,13 +497,13 @@ "type": "object", "properties": { "And": { - "$ref": "#/definitions/lowerConditions" + "$ref": "#/$defs/lowerConditions" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["And", "Next"] @@ -512,13 +512,13 @@ "type": "object", "properties": { "Or": { - "$ref": "#/definitions/lowerConditions" + "$ref": "#/$defs/lowerConditions" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["Or", "Next"] @@ -527,13 +527,13 @@ "type": "object", "properties": { "Not": { - "$ref": "#/definitions/lowerCondition" + "$ref": "#/$defs/lowerCondition" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["Not", "Next"] @@ -542,16 +542,16 @@ "type": "object", "properties": { "StringEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringEqualsPath", "Variable", "Next"] @@ -560,16 +560,16 @@ "type": "object", "properties": { "StringLessThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringLessThanPath", "Variable", "Next"] @@ -578,16 +578,16 @@ "type": "object", "properties": { "StringGreaterThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringGreaterThanPath", "Variable", "Next"] @@ -596,16 +596,16 @@ "type": "object", "properties": { "StringLessThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringLessThanEqualsPath", "Variable", "Next"] @@ -614,16 +614,16 @@ "type": "object", "properties": { "StringGreaterThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringGreaterThanEqualsPath", "Variable", "Next"] @@ -632,16 +632,16 @@ "type": "object", "properties": { "NumericEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericEqualsPath", "Variable", "Next"] @@ -650,16 +650,16 @@ "type": "object", "properties": { "NumericLessThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericLessThanPath", "Variable", "Next"] @@ -668,16 +668,16 @@ "type": "object", "properties": { "NumericGreaterThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericGreaterThanPath", "Variable", "Next"] @@ -686,16 +686,16 @@ "type": "object", "properties": { "NumericLessThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericLessThanEqualsPath", "Variable", "Next"] @@ -704,16 +704,16 @@ "type": "object", "properties": { "NumericGreaterThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericGreaterThanEqualsPath", "Variable", "Next"] @@ -722,16 +722,16 @@ "type": "object", "properties": { "BooleanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["BooleanEqualsPath", "Variable", "Next"] @@ -740,16 +740,16 @@ "type": "object", "properties": { "TimestampEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampEqualsPath", "Variable", "Next"] @@ -758,16 +758,16 @@ "type": "object", "properties": { "TimestampLessThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampLessThanPath", "Variable", "Next"] @@ -776,16 +776,16 @@ "type": "object", "properties": { "TimestampGreaterThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampGreaterThanPath", "Variable", "Next"] @@ -794,16 +794,16 @@ "type": "object", "properties": { "TimestampLessThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampLessThanEqualsPath", "Variable", "Next"] @@ -812,16 +812,16 @@ "type": "object", "properties": { "TimestampGreaterThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampGreaterThanEqualsPath", "Variable", "Next"] @@ -833,13 +833,13 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsNull", "Variable", "Next"] @@ -851,13 +851,13 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsPresent", "Variable", "Next"] @@ -869,13 +869,13 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsNumeric", "Variable", "Next"] @@ -887,13 +887,13 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsString", "Variable", "Next"] @@ -905,13 +905,13 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsBoolean", "Variable", "Next"] @@ -923,13 +923,13 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsTimestamp", "Variable", "Next"] @@ -941,152 +941,151 @@ "type": "string" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Next": { - "$ref": "#/definitions/next" + "$ref": "#/$defs/next" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringMatches", "Variable", "Next"] }, - "lowerConditions": { "type": "array", "minItems": 1, "items": { - "$ref": "#/definitions/lowerCondition" + "$ref": "#/$defs/lowerCondition" } }, "lowerCondition": { "oneOf": [ { - "$ref": "#/definitions/nestedStringEquals" + "$ref": "#/$defs/nestedStringEquals" }, { - "$ref": "#/definitions/nestedStringLessThan" + "$ref": "#/$defs/nestedStringLessThan" }, { - "$ref": "#/definitions/nestedStringGreaterThan" + "$ref": "#/$defs/nestedStringGreaterThan" }, { - "$ref": "#/definitions/nestedStringLessThanEquals" + "$ref": "#/$defs/nestedStringLessThanEquals" }, { - "$ref": "#/definitions/nestedStringGreaterThanEquals" + "$ref": "#/$defs/nestedStringGreaterThanEquals" }, { - "$ref": "#/definitions/nestedNumericEquals" + "$ref": "#/$defs/nestedNumericEquals" }, { - "$ref": "#/definitions/nestedNumericLessThan" + "$ref": "#/$defs/nestedNumericLessThan" }, { - "$ref": "#/definitions/nestedNumericGreaterThan" + "$ref": "#/$defs/nestedNumericGreaterThan" }, { - "$ref": "#/definitions/nestedNumericLessThanEquals" + "$ref": "#/$defs/nestedNumericLessThanEquals" }, { - "$ref": "#/definitions/nestedNumericGreaterThanEquals" + "$ref": "#/$defs/nestedNumericGreaterThanEquals" }, { - "$ref": "#/definitions/nestedBooleanEquals" + "$ref": "#/$defs/nestedBooleanEquals" }, { - "$ref": "#/definitions/nestedTimestampEquals" + "$ref": "#/$defs/nestedTimestampEquals" }, { - "$ref": "#/definitions/nestedTimestampLessThan" + "$ref": "#/$defs/nestedTimestampLessThan" }, { - "$ref": "#/definitions/nestedTimestampGreaterThan" + "$ref": "#/$defs/nestedTimestampGreaterThan" }, { - "$ref": "#/definitions/nestedTimestampLessThanEquals" + "$ref": "#/$defs/nestedTimestampLessThanEquals" }, { - "$ref": "#/definitions/nestedTimestampGreaterThanEquals" + "$ref": "#/$defs/nestedTimestampGreaterThanEquals" }, { - "$ref": "#/definitions/nestedAnd" + "$ref": "#/$defs/nestedAnd" }, { - "$ref": "#/definitions/nestedOr" + "$ref": "#/$defs/nestedOr" }, { - "$ref": "#/definitions/nestedNot" + "$ref": "#/$defs/nestedNot" }, { - "$ref": "#/definitions/nestedStringEqualsPath" + "$ref": "#/$defs/nestedStringEqualsPath" }, { - "$ref": "#/definitions/nestedStringLessThanPath" + "$ref": "#/$defs/nestedStringLessThanPath" }, { - "$ref": "#/definitions/nestedStringGreaterThanPath" + "$ref": "#/$defs/nestedStringGreaterThanPath" }, { - "$ref": "#/definitions/nestedStringLessThanEqualsPath" + "$ref": "#/$defs/nestedStringLessThanEqualsPath" }, { - "$ref": "#/definitions/nestedStringGreaterThanEqualsPath" + "$ref": "#/$defs/nestedStringGreaterThanEqualsPath" }, { - "$ref": "#/definitions/nestedNumericEqualsPath" + "$ref": "#/$defs/nestedNumericEqualsPath" }, { - "$ref": "#/definitions/nestedNumericLessThanPath" + "$ref": "#/$defs/nestedNumericLessThanPath" }, { - "$ref": "#/definitions/nestedNumericGreaterThanPath" + "$ref": "#/$defs/nestedNumericGreaterThanPath" }, { - "$ref": "#/definitions/nestedNumericLessThanEqualsPath" + "$ref": "#/$defs/nestedNumericLessThanEqualsPath" }, { - "$ref": "#/definitions/nestedNumericGreaterThanEqualsPath" + "$ref": "#/$defs/nestedNumericGreaterThanEqualsPath" }, { - "$ref": "#/definitions/nestedBooleanEqualsPath" + "$ref": "#/$defs/nestedBooleanEqualsPath" }, { - "$ref": "#/definitions/nestedTimestampEqualsPath" + "$ref": "#/$defs/nestedTimestampEqualsPath" }, { - "$ref": "#/definitions/nestedTimestampLessThanPath" + "$ref": "#/$defs/nestedTimestampLessThanPath" }, { - "$ref": "#/definitions/nestedTimestampGreaterThanPath" + "$ref": "#/$defs/nestedTimestampGreaterThanPath" }, { - "$ref": "#/definitions/nestedTimestampLessThanEqualsPath" + "$ref": "#/$defs/nestedTimestampLessThanEqualsPath" }, { - "$ref": "#/definitions/nestedTimestampGreaterThanEqualsPath" + "$ref": "#/$defs/nestedTimestampGreaterThanEqualsPath" }, { - "$ref": "#/definitions/nestedIsNull" + "$ref": "#/$defs/nestedIsNull" }, { - "$ref": "#/definitions/nestedIsPresent" + "$ref": "#/$defs/nestedIsPresent" }, { - "$ref": "#/definitions/nestedIsNumeric" + "$ref": "#/$defs/nestedIsNumeric" }, { - "$ref": "#/definitions/nestedIsString" + "$ref": "#/$defs/nestedIsString" }, { - "$ref": "#/definitions/nestedIsBoolean" + "$ref": "#/$defs/nestedIsBoolean" }, { - "$ref": "#/definitions/nestedIsTimestamp" + "$ref": "#/$defs/nestedIsTimestamp" }, { - "$ref": "#/definitions/nestedStringMatches" + "$ref": "#/$defs/nestedStringMatches" } ] }, @@ -1097,10 +1096,10 @@ "type": "string" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringEquals", "Variable"] @@ -1112,10 +1111,10 @@ "type": "string" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringLessThan", "Variable"] @@ -1127,10 +1126,10 @@ "type": "string" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringGreaterThan", "Variable"] @@ -1142,10 +1141,10 @@ "type": "string" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringLessThanEquals", "Variable"] @@ -1157,10 +1156,10 @@ "type": "string" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringGreaterThanEquals", "Variable"] @@ -1172,10 +1171,10 @@ "type": "number" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericEquals", "Variable"] @@ -1187,10 +1186,10 @@ "type": "number" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericLessThan", "Variable"] @@ -1202,10 +1201,10 @@ "type": "number" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericGreaterThan", "Variable"] @@ -1217,10 +1216,10 @@ "type": "number" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericLessThanEquals", "Variable"] @@ -1232,10 +1231,10 @@ "type": "number" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericGreaterThanEquals", "Variable"] @@ -1247,10 +1246,10 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["BooleanEquals", "Variable"] @@ -1259,13 +1258,13 @@ "type": "object", "properties": { "TimestampEquals": { - "$ref": "common.json#/definitions/timestamp" + "$ref": "common.json#/$defs/timestamp" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampEquals", "Variable"] @@ -1274,13 +1273,13 @@ "type": "object", "properties": { "TimestampLessThan": { - "$ref": "common.json#/definitions/timestamp" + "$ref": "common.json#/$defs/timestamp" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampLessThan", "Variable"] @@ -1289,13 +1288,13 @@ "type": "object", "properties": { "TimestampGreaterThan": { - "$ref": "common.json#/definitions/timestamp" + "$ref": "common.json#/$defs/timestamp" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampGreaterThan", "Variable"] @@ -1304,13 +1303,13 @@ "type": "object", "properties": { "TimestampLessThanEquals": { - "$ref": "common.json#/definitions/timestamp" + "$ref": "common.json#/$defs/timestamp" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampLessThanEquals", "Variable"] @@ -1319,13 +1318,13 @@ "type": "object", "properties": { "TimestampGreaterThanEquals": { - "$ref": "common.json#/definitions/timestamp" + "$ref": "common.json#/$defs/timestamp" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampGreaterThanEquals", "Variable"] @@ -1334,10 +1333,10 @@ "type": "object", "properties": { "And": { - "$ref": "#/definitions/lowerConditions" + "$ref": "#/$defs/lowerConditions" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["And"] @@ -1346,10 +1345,10 @@ "type": "object", "properties": { "Or": { - "$ref": "#/definitions/lowerConditions" + "$ref": "#/$defs/lowerConditions" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["Or"] @@ -1358,26 +1357,25 @@ "type": "object", "properties": { "Not": { - "$ref": "#/definitions/lowerCondition" + "$ref": "#/$defs/lowerCondition" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["Not"] }, - "nestedStringEqualsPath": { "type": "object", "properties": { "StringEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringEqualsPath", "Variable"] @@ -1386,13 +1384,13 @@ "type": "object", "properties": { "StringLessThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringLessThanPath", "Variable"] @@ -1401,13 +1399,13 @@ "type": "object", "properties": { "StringGreaterThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringGreaterThanPath", "Variable"] @@ -1416,13 +1414,13 @@ "type": "object", "properties": { "StringLessThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringLessThanEqualsPath", "Variable"] @@ -1431,13 +1429,13 @@ "type": "object", "properties": { "StringGreaterThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringGreaterThanEqualsPath", "Variable"] @@ -1446,13 +1444,13 @@ "type": "object", "properties": { "NumericEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericEqualsPath", "Variable"] @@ -1461,13 +1459,13 @@ "type": "object", "properties": { "NumericLessThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericLessThanPath", "Variable"] @@ -1476,13 +1474,13 @@ "type": "object", "properties": { "NumericGreaterThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericGreaterThanPath", "Variable"] @@ -1491,13 +1489,13 @@ "type": "object", "properties": { "NumericLessThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericLessThanEqualsPath", "Variable"] @@ -1506,13 +1504,13 @@ "type": "object", "properties": { "NumericGreaterThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "#/definitions/variable" + "$ref": "#/$defs/variable" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["NumericGreaterThanEqualsPath", "Variable"] @@ -1521,13 +1519,13 @@ "type": "object", "properties": { "BooleanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["BooleanEqualsPath", "Variable"] @@ -1536,13 +1534,13 @@ "type": "object", "properties": { "TimestampEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampEqualsPath", "Variable"] @@ -1551,13 +1549,13 @@ "type": "object", "properties": { "TimestampLessThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampLessThanPath", "Variable"] @@ -1566,13 +1564,13 @@ "type": "object", "properties": { "TimestampGreaterThanPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampGreaterThanPath", "Variable"] @@ -1581,13 +1579,13 @@ "type": "object", "properties": { "TimestampLessThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampLessThanEqualsPath", "Variable"] @@ -1596,13 +1594,13 @@ "type": "object", "properties": { "TimestampGreaterThanEqualsPath": { - "$ref": "common.json#/definitions/path" + "$ref": "common.json#/$defs/path" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["TimestampGreaterThanEqualsPath", "Variable"] @@ -1614,10 +1612,10 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsNull", "Variable"] @@ -1629,10 +1627,10 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsPresent", "Variable"] @@ -1644,10 +1642,10 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsNumeric", "Variable"] @@ -1659,10 +1657,10 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsString", "Variable"] @@ -1674,10 +1672,10 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsBoolean", "Variable"] @@ -1689,10 +1687,10 @@ "type": "boolean" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["IsTimestamp", "Variable"] @@ -1704,10 +1702,10 @@ "type": "string" }, "Variable": { - "$ref": "common.json#/definitions/referencePath" + "$ref": "common.json#/$defs/referencePath" }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" } }, "required": ["StringMatches", "Variable"] diff --git a/src/json-schema/partial/common.json b/src/json-schema/partial/common.json index 3716b26cb..e4f5d7fe9 100755 --- a/src/json-schema/partial/common.json +++ b/src/json-schema/partial/common.json @@ -1,5 +1,5 @@ { - "definitions": { + "$defs": { "basics": { "type": "object", "properties": { @@ -10,10 +10,10 @@ "enum": ["Pass", "Succeed", "Fail", "Task", "Choice", "Wait", "Parallel", "Map"] }, "QueryLanguage": { - "$ref": "#/definitions/queryLanguage" + "$ref": "#/$defs/queryLanguage" }, "Comment": { - "$ref": "#/definitions/comment" + "$ref": "#/$defs/comment" } }, "required": ["Type"] @@ -35,7 +35,7 @@ "description": "A path that specifies where to place the Result, relative to the raw input. If the raw input has a field at the location addressed by the ResultPath value then in the output that field is discarded and overwritten by the state's result. Otherwise, a new field is created in the state output, with intervening fields constructed as necessary.", "oneOf": [ { - "$ref": "#/definitions/referencePath" + "$ref": "#/$defs/referencePath" }, { "type": "null" @@ -154,11 +154,11 @@ "type": "object", "properties": { "ErrorEquals": { - "$ref": "#/definitions/errors", + "$ref": "#/$defs/errors", "description": "A non-empty array of Error Names. The retry policy for this Retrier is implemented if the reported error matches one of the Error Names." }, "IntervalSeconds": { - "$ref": "#/definitions/seconds", + "$ref": "#/$defs/seconds", "description": "A positive integer representing the number of seconds before the first retry attempt. (Default: 1, Maximum: 99999999)" }, "MaxAttempts": { @@ -170,10 +170,10 @@ "BackoffRate": { "type": "number", "description": "A number (>= 1) which is the multiplier that increases the retry interval on each attempt. (Default: 2.0)", - "minimum": 1.0 + "minimum": 1 }, "Comment": { - "$ref": "#/definitions/comment" + "$ref": "#/$defs/comment" }, "MaxDelaySeconds": { "type": "integer", @@ -198,7 +198,7 @@ "type": "object", "properties": { "ErrorEquals": { - "$ref": "#/definitions/errors", + "$ref": "#/$defs/errors", "description": "A non-empty array of Error Names. The state machine transitions to this Catcher's fallback state if the reported error matches one of the Error Names." }, "Next": { @@ -209,7 +209,7 @@ "ResultPath": { "oneOf": [ { - "$ref": "#/definitions/referencePath", + "$ref": "#/$defs/referencePath", "description": "A path that specifies where to place the Result, relative to the raw input. If the raw input has a field at the location addressed by the ResultPath value then in the output that field is discarded and overwritten by the state's result. Otherwise, a new field is created in the state output, with intervening fields constructed as necessary." }, { @@ -218,13 +218,13 @@ ] }, "Output": { - "$ref": "#/definitions/output" + "$ref": "#/$defs/output" }, "Comment": { - "$ref": "#/definitions/comment" + "$ref": "#/$defs/comment" }, "Assign": { - "$ref": "#/definitions/assign" + "$ref": "#/$defs/assign" } }, "required": ["ErrorEquals", "Next"] @@ -237,7 +237,7 @@ "errorMessage": "Incorrect type. Expected one of object, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "An object or JSONata expression to define the Argument of this task state." diff --git a/src/json-schema/partial/fail_state.json b/src/json-schema/partial/fail_state.json index 41345fc1e..e2c7c23c0 100755 --- a/src/json-schema/partial/fail_state.json +++ b/src/json-schema/partial/fail_state.json @@ -1,10 +1,10 @@ { - "definitions": { + "$defs": { "failState": { "description": "A Fail state stops the execution of the state machine and marks it as a failure.", "allOf": [ { - "$ref": "common.json#/definitions/basics" + "$ref": "common.json#/$defs/basics" }, { "properties": { @@ -12,7 +12,7 @@ "enum": ["Fail"] }, "Comment": { - "$ref": "common.json#/definitions/comment" + "$ref": "common.json#/$defs/comment" }, "Error": { "type": "string", diff --git a/src/json-schema/partial/map_state.json b/src/json-schema/partial/map_state.json index a15ab120a..b9abc12f8 100755 --- a/src/json-schema/partial/map_state.json +++ b/src/json-schema/partial/map_state.json @@ -1,16 +1,16 @@ { - "definitions": { + "$defs": { "mapState": { "description": "The Map state can be used to run a set of steps for each element of an input array. While the Parallel state executes multiple branches of steps using the same input, a Map state will execute the same steps for multiple entries of an array in the state input.", "allOf": [ { - "$ref": "common.json#/definitions/basics" + "$ref": "common.json#/$defs/basics" }, { - "$ref": "common.json#/definitions/inputOutputResult" + "$ref": "common.json#/$defs/inputOutputResult" }, { - "$ref": "common.json#/definitions/endOrTransition" + "$ref": "common.json#/$defs/endOrTransition" }, { "properties": { @@ -18,15 +18,15 @@ "enum": ["Map"] }, "Parameters": { - "$ref": "common.json#/definitions/parameters", + "$ref": "common.json#/$defs/parameters", "description": "Used to pass information to the API actions of connected resources. The Parameters can use a mix of static JSON, JsonPath and intrinsic functions." }, "ResultSelector": { - "$ref": "common.json#/definitions/resultSelector", + "$ref": "common.json#/$defs/resultSelector", "description": "Used to transform the result. The ResultSelector can use a mix of static JSON, JsonPath and intrinsic functions." }, "ItemsPath": { - "$ref": "common.json#/definitions/referencePath", + "$ref": "common.json#/$defs/referencePath", "description": "Reference path identifying where in the effective input the array field is found." }, "Iterator": { @@ -39,7 +39,7 @@ "minLength": 1 }, "States": { - "$ref": "states.json#/definitions/states" + "$ref": "states.json#/$defs/states" } }, "required": ["StartAt", "States"] @@ -50,6 +50,7 @@ "properties": { "ReaderConfig": { "type": "object", + "$id": "mapState/ReaderConfig", "description": "A JSON object that specifies where to read the items instead of from the effective input.", "properties": { "InputType": { @@ -78,14 +79,14 @@ "errorMessage": "Incorrect type. Expected one of integer, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "An integer or JSONata expression that limits the number of data items passed to the Map state.", "minimum": 0 }, "MaxItemsPath": { - "$ref": "common.json#/definitions/referencePath", + "$ref": "common.json#/$defs/referencePath", "description": "A reference path to an integer that limits the number of data items passed to the Map state." } } @@ -96,7 +97,7 @@ "examples": ["arn:aws:states:::s3:getObject", "arn:aws:states:::s3:listObjectsV2"] }, "Arguments": { - "$ref": "common.json#/definitions/arguments", + "$ref": "common.json#/$defs/arguments", "description": "A JSON object or JSONata expression that specifies the Amazon S3 bucket name and object key or prefix in which the dataset is stored.", "properties": { "Bucket": { @@ -158,14 +159,14 @@ "errorMessage": "Incorrect type. Expected one of integer, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "An integer or JSONata expression that limits the maximum number of items of each sub-array.", "minimum": 1 }, "MaxItemsPerBatchPath": { - "$ref": "common.json#/definitions/referencePath", + "$ref": "common.json#/$defs/referencePath", "description": "A reference path to an integer that limits the maximum number of items of each sub-array." }, "MaxInputBytesPerBatch": { @@ -175,20 +176,21 @@ "errorMessage": "Incorrect type. Expected one of integer, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "An integer or JSONata expression that limits the maximum size in bytes of each sub-array.", "minimum": 1 }, "MaxInputBytesPerBatchPath": { - "$ref": "common.json#/definitions/referencePath", + "$ref": "common.json#/$defs/referencePath", "description": "A reference path to an integer that limits the maximum size in bytes of each sub-array." } } }, "ResultWriter": { "type": "object", + "$id": "mapState/ResultWriter", "description": "A JSON object that specifies where to write the results instead of to the Map state's result.", "properties": { "Resource": { @@ -197,7 +199,7 @@ "examples": ["arn:aws:states:::s3:putObject"] }, "Arguments": { - "$ref": "common.json#/definitions/arguments", + "$ref": "common.json#/$defs/arguments", "description": "A JSON object that specifies the Amazon S3 resource to export the results to.", "properties": { "Bucket": { @@ -258,7 +260,7 @@ "minLength": 1 }, "States": { - "$ref": "states.json#/definitions/states" + "$ref": "states.json#/$defs/states" } }, "required": ["StartAt", "States"] @@ -275,7 +277,7 @@ "errorMessage": "Incorrect type. Expected one of integer, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "An integer or JSONata expression that provides an upper bound on the percentage of items that may fail.", @@ -283,7 +285,7 @@ "maximum": 100 }, "ToleratedFailurePercentagePath": { - "$ref": "common.json#/definitions/referencePath", + "$ref": "common.json#/$defs/referencePath", "description": "A reference path to an integer that provides an upper bound on the percentage of items that may fail." }, "ToleratedFailureCount": { @@ -293,14 +295,14 @@ "errorMessage": "Incorrect type. Expected one of integer, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "An integer or JSONata expression that provides an upper bound on how many items may fail.", "minimum": 0 }, "ToleratedFailureCountPath": { - "$ref": "common.json#/definitions/referencePath", + "$ref": "common.json#/$defs/referencePath", "description": "A reference path to an integer that provides an upper bound on how many items may fail." }, "MaxConcurrency": { @@ -310,23 +312,23 @@ "errorMessage": "Incorrect type. Expected one of integer, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "Provides an upper bound on how many invocations of the Iterator may run in parallel.\n\nThe default value is 0, which places no limit on parallelism and iterations are invoked as concurrently as possible.", "minimum": 0 }, "MaxConcurrencyPath": { - "$ref": "common.json#/definitions/referencePath", + "$ref": "common.json#/$defs/referencePath", "description": "A reference path to an integer that provides an upper bound on how many invocations of the Iterator may run in parallel.", "minimum": 0 }, "Retry": { - "$ref": "common.json#/definitions/retry", + "$ref": "common.json#/$defs/retry", "description": "Contains an array of objects, called Retriers, that define a retry policy if the state encounters runtime errors." }, "Catch": { - "$ref": "common.json#/definitions/catch", + "$ref": "common.json#/$defs/catch", "description": "Contains an array of objects, called Catchers, that define a fallback state. This state is executed if the state encounters runtime errors and its retry policy is exhausted or isn't defined." }, "Items": { @@ -336,13 +338,13 @@ "errorMessage": "Incorrect type. Expected one of array, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "An array or JSONata expression identifying where in the state input the array field is found." }, "Output": { - "$ref": "common.json#/definitions/output" + "$ref": "common.json#/$defs/output" } } } diff --git a/src/json-schema/partial/parallel_state.json b/src/json-schema/partial/parallel_state.json index 0002c72d2..b21457f62 100755 --- a/src/json-schema/partial/parallel_state.json +++ b/src/json-schema/partial/parallel_state.json @@ -1,16 +1,16 @@ { - "definitions": { + "$defs": { "parallelState": { "description": "The Parallel state can be used to create parallel branches of execution in your state machine.", "allOf": [ { - "$ref": "common.json#/definitions/basics" + "$ref": "common.json#/$defs/basics" }, { - "$ref": "common.json#/definitions/inputOutputResult" + "$ref": "common.json#/$defs/inputOutputResult" }, { - "$ref": "common.json#/definitions/endOrTransition" + "$ref": "common.json#/$defs/endOrTransition" }, { "properties": { @@ -18,11 +18,11 @@ "enum": ["Parallel"] }, "Parameters": { - "$ref": "common.json#/definitions/parameters", + "$ref": "common.json#/$defs/parameters", "description": "Used to pass information to the API actions of connected resources. The Parameters can use a mix of static JSON, JsonPath and intrinsic functions." }, "ResultSelector": { - "$ref": "common.json#/definitions/resultSelector", + "$ref": "common.json#/$defs/resultSelector", "description": "Used to transform the result. The ResultSelector can use a mix of static JSON, JsonPath and intrinsic functions." }, "Branches": { @@ -37,25 +37,25 @@ "description": "A string that must exactly match (is case sensitive) the name of one of the state objects." }, "States": { - "$ref": "states.json#/definitions/states" + "$ref": "states.json#/$defs/states" } }, "required": ["StartAt", "States"] } }, "Retry": { - "$ref": "common.json#/definitions/retry", + "$ref": "common.json#/$defs/retry", "description": "Contains an array of objects, called Retriers, that define a retry policy if the state encounters runtime errors." }, "Catch": { - "$ref": "common.json#/definitions/catch", + "$ref": "common.json#/$defs/catch", "description": "Contains an array of objects, called Catchers, that define a fallback state. This state is executed if the state encounters runtime errors and its retry policy is exhausted or isn't defined." }, "Arguments": { - "$ref": "common.json#/definitions/arguments" + "$ref": "common.json#/$defs/arguments" }, "Output": { - "$ref": "common.json#/definitions/output" + "$ref": "common.json#/$defs/output" } }, "required": ["Branches"] diff --git a/src/json-schema/partial/pass_state.json b/src/json-schema/partial/pass_state.json index 9004b8410..80c45faab 100755 --- a/src/json-schema/partial/pass_state.json +++ b/src/json-schema/partial/pass_state.json @@ -1,16 +1,16 @@ { - "definitions": { + "$defs": { "passState": { "description": "A Pass state passes its input to its output, without performing work. Pass states are useful when constructing and debugging state machines.", "allOf": [ { - "$ref": "common.json#/definitions/basics" + "$ref": "common.json#/$defs/basics" }, { - "$ref": "common.json#/definitions/inputOutputResult" + "$ref": "common.json#/$defs/inputOutputResult" }, { - "$ref": "common.json#/definitions/endOrTransition" + "$ref": "common.json#/$defs/endOrTransition" }, { "properties": { @@ -18,11 +18,11 @@ "enum": ["Pass"] }, "Parameters": { - "$ref": "common.json#/definitions/parameters", + "$ref": "common.json#/$defs/parameters", "description": "Used to pass information to the API actions of connected resources. The Parameters can use a mix of static JSON, JsonPath and intrinsic functions." }, "Output": { - "$ref": "common.json#/definitions/output" + "$ref": "common.json#/$defs/output" } } } diff --git a/src/json-schema/partial/states.json b/src/json-schema/partial/states.json index 5574879ff..3501585c2 100755 --- a/src/json-schema/partial/states.json +++ b/src/json-schema/partial/states.json @@ -1,33 +1,33 @@ { - "definitions": { + "$defs": { "states": { "type": "object", "description": "An object containing a comma-delimited set of states.", "additionalProperties": { "oneOf": [ { - "$ref": "pass_state.json#/definitions/passState" + "$ref": "pass_state.json#/$defs/passState" }, { - "$ref": "succeed_state.json#/definitions/succeedState" + "$ref": "succeed_state.json#/$defs/succeedState" }, { - "$ref": "fail_state.json#/definitions/failState" + "$ref": "fail_state.json#/$defs/failState" }, { - "$ref": "task_state.json#/definitions/taskState" + "$ref": "task_state.json#/$defs/taskState" }, { - "$ref": "choice_state.json#/definitions/choiceState" + "$ref": "choice_state.json#/$defs/choiceState" }, { - "$ref": "wait_state.json#/definitions/waitState" + "$ref": "wait_state.json#/$defs/waitState" }, { - "$ref": "parallel_state.json#/definitions/parallelState" + "$ref": "parallel_state.json#/$defs/parallelState" }, { - "$ref": "map_state.json#/definitions/mapState" + "$ref": "map_state.json#/$defs/mapState" } ] } diff --git a/src/json-schema/partial/succeed_state.json b/src/json-schema/partial/succeed_state.json index f81f71fec..590d3d316 100755 --- a/src/json-schema/partial/succeed_state.json +++ b/src/json-schema/partial/succeed_state.json @@ -1,13 +1,13 @@ { - "definitions": { + "$defs": { "succeedState": { "description": "A Succeed state stops an execution successfully. The Succeed state is a useful target for Choice state branches that don't do anything but stop the execution.", "allOf": [ { - "$ref": "common.json#/definitions/basics" + "$ref": "common.json#/$defs/basics" }, { - "$ref": "common.json#/definitions/inputOutput" + "$ref": "common.json#/$defs/inputOutput" }, { "properties": { @@ -15,7 +15,7 @@ "enum": ["Succeed"] }, "Output": { - "$ref": "common.json#/definitions/output" + "$ref": "common.json#/$defs/output" } } } diff --git a/src/json-schema/partial/task_state.json b/src/json-schema/partial/task_state.json index 8fcaec2e1..89471da50 100755 --- a/src/json-schema/partial/task_state.json +++ b/src/json-schema/partial/task_state.json @@ -1,16 +1,16 @@ { - "definitions": { + "$defs": { "taskState": { "description": "A Task state represents a single unit of work performed by a state machine.\nAll work in your state machine is done by tasks. A task performs work identified by the state’s Resource field, which is often an AWS Lambda function or other Step Functions service integrations.", "allOf": [ { - "$ref": "common.json#/definitions/basics" + "$ref": "common.json#/$defs/basics" }, { - "$ref": "common.json#/definitions/inputOutputResult" + "$ref": "common.json#/$defs/inputOutputResult" }, { - "$ref": "common.json#/definitions/endOrTransition" + "$ref": "common.json#/$defs/endOrTransition" }, { "properties": { @@ -66,65 +66,66 @@ "arn:aws:states:::sqs:sendMessage.waitForTaskToken", "arn:aws:states:::states:startExecution", "arn:aws:states:::states:startExecution.sync", - "arn:aws:states:::states:startExecution.waitForTaskToken" + "arn:aws:states:::states:startExecution.waitForTaskToken", + "arn:aws:states:::http:invoke" ] }, "Parameters": { - "$ref": "common.json#/definitions/parameters", + "$ref": "common.json#/$defs/parameters", "description": "Used to pass information to the API actions of connected resources. The Parameters can use a mix of static JSON, JsonPath and intrinsic functions." }, "ResultSelector": { - "$ref": "common.json#/definitions/resultSelector", + "$ref": "common.json#/$defs/resultSelector", "description": "Used to transform the result. The ResultSelector can use a mix of static JSON, JsonPath and intrinsic functions." }, "TimeoutSeconds": { "oneOf": [ { - "$ref": "common.json#/definitions/seconds", + "$ref": "common.json#/$defs/seconds", "errorMessage": "Incorrect type. Expected one of integer, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "If the task runs longer than the specified seconds, this state fails with a States.Timeout error name. Must be a positive, non-zero integer, or a jsonata expression. If not provided, the default value is 99999999. The count begins after the task has been started, for example, when ActivityStarted or LambdaFunctionStarted are logged in the Execution event history." }, "TimeoutSecondsPath": { - "$ref": "common.json#/definitions/path", + "$ref": "common.json#/$defs/path", "description": "If the task runs longer than the specified seconds, this state fails with a States.Timeout error. Specified using JsonPath syntax, to select the value from the state's input data." }, "HeartbeatSeconds": { "oneOf": [ { - "$ref": "common.json#/definitions/seconds", + "$ref": "common.json#/$defs/seconds", "errorMessage": "Incorrect type. Expected one of integer, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "If more time than the specified seconds elapses between heartbeats from the task, this state fails with a States.Timeout error name. Must be a positive, non-zero integer less than the number of seconds specified in the TimeoutSeconds field, or a jsonata expression. If not provided, the default value is 99999999. For Activities, the count begins when GetActivityTask receives a token and ActivityStarted is logged in the Execution event history." }, "HeartbeatSecondsPath": { - "$ref": "common.json#/definitions/path", + "$ref": "common.json#/$defs/path", "description": "If more time than the specified seconds elapses between heartbeats from the task, this state fails with a States.Timeout error. Specified using JsonPath syntax, to select the value from the state's input data." }, "Retry": { - "$ref": "common.json#/definitions/retry", + "$ref": "common.json#/$defs/retry", "description": "An array of objects, called Retriers, that define a retry policy if the state encounters runtime errors." }, "Catch": { - "$ref": "common.json#/definitions/catch", + "$ref": "common.json#/$defs/catch", "description": "An array of objects, called Catchers, that define a fallback state. This state is executed if the state encounters runtime errors and its retry policy is exhausted or isn't defined." }, "Arguments": { - "$ref": "common.json#/definitions/arguments" + "$ref": "common.json#/$defs/arguments" }, "Output": { - "$ref": "common.json#/definitions/output" + "$ref": "common.json#/$defs/output" }, "Assign": { - "$ref": "common.json#/definitions/assign", + "$ref": "common.json#/$defs/assign", "description": "An object to define the variables to be assigned." } }, diff --git a/src/json-schema/partial/wait_state.json b/src/json-schema/partial/wait_state.json index f3f1514c0..0809c7be3 100755 --- a/src/json-schema/partial/wait_state.json +++ b/src/json-schema/partial/wait_state.json @@ -1,16 +1,16 @@ { - "definitions": { + "$defs": { "waitState": { "description": "A Wait state delays the state machine from continuing for a specified time. You can choose either a relative time, specified in seconds from when the state begins, or an absolute end time, specified as a timestamp.", "allOf": [ { - "$ref": "common.json#/definitions/basics" + "$ref": "common.json#/$defs/basics" }, { - "$ref": "common.json#/definitions/inputOutput" + "$ref": "common.json#/$defs/inputOutput" }, { - "$ref": "common.json#/definitions/endOrTransition" + "$ref": "common.json#/$defs/endOrTransition" }, { "properties": { @@ -20,11 +20,11 @@ "Seconds": { "oneOf": [ { - "$ref": "common.json#/definitions/seconds", + "$ref": "common.json#/$defs/seconds", "errorMessage": "Incorrect type. Expected one of integer, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "A time, in seconds, to wait before beginning the state specified in the \"Next\" field." @@ -32,25 +32,25 @@ "Timestamp": { "oneOf": [ { - "$ref": "common.json#/definitions/timestamp", + "$ref": "common.json#/$defs/timestamp", "errorMessage": "Incorrect type. Expected one of timestamp, JSONata expression." }, { - "$ref": "common.json#/definitions/jsonata" + "$ref": "common.json#/$defs/jsonata" } ], "description": "An absolute time to wait until beginning the state specified in the \"Next\" field.\n\nTimestamps must conform to the RFC3339 profile of ISO 8601, with the further restrictions that an uppercase T must separate the date and time portions, and an uppercase Z must denote that a numeric time zone offset is not present, for example, 2016-08-18T17:33:00Z." }, "SecondsPath": { - "$ref": "common.json#/definitions/referencePath", + "$ref": "common.json#/$defs/referencePath", "description": "A time, in seconds, to wait before beginning the state specified in the \"Next\" field, specified using a path from the state's input data." }, "TimestampPath": { - "$ref": "common.json#/definitions/referencePath", + "$ref": "common.json#/$defs/referencePath", "description": "An absolute time to wait until beginning the state specified in the \"Next\" field, specified using a path from the state's input data." }, "Output": { - "$ref": "common.json#/definitions/output" + "$ref": "common.json#/$defs/output" } }, "oneOf": [