diff --git a/.flake8 b/.flake8 index c56dba3ab..fc708eaf8 100644 --- a/.flake8 +++ b/.flake8 @@ -2,4 +2,4 @@ exclude = .git,.tox,__pycache__,dist,.venv*,docs,build max-line-length = 90 # black related: W503/W504 conflict, black causes E203 -ignore = W503,W504,E203,B019 +extend-ignore = W503,W504,E203,B019 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6f5d7fa3a..cf630c3e3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -11,7 +11,7 @@ jobs: py: ["3.x"] include: - toxenv: py-mindeps - py: "3.8" + py: "3.9" runs-on: ubuntu-latest name: "Run '${{ matrix.toxenv }}' on python ${{ matrix.py }}" @@ -62,7 +62,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - py: ['3.8', '3.9', '3.10', '3.11', '3.12'] + py: ['3.9', '3.10', '3.11', '3.12', '3.13'] name: "Run tests on ${{ matrix.os }}, py${{ matrix.py }}" runs-on: ${{ matrix.os }} steps: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index af26a129a..b523ee613 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: # dogfood - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.29.4 + rev: 0.30.0 hooks: - id: check-dependabot - id: check-github-workflows @@ -39,7 +39,7 @@ repos: hooks: - id: isort - repo: https://github.com/asottile/pyupgrade - rev: v3.19.0 + rev: v3.19.1 hooks: - id: pyupgrade - args: ["--py37-plus"] + args: ["--py39-plus"] diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml index 42abd1d61..6f0e0e09c 100644 --- a/.pre-commit-hooks.yaml +++ b/.pre-commit-hooks.yaml @@ -24,7 +24,7 @@ - id: check-azure-pipelines name: Validate Azure Pipelines description: 'Validate Azure Pipelines config against the schema provided by Microsoft' - entry: check-jsonschema --builtin-schema vendor.azure-pipelines --data-transform azure-pipelines + entry: check-jsonschema --builtin-schema vendor.azure-pipelines --data-transform azure-pipelines --regex-variant nonunicode language: python files: ^(\.)?azure-pipelines\.(yml|yaml)$ types: [yaml] diff --git a/.readthedocs.yml b/.readthedocs.yml index 568d8ab30..0818c2f44 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -4,9 +4,9 @@ sphinx: configuration: docs/conf.py build: - os: ubuntu-20.04 + os: ubuntu-24.04 tools: - python: "3.10" + python: "3.13" python: install: @@ -14,4 +14,3 @@ python: path: . extra_requirements: - docs - diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 40d781222..7f6db5d9e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,26 @@ Unreleased .. vendor-insert-here +0.31.0 +------ + +- Update vendored schemas: azure-pipelines, bamboo-spec, buildkite, circle-ci, + dependabot, gitlab-ci, mergify, readthedocs, renovate, taskfile (2025-01-07) +- Drop support for Python 3.8 +- Rename ``--format-regex`` to ``--regex-variant`` and convert + ``--format-regex`` to a deprecated alias. + It will be removed in a future release. +- Regular expression interpretation in ``"pattern"``, ``"patternProperties"``, and + ``"format": "regex"`` usages now uses unicode-mode JS regular expressions by + default. (:issue:`353`) + + - Use ``--regex-variant nonunicode`` to get non-unicode JS regular + expressions, the default behavior from previous versions. + - Custom validators may be impacted by the new regular expression + features. Validators are now always modified with the ``jsonschema`` + library's ``extend()`` API to control the ``pattern`` and + ``patternProperties`` keywords. + 0.30.0 ------ diff --git a/README.md b/README.md index ffdb930c1..73bb8c742 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ files. ```yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-github-workflows args: ["--verbose"] diff --git a/docs/optional_parsers.rst b/docs/optional_parsers.rst index fa5063c48..be86e9ec6 100644 --- a/docs/optional_parsers.rst +++ b/docs/optional_parsers.rst @@ -20,7 +20,7 @@ For example, .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-renovate additional_dependencies: ['pyjson5'] @@ -45,7 +45,7 @@ For example, .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-jsonschema name: 'Check GitHub Workflows' diff --git a/docs/precommit_usage.rst b/docs/precommit_usage.rst index 0c6f6bea7..e24836e07 100644 --- a/docs/precommit_usage.rst +++ b/docs/precommit_usage.rst @@ -17,7 +17,7 @@ You must specify a schema using pre-commit ``args`` configuration. :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-jsonschema files: ^data/.*\.json$ @@ -34,7 +34,7 @@ Validate JSON Schema files against their matching metaschema, as specified in th :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-metaschema files: ^schemas/.*\.json$ @@ -52,7 +52,7 @@ Validate Azure Pipelines config against the schema provided by Microsoft :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-azure-pipelines @@ -66,7 +66,7 @@ Validate Bamboo Specs against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-bamboo-spec @@ -80,7 +80,7 @@ Validate Bitbucket Pipelines against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-bitbucket-pipelines @@ -94,7 +94,7 @@ Validate Buildkite Pipelines against the schema provided by Buildkite :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-buildkite @@ -108,7 +108,7 @@ Validate CircleCI config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-circle-ci @@ -122,7 +122,7 @@ Validate Google Cloud Build config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-cloudbuild @@ -136,7 +136,7 @@ Validate Dependabot Config (v2) against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-dependabot @@ -150,7 +150,7 @@ Validate Drone-CI Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-drone-ci @@ -164,7 +164,7 @@ Validate GitHub Actions against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-github-actions @@ -178,7 +178,7 @@ Validate GitHub Workflows against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-github-workflows @@ -192,7 +192,7 @@ Validate GitLab CI config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-gitlab-ci @@ -206,7 +206,7 @@ Validate Mergify config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-mergify @@ -220,7 +220,7 @@ Validate ReadTheDocs config against the schema provided by ReadTheDocs :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-readthedocs @@ -234,7 +234,7 @@ Validate Renovate config against the schema provided by Renovate (does not suppo :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-renovate @@ -248,7 +248,7 @@ Validate Taskfile config against the schema provided by Task :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-taskfile @@ -262,7 +262,7 @@ Validate Travis Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-travis @@ -276,7 +276,7 @@ Validate Woodpecker Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-woodpecker-ci @@ -302,7 +302,7 @@ manually, you could do this: .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-jsonschema name: "Check GitHub Workflows" @@ -321,7 +321,7 @@ To check with the builtin schema that a GitHub workflow sets .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-jsonschema name: "Check GitHub Workflows set timeout-minutes" diff --git a/docs/usage.rst b/docs/usage.rst index 56a5bb12a..7de004e75 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -183,11 +183,12 @@ Example usage: # disables all three of time, date-time, and iri --disable-formats time,date-time --disable-formats iri -``--format-regex`` +``--regex-variant`` ~~~~~~~~~~~~~~~~~~ -Set a mode for handling of the ``"regex"`` value for ``"format"``. The modes are as -follows: +Set a mode for handling of the ``"regex"`` value for ``"format"`` and the mode +for ``"pattern"`` and ``"patternProperties"`` interpretation. +The modes are as follows: .. list-table:: Regex Options :widths: 15 30 @@ -196,9 +197,11 @@ follows: * - mode - description * - default - - Require the regex to be valid in ECMAScript regex syntax. + - Use ECMAScript regex syntax. + * - nonunicode + - Use ECMAScript regex syntax, but without unicode escapes enabled. * - python - - Require the regex to be valid in Python regex syntax. + - Use Python regex syntax. Other Options -------------- diff --git a/pyproject.toml b/pyproject.toml index 8d615227d..eb0ca06e0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "check-jsonschema" -version = "0.30.0" +version = "0.31.0" description = "A jsonschema CLI and pre-commit hook" authors = [ { name = "Stephen Rosen", email = "sirosen0@gmail.com" }, @@ -15,13 +15,12 @@ classifiers = [ "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3", ] -requires-python = ">=3.8" +requires-python = ">=3.9" dependencies = [ - 'importlib-resources>=1.4.0;python_version<"3.9"', 'tomli>=2.0;python_version<"3.11"', - "ruamel.yaml==0.18.6", + "ruamel.yaml==0.18.7", "jsonschema>=4.18.0,<5.0", - "regress>=0.4.0", + "regress>=2024.11.1", "requests<3.0", "click>=8,<9", ] diff --git a/src/check_jsonschema/builtin_schemas/__init__.py b/src/check_jsonschema/builtin_schemas/__init__.py index e0656853b..e9a89e02b 100644 --- a/src/check_jsonschema/builtin_schemas/__init__.py +++ b/src/check_jsonschema/builtin_schemas/__init__.py @@ -1,12 +1,6 @@ from __future__ import annotations -try: - # first, try to import the installed package version - import importlib_resources -except ImportError: - # if it's not installed, assume that the stdlib version is new enough (e.g. py3.10) - import importlib.resources as importlib_resources # type: ignore[no-redef] - +import importlib.resources import json import typing as t @@ -20,7 +14,7 @@ def _get(package: str, resource: str, name: str) -> dict[str, t.Any]: return t.cast( "dict[str, t.Any]", json.loads( - importlib_resources.files(package).joinpath(resource).read_bytes() + importlib.resources.files(package).joinpath(resource).read_bytes() ), ) except (FileNotFoundError, ModuleNotFoundError): diff --git a/src/check_jsonschema/builtin_schemas/vendor/azure-pipelines.json b/src/check_jsonschema/builtin_schemas/vendor/azure-pipelines.json index b8e2f3108..f57384467 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/azure-pipelines.json +++ b/src/check_jsonschema/builtin_schemas/vendor/azure-pipelines.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://github.com/Microsoft/azure-pipelines-vscode/blob/main/service-schema.json", - "$comment": "v1.247.3", + "$comment": "v1.183.0", "title": "Pipeline schema", "description": "A pipeline definition", "oneOf": [ @@ -4096,11 +4096,10 @@ }, { "description": "Run a PowerShell script within an Azure environment", - "deprecationMessage": "AzurePowerShell is deprecated - Run a PowerShell script within an Azure environment", - "doNotSuggest": true, + "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzurePowerShell@2" + "AzurePowerShell@5" ] }, { @@ -4109,7 +4108,7 @@ "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "AzurePowerShell@3" + "AzurePowerShell@2" ] }, { @@ -4122,10 +4121,11 @@ }, { "description": "Run a PowerShell script within an Azure environment", - "doNotSuggest": false, + "deprecationMessage": "AzurePowerShell is deprecated - Run a PowerShell script within an Azure environment", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "AzurePowerShell@5" + "AzurePowerShell@3" ] }, { @@ -4150,7 +4150,7 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "PipAuthenticate@0" + "PipAuthenticate@1" ] }, { @@ -4158,7 +4158,7 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "PipAuthenticate@1" + "PipAuthenticate@0" ] }, { @@ -4247,19 +4247,19 @@ ] }, { - "description": "Deploy the web project to the AzureRM Web App using Web Deploy", + "description": "Deploy to Azure App Service a web, mobile, or API app using Docker, Java, .NET, .NET Core, Node.js, PHP, Python, or Ruby", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureRMWebAppDeployment@1" + "AzureRmWebAppDeployment@4" ] }, { - "description": "Deploy to Azure App Service a web, mobile, or API app using Docker, Java, .NET, .NET Core, Node.js, PHP, Python, or Ruby", + "description": "Execute PowerShell scripts on remote machines using PSSession and Invoke-Command for remoting", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureRmWebAppDeployment@4" + "PowerShellOnTargetMachines@3" ] }, { @@ -4271,38 +4271,30 @@ ] }, { - "description": "Execute PowerShell scripts on remote machines using PSSession and Invoke-Command for remoting", + "description": "Execute PowerShell scripts on remote machine(s)", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "PowerShellOnTargetMachines@3" + "PowerShellOnTargetMachines@2" ] }, { - "description": "Execute PowerShell scripts on remote machine(s)", + "description": "Publish any of the code coverage results from a build", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "PowerShellOnTargetMachines@2" + "PublishCodeCoverageResults@2" ] }, { - "description": "[DEPRECATION WARNING! Users are recommended to switch to version 2*.] Publish Cobertura or JaCoCo code coverage results from a build", - "deprecationMessage": "PublishCodeCoverageResults is deprecated - [DEPRECATION WARNING! Users are recommended to switch to version 2*.] Publish Cobertura or JaCoCo code coverage results from a build", + "description": "Publish Cobertura or JaCoCo code coverage results from a build", + "deprecationMessage": "PublishCodeCoverageResults is deprecated - Publish Cobertura or JaCoCo code coverage results from a build", "doNotSuggest": true, "ignoreCase": "value", "enum": [ "PublishCodeCoverageResults@1" ] }, - { - "description": "Publish any of the code coverage results from a build", - "doNotSuggest": false, - "ignoreCase": "value", - "enum": [ - "PublishCodeCoverageResults@2" - ] - }, { "description": "Deprecated: This task and it’s companion task (Visual Studio Test Agent Deployment) are deprecated. Use the 'Visual Studio Test' task instead. The VSTest task can run unit as well as functional tests. Run tests on one or more agents using the multi-agent job setting. Use the 'Visual Studio Test Platform' task to run tests without needing Visual Studio on the agent. VSTest task also brings new capabilities such as automatically rerunning failed tests.", "deprecationMessage": "RunVisualStudioTestsusingTestAgent is deprecated - Deprecated: This task and it’s companion task (Visual Studio Test Agent Deployment) are deprecated. Use the 'Visual Studio Test' task instead. The VSTest task can run unit as well as functional tests. Run tests on one or more agents using the multi-agent job setting. Use the 'Visual Studio Test Platform' task to run tests without needing Visual Studio on the agent. VSTest task also brings new capabilities such as automatically rerunning failed tests.", @@ -4312,22 +4304,6 @@ "RunVisualStudioTestsusingTestAgent@1" ] }, - { - "description": "Pause deployment and wait for intervention", - "doNotSuggest": false, - "ignoreCase": "value", - "enum": [ - "ManualIntervention@6" - ] - }, - { - "description": "Pause deployment and wait for intervention", - "doNotSuggest": false, - "ignoreCase": "value", - "enum": [ - "ManualIntervention@7" - ] - }, { "description": "Pause deployment and wait for manual intervention", "doNotSuggest": false, @@ -4354,7 +4330,8 @@ }, { "description": "[DEPRECATED] Finish the analysis and upload the results to SonarQube", - "doNotSuggest": false, + "deprecationMessage": "SonarQubePostTest is deprecated - [DEPRECATED] Finish the analysis and upload the results to SonarQube", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ "SonarQubePostTest@1" @@ -4420,19 +4397,19 @@ ] }, { - "description": "Build, tag, push, or run Docker images, or run a Docker command", + "description": "Build or push Docker images, login or logout, start or stop containers, or run a Docker command", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "Docker@1" + "Docker@2" ] }, { - "description": "Build or push Docker images, login or logout, start or stop containers, or run a Docker command", + "description": "Build, tag, push, or run Docker images, or run a Docker command", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "Docker@2" + "Docker@1" ] }, { @@ -4453,19 +4430,19 @@ }, { "description": "Upload files using FTP", - "deprecationMessage": "FtpUpload is deprecated - Upload files using FTP", - "doNotSuggest": true, + "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "FtpUpload@1" + "FtpUpload@2" ] }, { "description": "Upload files using FTP", - "doNotSuggest": false, + "deprecationMessage": "FtpUpload is deprecated - Upload files using FTP", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "FtpUpload@2" + "FtpUpload@1" ] }, { @@ -4616,6 +4593,14 @@ "JavaToolInstaller@0" ] }, + { + "description": "Acquire a specific version of Java from a user-supplied Azure blob or the tool cache and sets JAVA_HOME", + "doNotSuggest": false, + "ignoreCase": "value", + "enum": [ + "JavaToolInstaller@1" + ] + }, { "description": "Deploy to Chef environments by editing environment attributes", "deprecationMessage": "Chef is deprecated - Deploy to Chef environments by editing environment attributes", @@ -4630,7 +4615,7 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureFunctionApp@2" + "AzureFunctionApp@1" ] }, { @@ -4638,7 +4623,7 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureFunctionApp@1" + "AzureFunctionApp@2" ] }, { @@ -4802,11 +4787,11 @@ ] }, { - "description": "Build an Xcode workspace on Mac OS", + "description": "Build, test, or archive an Xcode workspace on macOS. Optionally package an app.", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "Xcode@2" + "Xcode@5" ] }, { @@ -4826,11 +4811,11 @@ ] }, { - "description": "Build, test, or archive an Xcode workspace on macOS. Optionally package an app.", + "description": "Build an Xcode workspace on Mac OS", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "Xcode@5" + "Xcode@2" ] }, { @@ -5087,7 +5072,7 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "PublishTestResults@1" + "PublishTestResults@2" ] }, { @@ -5095,58 +5080,58 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "PublishTestResults@2" + "PublishTestResults@1" ] }, { "description": "Copy files to Azure Blob Storage or virtual machines", - "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", - "doNotSuggest": true, + "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureFileCopy@1" + "AzureFileCopy@5" ] }, { "description": "Copy files to Azure Blob Storage or virtual machines", - "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", - "doNotSuggest": true, + "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureFileCopy@2" + "AzureFileCopy@6" ] }, { "description": "Copy files to Azure Blob Storage or virtual machines", - "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", - "doNotSuggest": true, + "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureFileCopy@3" + "AzureFileCopy@4" ] }, { "description": "Copy files to Azure Blob Storage or virtual machines", - "doNotSuggest": false, + "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "AzureFileCopy@4" + "AzureFileCopy@2" ] }, { "description": "Copy files to Azure Blob Storage or virtual machines", - "doNotSuggest": false, + "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "AzureFileCopy@5" + "AzureFileCopy@3" ] }, { "description": "Copy files to Azure Blob Storage or virtual machines", - "doNotSuggest": false, + "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "AzureFileCopy@6" + "AzureFileCopy@1" ] }, { @@ -5256,6 +5241,14 @@ "JenkinsDownloadArtifacts@1" ] }, + { + "description": "Download artifacts produced by a Jenkins job", + "doNotSuggest": false, + "ignoreCase": "value", + "enum": [ + "JenkinsDownloadArtifacts@2" + ] + }, { "description": "Update a function app with a Docker container", "doNotSuggest": false, @@ -5277,7 +5270,7 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "HelmDeploy@0" + "HelmDeploy@1" ] }, { @@ -5285,7 +5278,7 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "HelmDeploy@1" + "HelmDeploy@0" ] }, { @@ -5370,7 +5363,8 @@ }, { "description": "[DEPRECATED] Fetch the Quality Profile from SonarQube to configure the analysis", - "doNotSuggest": false, + "deprecationMessage": "SonarQubePreBuild is deprecated - [DEPRECATED] Fetch the Quality Profile from SonarQube to configure the analysis", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ "SonarQubePreBuild@1" @@ -5485,12 +5479,11 @@ ] }, { - "description": "Run tests with Visual Studio test runner", - "deprecationMessage": "VSTest is deprecated - Run tests with Visual Studio test runner", - "doNotSuggest": true, + "description": "Run unit and functional tests (Selenium, Appium, Coded UI test, etc.) using the Visual Studio Test (VsTest) runner. Test frameworks that have a Visual Studio test adapter such as MsTest, xUnit, NUnit, Chutzpah (for JavaScript tests using QUnit, Mocha and Jasmine), etc. can be run. Tests can be distributed on multiple agents using this task (version 2 and later).", + "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "VSTest@1" + "VSTest@2" ] }, { @@ -5498,15 +5491,16 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "VSTest@2" + "VSTest@3" ] }, { - "description": "Run unit and functional tests (Selenium, Appium, Coded UI test, etc.) using the Visual Studio Test (VsTest) runner. Test frameworks that have a Visual Studio test adapter such as MsTest, xUnit, NUnit, Chutzpah (for JavaScript tests using QUnit, Mocha and Jasmine), etc. can be run. Tests can be distributed on multiple agents using this task (version 2 and later).", - "doNotSuggest": false, + "description": "Run tests with Visual Studio test runner", + "deprecationMessage": "VSTest is deprecated - Run tests with Visual Studio test runner", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "VSTest@3" + "VSTest@1" ] }, { @@ -5514,7 +5508,7 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "ManualValidation@0" + "ManualValidation@1" ] }, { @@ -5522,7 +5516,7 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "ManualValidation@1" + "ManualValidation@0" ] }, { @@ -5609,12 +5603,11 @@ ] }, { - "description": "Acquire a specific version of the .NET Core SDK from the internet or local cache and add it to the PATH", - "deprecationMessage": "DotNetCoreInstaller is deprecated - Acquire a specific version of the .NET Core SDK from the internet or local cache and add it to the PATH", - "doNotSuggest": true, + "description": "Acquires a specific version of the .NET Core SDK from the internet or the local cache and adds it to the PATH. Use this task to change the version of .NET Core used in subsequent tasks. Additionally provides proxy support.", + "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "DotNetCoreInstaller@0" + "UseDotNet@2" ] }, { @@ -5623,15 +5616,16 @@ "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "DotNetCoreInstaller@1" + "DotNetCoreInstaller@0" ] }, { - "description": "Acquires a specific version of the .NET Core SDK from the internet or the local cache and adds it to the PATH. Use this task to change the version of .NET Core used in subsequent tasks. Additionally provides proxy support.", - "doNotSuggest": false, + "description": "Acquire a specific version of the .NET Core SDK from the internet or local cache and add it to the PATH", + "deprecationMessage": "DotNetCoreInstaller is deprecated - Acquire a specific version of the .NET Core SDK from the internet or local cache and add it to the PATH", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "UseDotNet@2" + "DotNetCoreInstaller@1" ] }, { @@ -5668,19 +5662,19 @@ }, { "description": "Replace tokens with variable values in XML or JSON configuration files", - "deprecationMessage": "FileTransform is deprecated - Replace tokens with variable values in XML or JSON configuration files", - "doNotSuggest": true, + "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "FileTransform@1" + "FileTransform@2" ] }, { "description": "Replace tokens with variable values in XML or JSON configuration files", - "doNotSuggest": false, + "deprecationMessage": "FileTransform is deprecated - Replace tokens with variable values in XML or JSON configuration files", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "FileTransform@2" + "FileTransform@1" ] }, { @@ -5702,7 +5696,8 @@ }, { "description": "[DEPRECATED] Use the Copy Files task and the Publish Build Artifacts task instead", - "doNotSuggest": false, + "deprecationMessage": "CopyPublishBuildArtifacts is deprecated - [DEPRECATED] Use the Copy Files task and the Publish Build Artifacts task instead", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ "CopyPublishBuildArtifacts@1" @@ -5734,20 +5729,20 @@ ] }, { - "description": "Deploy an Azure Resource Manager (ARM) template to all the deployment scopes", - "doNotSuggest": false, + "description": "Deploy, start, stop, delete Azure Resource Groups", + "deprecationMessage": "AzureResourceGroupDeployment is deprecated - Deploy, start, stop, delete Azure Resource Groups", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "AzureResourceManagerTemplateDeployment@3" + "AzureResourceGroupDeployment@1" ] }, { - "description": "Deploy, start, stop, delete Azure Resource Groups", - "deprecationMessage": "AzureResourceGroupDeployment is deprecated - Deploy, start, stop, delete Azure Resource Groups", - "doNotSuggest": true, + "description": "Deploy an Azure Resource Manager (ARM) template to all the deployment scopes", + "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureResourceGroupDeployment@1" + "AzureResourceManagerTemplateDeployment@3" ] }, { @@ -5815,19 +5810,19 @@ ] }, { - "description": "Run an npm command. Use NpmAuthenticate@0 task for latest capabilities.", + "description": "Install and publish npm packages, or run an npm command. Supports npmjs.com and authenticated registries like Azure Artifacts.", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "Npm@0" + "Npm@1" ] }, { - "description": "Install and publish npm packages, or run an npm command. Supports npmjs.com and authenticated registries like Azure Artifacts.", + "description": "Run an npm command. Use NpmAuthenticate@0 task for latest capabilities.", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "Npm@1" + "Npm@0" ] }, { @@ -5839,19 +5834,19 @@ ] }, { - "description": "Finds or downloads and caches the specified version spec of Node.js and adds it to the PATH", + "description": "Set up a Node.js environment and add it to the PATH, additionally providing proxy support", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "NodeTool@0" + "UseNode@1" ] }, { - "description": "Set up a Node.js environment and add it to the PATH, additionally providing proxy support", + "description": "Finds or downloads and caches the specified version spec of Node.js and adds it to the PATH", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "UseNode@1" + "NodeTool@0" ] }, { @@ -5953,44 +5948,44 @@ ] }, { - "description": "Run Azure CLI commands against an Azure subscription in a PowerShell Core/Shell script when running on Linux agent or PowerShell/PowerShell Core/Batch script when running on Windows agent.", + "description": "Run Azure CLI commands against an Azure subscription in a Shell script when running on Linux agent or Batch script when running on Windows agent.", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureCLI@2" + "AzureCLI@1" ] }, { - "description": "Run Azure CLI commands against an Azure subscription in a Shell script when running on Linux agent or Batch script when running on Windows agent.", + "description": "Run a Shell or Batch script with Azure CLI commands against an azure subscription", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureCLI@1" + "AzureCLI@0" ] }, { - "description": "Run a Shell or Batch script with Azure CLI commands against an azure subscription", + "description": "Run Azure CLI commands against an Azure subscription in a PowerShell Core/Shell script when running on Linux agent or PowerShell/PowerShell Core/Batch script when running on Windows agent.", "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "AzureCLI@0" + "AzureCLI@2" ] }, { "description": "Create, edit, or delete a GitHub release", - "deprecationMessage": "GitHubRelease is deprecated - Create, edit, or delete a GitHub release", - "doNotSuggest": true, + "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "GitHubRelease@0" + "GitHubRelease@1" ] }, { "description": "Create, edit, or delete a GitHub release", - "doNotSuggest": false, + "deprecationMessage": "GitHubRelease is deprecated - Create, edit, or delete a GitHub release", + "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "GitHubRelease@1" + "GitHubRelease@0" ] }, { @@ -6066,14 +6061,6 @@ "Bash@3" ] }, - { - "description": "Run a shell script using bash", - "doNotSuggest": false, - "ignoreCase": "value", - "enum": [ - "ShellScript@1" - ] - }, { "description": "Publish build artifacts to Azure Pipelines or a Windows file share", "doNotSuggest": false, @@ -6129,7 +6116,7 @@ "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "AzureCloudPowerShellDeployment@1" + "AzureCloudPowerShellDeployment@2" ] }, { @@ -6138,7 +6125,7 @@ "doNotSuggest": true, "ignoreCase": "value", "enum": [ - "AzureCloudPowerShellDeployment@2" + "AzureCloudPowerShellDeployment@1" ] }, { @@ -6440,30 +6427,11 @@ "task": { "description": "Azure PowerShell\n\nRun a PowerShell script within an Azure environment", "ignoreCase": "value", - "pattern": "^AzurePowerShell@2$" + "pattern": "^AzurePowerShell@5$" }, "inputs": { "description": "Azure PowerShell inputs", "properties": { - "azureConnectionType": { - "description": "Azure Connection Type", - "ignoreCase": "all", - "enum": [ - "ConnectedServiceName", - "ConnectedServiceNameARM" - ], - "aliases": [ - "ConnectedServiceNameSelector" - ] - }, - "azureClassicSubscription": { - "type": "string", - "description": "Azure Classic Subscription", - "ignoreCase": "key", - "aliases": [ - "ConnectedServiceName" - ] - }, "azureSubscription": { "type": "string", "description": "Azure Subscription", @@ -6495,6 +6463,20 @@ "description": "Script Arguments", "ignoreCase": "key" }, + "errorActionPreference": { + "description": "ErrorActionPreference", + "ignoreCase": "all", + "enum": [ + "stop", + "continue", + "silentlyContinue" + ] + }, + "FailOnStandardError": { + "type": "boolean", + "description": "Fail on Standard Error", + "ignoreCase": "key" + }, "azurePowerShellVersion": { "description": "Azure PowerShell Version", "ignoreCase": "all", @@ -6513,19 +6495,36 @@ "aliases": [ "CustomTargetAzurePs" ] + }, + "pwsh": { + "type": "boolean", + "description": "Use PowerShell Core", + "ignoreCase": "key" + }, + "validateScriptSignature": { + "type": "boolean", + "description": "Validate script signature", + "ignoreCase": "key" + }, + "workingDirectory": { + "type": "string", + "description": "Working Directory", + "ignoreCase": "key" } }, "additionalProperties": false, - "required": [] + "required": [ + "azureSubscription" + ] } }, - "deprecationMessage": "AzurePowerShell is deprecated - Run a PowerShell script within an Azure environment", - "doNotSuggest": true, + "doNotSuggest": false, "firstProperty": [ "task" ], "required": [ - "task" + "task", + "inputs" ] }, { @@ -6533,7 +6532,7 @@ "task": { "description": "Azure PowerShell\n\nRun a PowerShell script within an Azure environment", "ignoreCase": "value", - "pattern": "^AzurePowerShell@3$" + "pattern": "^AzurePowerShell@2$" }, "inputs": { "description": "Azure PowerShell inputs", @@ -6588,20 +6587,6 @@ "description": "Script Arguments", "ignoreCase": "key" }, - "errorActionPreference": { - "description": "ErrorActionPreference", - "ignoreCase": "all", - "enum": [ - "stop", - "continue", - "silentlyContinue" - ] - }, - "FailOnStandardError": { - "type": "boolean", - "description": "Fail on Standard Error", - "ignoreCase": "key" - }, "azurePowerShellVersion": { "description": "Azure PowerShell Version", "ignoreCase": "all", @@ -6620,11 +6605,6 @@ "aliases": [ "CustomTargetAzurePs" ] - }, - "validateScriptSignature": { - "type": "boolean", - "description": "Validate script signature", - "ignoreCase": "key" } }, "additionalProperties": false, @@ -6755,11 +6735,30 @@ "task": { "description": "Azure PowerShell\n\nRun a PowerShell script within an Azure environment", "ignoreCase": "value", - "pattern": "^AzurePowerShell@5$" + "pattern": "^AzurePowerShell@3$" }, "inputs": { "description": "Azure PowerShell inputs", "properties": { + "azureConnectionType": { + "description": "Azure Connection Type", + "ignoreCase": "all", + "enum": [ + "ConnectedServiceName", + "ConnectedServiceNameARM" + ], + "aliases": [ + "ConnectedServiceNameSelector" + ] + }, + "azureClassicSubscription": { + "type": "string", + "description": "Azure Classic Subscription", + "ignoreCase": "key", + "aliases": [ + "ConnectedServiceName" + ] + }, "azureSubscription": { "type": "string", "description": "Azure Subscription", @@ -6824,35 +6823,23 @@ "CustomTargetAzurePs" ] }, - "pwsh": { - "type": "boolean", - "description": "Use PowerShell Core", - "ignoreCase": "key" - }, "validateScriptSignature": { "type": "boolean", "description": "Validate script signature", "ignoreCase": "key" - }, - "workingDirectory": { - "type": "string", - "description": "Working Directory", - "ignoreCase": "key" } }, "additionalProperties": false, - "required": [ - "azureSubscription" - ] + "required": [] } }, - "doNotSuggest": false, + "deprecationMessage": "AzurePowerShell is deprecated - Run a PowerShell script within an Azure environment", + "doNotSuggest": true, "firstProperty": [ "task" ], "required": [ - "task", - "inputs" + "task" ] }, { @@ -6995,26 +6982,44 @@ "task": { "description": "Python pip authenticate\n\nAuthentication task for the pip client used for installing Python distributions", "ignoreCase": "value", - "pattern": "^PipAuthenticate@0$" + "pattern": "^PipAuthenticate@1$" }, "inputs": { "description": "Python pip authenticate inputs", "properties": { + "azureDevOpsServiceConnection": { + "type": "string", + "description": "'Azure DevOps' Service Connection", + "ignoreCase": "key", + "aliases": [ + "workloadIdentityServiceConnection" + ] + }, + "feedUrl": { + "type": "string", + "description": "Azure Artifacts Feeds url.", + "ignoreCase": "key" + }, "artifactFeeds": { "type": "string", "description": "My feeds (select below)", "ignoreCase": "key", "aliases": [ - "feedList" + "artifactFeeds" ] }, - "externalFeeds": { + "pythonDownloadServiceConnections": { "type": "string", "description": "Feeds from external organizations", "ignoreCase": "key", "aliases": [ - "externalSources" + "pythonDownloadServiceConnections" ] + }, + "onlyAddExtraIndex": { + "type": "boolean", + "description": "Don't set primary index URL", + "ignoreCase": "key" } }, "additionalProperties": false, @@ -7034,44 +7039,26 @@ "task": { "description": "Python pip authenticate\n\nAuthentication task for the pip client used for installing Python distributions", "ignoreCase": "value", - "pattern": "^PipAuthenticate@1$" + "pattern": "^PipAuthenticate@0$" }, "inputs": { "description": "Python pip authenticate inputs", "properties": { - "azureDevOpsServiceConnection": { - "type": "string", - "description": "'Azure DevOps' Service Connection", - "ignoreCase": "key", - "aliases": [ - "workloadIdentityServiceConnection" - ] - }, - "feedUrl": { - "type": "string", - "description": "Azure Artifacts Feeds url.", - "ignoreCase": "key" - }, "artifactFeeds": { "type": "string", "description": "My feeds (select below)", "ignoreCase": "key", "aliases": [ - "artifactFeeds" + "feedList" ] }, - "pythonDownloadServiceConnections": { + "externalFeeds": { "type": "string", "description": "Feeds from external organizations", "ignoreCase": "key", "aliases": [ - "pythonDownloadServiceConnections" + "externalSources" ] - }, - "onlyAddExtraIndex": { - "type": "boolean", - "description": "Don't set primary index URL", - "ignoreCase": "key" } }, "additionalProperties": false, @@ -8493,6 +8480,11 @@ "type": "string", "description": "Working directory", "ignoreCase": "key" + }, + "requestTimeout": { + "type": "integer", + "description": "Set timeout for package download request", + "ignoreCase": "key" } }, "additionalProperties": false, @@ -9026,99 +9018,6 @@ "inputs" ] }, - { - "properties": { - "task": { - "description": "AzureRM Web App Deployment\n\nDeploy the web project to the AzureRM Web App using Web Deploy", - "ignoreCase": "value", - "pattern": "^AzureRMWebAppDeployment@1$" - }, - "inputs": { - "description": "AzureRM Web App Deployment inputs", - "properties": { - "ConnectedServiceName": { - "type": "string", - "description": "AzureRM Subscription", - "ignoreCase": "key" - }, - "WebAppName": { - "type": "string", - "description": "Web App Name", - "ignoreCase": "key" - }, - "DeployToSlotFlag": { - "type": "boolean", - "description": "Deploy to Slot", - "ignoreCase": "key" - }, - "ResourceGroupName": { - "type": "string", - "description": "Resource Group", - "ignoreCase": "key" - }, - "SlotName": { - "type": "string", - "description": "Slot", - "ignoreCase": "key" - }, - "Package": { - "type": "string", - "description": "Package", - "ignoreCase": "key" - }, - "SetParametersFile": { - "type": "string", - "description": "SetParameters File", - "ignoreCase": "key" - }, - "RemoveAdditionalFilesFlag": { - "type": "boolean", - "description": "Remove Additional Files at Destination", - "ignoreCase": "key" - }, - "ExcludeFilesFromAppDataFlag": { - "type": "boolean", - "description": "Exclude Files from the App_Data Folder", - "ignoreCase": "key" - }, - "TakeAppOfflineFlag": { - "type": "boolean", - "description": "Take App Offline", - "ignoreCase": "key" - }, - "VirtualApplication": { - "type": "string", - "description": "Virtual Application", - "ignoreCase": "key" - }, - "AdditionalArguments": { - "type": "string", - "description": "Additional Arguments", - "ignoreCase": "key" - }, - "WebAppUri": { - "type": "string", - "description": "Web App Hosted Url", - "ignoreCase": "key" - } - }, - "additionalProperties": false, - "required": [ - "ConnectedServiceName", - "WebAppName", - "Package" - ] - } - }, - "doNotSuggest": false, - "firstProperty": [ - "task" - ], - "required": [ - "task", - "inputs" - ] - }, { "properties": { "task": { @@ -9366,99 +9265,6 @@ "task" ] }, - { - "properties": { - "task": { - "description": "PowerShell on Target Machines\n\nExecute PowerShell scripts on remote machine(s)", - "ignoreCase": "value", - "pattern": "^PowerShellOnTargetMachines@1$" - }, - "inputs": { - "description": "PowerShell on Target Machines inputs", - "properties": { - "EnvironmentName": { - "type": "string", - "description": "Machines", - "ignoreCase": "key" - }, - "AdminUserName": { - "type": "string", - "description": "Admin Login", - "ignoreCase": "key" - }, - "AdminPassword": { - "type": "string", - "description": "Password", - "ignoreCase": "key" - }, - "Protocol": { - "description": "Protocol", - "ignoreCase": "all", - "enum": [ - "Http", - "Https" - ] - }, - "TestCertificate": { - "type": "boolean", - "description": "Test Certificate", - "ignoreCase": "key" - }, - "ScriptPath": { - "type": "string", - "description": "PowerShell Script", - "ignoreCase": "key" - }, - "ScriptArguments": { - "type": "string", - "description": "Script Arguments", - "ignoreCase": "key" - }, - "InitializationScriptPath": { - "type": "string", - "description": "Initialization Script", - "ignoreCase": "key" - }, - "SessionVariables": { - "type": "string", - "description": "Session Variables", - "ignoreCase": "key" - }, - "RunPowershellInParallel": { - "type": "boolean", - "description": "Run PowerShell in Parallel", - "ignoreCase": "key" - }, - "ResourceFilteringMethod": { - "description": "Select Machines By", - "ignoreCase": "all", - "enum": [ - "machineNames", - "tags" - ] - }, - "MachineNames": { - "type": "string", - "description": "Filter Criteria", - "ignoreCase": "key" - } - }, - "additionalProperties": false, - "required": [ - "EnvironmentName", - "ScriptPath" - ] - } - }, - "doNotSuggest": false, - "firstProperty": [ - "task" - ], - "required": [ - "task", - "inputs" - ] - }, { "properties": { "task": { @@ -9588,7 +9394,7 @@ "task": { "description": "PowerShell on Target Machines\n\nExecute PowerShell scripts on remote machine(s)", "ignoreCase": "value", - "pattern": "^PowerShellOnTargetMachines@2$" + "pattern": "^PowerShellOnTargetMachines@1$" }, "inputs": { "description": "PowerShell on Target Machines inputs", @@ -9679,55 +9485,88 @@ { "properties": { "task": { - "description": "[To be deprecated] Publish code coverage\n\n[DEPRECATION WARNING! Users are recommended to switch to version 2*.] Publish Cobertura or JaCoCo code coverage results from a build", + "description": "PowerShell on Target Machines\n\nExecute PowerShell scripts on remote machine(s)", "ignoreCase": "value", - "pattern": "^PublishCodeCoverageResults@1$" + "pattern": "^PowerShellOnTargetMachines@2$" }, "inputs": { - "description": "[To be deprecated] Publish code coverage inputs", + "description": "PowerShell on Target Machines inputs", "properties": { - "codeCoverageTool": { - "description": "Code coverage tool", + "EnvironmentName": { + "type": "string", + "description": "Machines", + "ignoreCase": "key" + }, + "AdminUserName": { + "type": "string", + "description": "Admin Login", + "ignoreCase": "key" + }, + "AdminPassword": { + "type": "string", + "description": "Password", + "ignoreCase": "key" + }, + "Protocol": { + "description": "Protocol", "ignoreCase": "all", "enum": [ - "Cobertura", - "JaCoCo" + "Http", + "Https" ] }, - "summaryFileLocation": { + "TestCertificate": { + "type": "boolean", + "description": "Test Certificate", + "ignoreCase": "key" + }, + "ScriptPath": { "type": "string", - "description": "Summary file", + "description": "PowerShell Script", "ignoreCase": "key" }, - "pathToSources": { + "ScriptArguments": { "type": "string", - "description": "Path to Source files", + "description": "Script Arguments", "ignoreCase": "key" }, - "reportDirectory": { + "InitializationScriptPath": { "type": "string", - "description": "Report directory", + "description": "Initialization Script", "ignoreCase": "key" }, - "additionalCodeCoverageFiles": { + "SessionVariables": { "type": "string", - "description": "Additional files", + "description": "Session Variables", "ignoreCase": "key" }, - "failIfCoverageEmpty": { + "RunPowershellInParallel": { "type": "boolean", - "description": "Fail when code coverage results are missing", + "description": "Run PowerShell in Parallel", + "ignoreCase": "key" + }, + "ResourceFilteringMethod": { + "description": "Select Machines By", + "ignoreCase": "all", + "enum": [ + "machineNames", + "tags" + ] + }, + "MachineNames": { + "type": "string", + "description": "Filter Criteria", "ignoreCase": "key" } }, "additionalProperties": false, "required": [ - "summaryFileLocation" + "EnvironmentName", + "ScriptPath" ] } }, - "deprecationMessage": "PublishCodeCoverageResults is deprecated - [DEPRECATION WARNING! Users are recommended to switch to version 2*.] Publish Cobertura or JaCoCo code coverage results from a build", - "doNotSuggest": true, + "doNotSuggest": false, "firstProperty": [ "task" ], @@ -9777,6 +9616,66 @@ "inputs" ] }, + { + "properties": { + "task": { + "description": "Publish code coverage\n\nPublish Cobertura or JaCoCo code coverage results from a build", + "ignoreCase": "value", + "pattern": "^PublishCodeCoverageResults@1$" + }, + "inputs": { + "description": "Publish code coverage inputs", + "properties": { + "codeCoverageTool": { + "description": "Code coverage tool", + "ignoreCase": "all", + "enum": [ + "Cobertura", + "JaCoCo" + ] + }, + "summaryFileLocation": { + "type": "string", + "description": "Summary file", + "ignoreCase": "key" + }, + "pathToSources": { + "type": "string", + "description": "Path to Source files", + "ignoreCase": "key" + }, + "reportDirectory": { + "type": "string", + "description": "Report directory", + "ignoreCase": "key" + }, + "additionalCodeCoverageFiles": { + "type": "string", + "description": "Additional files", + "ignoreCase": "key" + }, + "failIfCoverageEmpty": { + "type": "boolean", + "description": "Fail when code coverage results are missing", + "ignoreCase": "key" + } + }, + "additionalProperties": false, + "required": [ + "summaryFileLocation" + ] + } + }, + "deprecationMessage": "PublishCodeCoverageResults is deprecated - Publish Cobertura or JaCoCo code coverage results from a build", + "doNotSuggest": true, + "firstProperty": [ + "task" + ], + "required": [ + "task", + "inputs" + ] + }, { "properties": { "task": { @@ -9893,62 +9792,6 @@ "inputs" ] }, - { - "properties": { - "task": { - "description": "Manual Intervention\n\nPause deployment and wait for intervention", - "ignoreCase": "value", - "pattern": "^ManualIntervention@6$" - }, - "inputs": { - "description": "Manual Intervention inputs", - "properties": { - "instructions": { - "type": "string", - "description": "Instructions", - "ignoreCase": "key" - } - }, - "additionalProperties": false, - "required": [] - } - }, - "doNotSuggest": false, - "firstProperty": [ - "task" - ], - "required": [ - "task" - ] - }, - { - "properties": { - "task": { - "description": "Manual Intervention\n\nPause deployment and wait for intervention", - "ignoreCase": "value", - "pattern": "^ManualIntervention@7$" - }, - "inputs": { - "description": "Manual Intervention inputs", - "properties": { - "instructions": { - "type": "string", - "description": "Instructions", - "ignoreCase": "key" - } - }, - "additionalProperties": false, - "required": [] - } - }, - "doNotSuggest": false, - "firstProperty": [ - "task" - ], - "required": [ - "task" - ] - }, { "properties": { "task": { @@ -10086,7 +9929,8 @@ "required": [] } }, - "doNotSuggest": false, + "deprecationMessage": "SonarQubePostTest is deprecated - [DEPRECATED] Finish the analysis and upload the results to SonarQube", + "doNotSuggest": true, "firstProperty": [ "task" ], @@ -10542,9 +10386,91 @@ "cwd" ] }, - "memory": { + "memory": { + "type": "string", + "description": "Memory limit", + "ignoreCase": "key" + } + }, + "additionalProperties": false, + "required": [] + } + }, + "deprecationMessage": "Docker is deprecated - Build, tag, push, or run Docker images, or run a Docker command", + "doNotSuggest": true, + "firstProperty": [ + "task" + ], + "required": [ + "task" + ] + }, + { + "properties": { + "task": { + "description": "Docker\n\nBuild or push Docker images, login or logout, start or stop containers, or run a Docker command", + "ignoreCase": "value", + "pattern": "^Docker@2$" + }, + "inputs": { + "description": "Docker inputs", + "properties": { + "containerRegistry": { + "type": "string", + "description": "Container registry", + "ignoreCase": "key" + }, + "repository": { + "type": "string", + "description": "Container repository", + "ignoreCase": "key" + }, + "command": { + "description": "Command", + "ignoreCase": "all", + "enum": [ + "buildAndPush", + "build", + "push", + "login", + "logout", + "start", + "stop" + ] + }, + "Dockerfile": { + "type": "string", + "description": "Dockerfile", + "ignoreCase": "key" + }, + "buildContext": { + "type": "string", + "description": "Build context", + "ignoreCase": "key" + }, + "tags": { + "type": "string", + "description": "Tags", + "ignoreCase": "key" + }, + "arguments": { + "type": "string", + "description": "Arguments", + "ignoreCase": "key" + }, + "addPipelineData": { + "type": "boolean", + "description": "Add Pipeline metadata to image(s)", + "ignoreCase": "key" + }, + "addBaseImageData": { + "type": "boolean", + "description": "Add base image metadata to image(s)", + "ignoreCase": "key" + }, + "container": { "type": "string", - "description": "Memory limit", + "description": "Container", "ignoreCase": "key" } }, @@ -10552,8 +10478,7 @@ "required": [] } }, - "deprecationMessage": "Docker is deprecated - Build, tag, push, or run Docker images, or run a Docker command", - "doNotSuggest": true, + "doNotSuggest": false, "firstProperty": [ "task" ], @@ -10764,87 +10689,6 @@ "task" ] }, - { - "properties": { - "task": { - "description": "Docker\n\nBuild or push Docker images, login or logout, start or stop containers, or run a Docker command", - "ignoreCase": "value", - "pattern": "^Docker@2$" - }, - "inputs": { - "description": "Docker inputs", - "properties": { - "containerRegistry": { - "type": "string", - "description": "Container registry", - "ignoreCase": "key" - }, - "repository": { - "type": "string", - "description": "Container repository", - "ignoreCase": "key" - }, - "command": { - "description": "Command", - "ignoreCase": "all", - "enum": [ - "buildAndPush", - "build", - "push", - "login", - "logout", - "start", - "stop" - ] - }, - "Dockerfile": { - "type": "string", - "description": "Dockerfile", - "ignoreCase": "key" - }, - "buildContext": { - "type": "string", - "description": "Build context", - "ignoreCase": "key" - }, - "tags": { - "type": "string", - "description": "Tags", - "ignoreCase": "key" - }, - "arguments": { - "type": "string", - "description": "Arguments", - "ignoreCase": "key" - }, - "addPipelineData": { - "type": "boolean", - "description": "Add Pipeline metadata to image(s)", - "ignoreCase": "key" - }, - "addBaseImageData": { - "type": "boolean", - "description": "Add base image metadata to image(s)", - "ignoreCase": "key" - }, - "container": { - "type": "string", - "description": "Container", - "ignoreCase": "key" - } - }, - "additionalProperties": false, - "required": [] - } - }, - "doNotSuggest": false, - "firstProperty": [ - "task" - ], - "required": [ - "task" - ] - }, { "properties": { "task": { @@ -11002,7 +10846,7 @@ "task": { "description": "FTP upload\n\nUpload files using FTP", "ignoreCase": "value", - "pattern": "^FtpUpload@1$" + "pattern": "^FtpUpload@2$" }, "inputs": { "description": "FTP upload inputs", @@ -11038,6 +10882,11 @@ "description": "Password", "ignoreCase": "key" }, + "implicitFTPS": { + "type": "boolean", + "description": "Use implicit FTPS", + "ignoreCase": "key" + }, "rootDirectory": { "type": "string", "description": "Root folder", @@ -11059,6 +10908,11 @@ "remotePath" ] }, + "enableUtf8": { + "type": "boolean", + "description": "Enable UTF8 support", + "ignoreCase": "key" + }, "clean": { "type": "boolean", "description": "Delete remote directory", @@ -11069,11 +10923,6 @@ "description": "Clear remote directory contents", "ignoreCase": "key" }, - "overwrite": { - "type": "boolean", - "description": "Overwrite", - "ignoreCase": "key" - }, "preservePaths": { "type": "boolean", "description": "Preserve file paths", @@ -11083,6 +10932,11 @@ "type": "boolean", "description": "Trust server certificate", "ignoreCase": "key" + }, + "customCmds": { + "type": "string", + "description": "FTP Commands", + "ignoreCase": "key" } }, "additionalProperties": false, @@ -11091,8 +10945,7 @@ ] } }, - "deprecationMessage": "FtpUpload is deprecated - Upload files using FTP", - "doNotSuggest": true, + "doNotSuggest": false, "firstProperty": [ "task" ], @@ -11106,7 +10959,7 @@ "task": { "description": "FTP upload\n\nUpload files using FTP", "ignoreCase": "value", - "pattern": "^FtpUpload@2$" + "pattern": "^FtpUpload@1$" }, "inputs": { "description": "FTP upload inputs", @@ -11142,11 +10995,6 @@ "description": "Password", "ignoreCase": "key" }, - "implicitFTPS": { - "type": "boolean", - "description": "Use implicit FTPS", - "ignoreCase": "key" - }, "rootDirectory": { "type": "string", "description": "Root folder", @@ -11168,11 +11016,6 @@ "remotePath" ] }, - "enableUtf8": { - "type": "boolean", - "description": "Enable UTF8 support", - "ignoreCase": "key" - }, "clean": { "type": "boolean", "description": "Delete remote directory", @@ -11183,6 +11026,11 @@ "description": "Clear remote directory contents", "ignoreCase": "key" }, + "overwrite": { + "type": "boolean", + "description": "Overwrite", + "ignoreCase": "key" + }, "preservePaths": { "type": "boolean", "description": "Preserve file paths", @@ -11192,11 +11040,6 @@ "type": "boolean", "description": "Trust server certificate", "ignoreCase": "key" - }, - "customCmds": { - "type": "string", - "description": "FTP Commands", - "ignoreCase": "key" } }, "additionalProperties": false, @@ -11205,7 +11048,8 @@ ] } }, - "doNotSuggest": false, + "deprecationMessage": "FtpUpload is deprecated - Upload files using FTP", + "doNotSuggest": true, "firstProperty": [ "task" ], @@ -12107,57 +11951,151 @@ "description": "Suppress warning for overridden keys", "ignoreCase": "key" }, - "TreatKeyVaultErrorsAsWarning": { - "type": "boolean", - "description": "Treat key vault resolution errors as warnings", - "ignoreCase": "key" - } - }, - "additionalProperties": false, - "required": [ - "azureSubscription", - "AppConfigurationEndpoint" - ] - } - }, - "doNotSuggest": false, - "firstProperty": [ - "task" - ], - "required": [ - "task", - "inputs" - ] - }, - { - "properties": { - "task": { - "description": "Review App\n\nUse this task under deploy phase provider to create a resource dynamically", - "ignoreCase": "value", - "pattern": "^ReviewApp@0$" - }, - "inputs": { - "description": "Review App inputs", - "properties": { - "resourceName": { + "TreatKeyVaultErrorsAsWarning": { + "type": "boolean", + "description": "Treat key vault resolution errors as warnings", + "ignoreCase": "key" + } + }, + "additionalProperties": false, + "required": [ + "azureSubscription", + "AppConfigurationEndpoint" + ] + } + }, + "doNotSuggest": false, + "firstProperty": [ + "task" + ], + "required": [ + "task", + "inputs" + ] + }, + { + "properties": { + "task": { + "description": "Review App\n\nUse this task under deploy phase provider to create a resource dynamically", + "ignoreCase": "value", + "pattern": "^ReviewApp@0$" + }, + "inputs": { + "description": "Review App inputs", + "properties": { + "resourceName": { + "type": "string", + "description": "Resource name", + "ignoreCase": "key" + }, + "baseEnvironmentName": { + "type": "string", + "description": "Environment name", + "ignoreCase": "key" + }, + "reviewResourceName": { + "type": "string", + "description": "Review Resource Name", + "ignoreCase": "key" + } + }, + "additionalProperties": false, + "required": [ + "resourceName" + ] + } + }, + "doNotSuggest": false, + "firstProperty": [ + "task" + ], + "required": [ + "task", + "inputs" + ] + }, + { + "properties": { + "task": { + "description": "Java tool installer\n\nAcquire a specific version of Java from a user-supplied Azure blob or the tool cache and sets JAVA_HOME", + "ignoreCase": "value", + "pattern": "^JavaToolInstaller@0$" + }, + "inputs": { + "description": "Java tool installer inputs", + "properties": { + "versionSpec": { + "type": "string", + "description": "JDK version", + "ignoreCase": "key" + }, + "jdkArchitectureOption": { + "description": "JDK architecture", + "ignoreCase": "all", + "enum": [ + "x64", + "x86" + ] + }, + "jdkSourceOption": { + "description": "JDK source", + "ignoreCase": "all", + "enum": [ + "AzureStorage", + "LocalDirectory", + "PreInstalled" + ] + }, + "jdkFile": { + "type": "string", + "description": "JDK file", + "ignoreCase": "key" + }, + "azureResourceManagerEndpoint": { + "type": "string", + "description": "Azure subscription", + "ignoreCase": "key" + }, + "azureStorageAccountName": { + "type": "string", + "description": "Storage account name", + "ignoreCase": "key" + }, + "azureContainerName": { + "type": "string", + "description": "Container name", + "ignoreCase": "key" + }, + "azureCommonVirtualFile": { "type": "string", - "description": "Resource name", + "description": "Common virtual path", "ignoreCase": "key" }, - "baseEnvironmentName": { + "jdkDestinationDirectory": { "type": "string", - "description": "Environment name", + "description": "Destination directory", "ignoreCase": "key" }, - "reviewResourceName": { + "azureResourceGroupName": { "type": "string", - "description": "Review Resource Name", + "description": "Resource Group name", + "ignoreCase": "key" + }, + "cleanDestinationDirectory": { + "type": "boolean", + "description": "Clean destination directory", + "ignoreCase": "key" + }, + "createExtractDirectory": { + "type": "boolean", + "description": "Create directory for extracting", "ignoreCase": "key" } }, "additionalProperties": false, "required": [ - "resourceName" + "jdkArchitectureOption", + "jdkSourceOption" ] } }, @@ -12175,7 +12113,7 @@ "task": { "description": "Java tool installer\n\nAcquire a specific version of Java from a user-supplied Azure blob or the tool cache and sets JAVA_HOME", "ignoreCase": "value", - "pattern": "^JavaToolInstaller@0$" + "pattern": "^JavaToolInstaller@1$" }, "inputs": { "description": "Java tool installer inputs", @@ -12316,20 +12254,17 @@ { "properties": { "task": { - "description": "Azure Functions Deploy\n\nUpdate a function app with .NET, Python, JavaScript, PowerShell, Java based web applications", + "description": "Azure Functions\n\nUpdate a function app with .NET, Python, JavaScript, PowerShell, Java based web applications", "ignoreCase": "value", - "pattern": "^AzureFunctionApp@2$" + "pattern": "^AzureFunctionApp@1$" }, "inputs": { - "description": "Azure Functions Deploy inputs", + "description": "Azure Functions inputs", "properties": { - "connectedServiceNameARM": { + "azureSubscription": { "type": "string", - "description": "Azure Resource Manager connection", - "ignoreCase": "key", - "aliases": [ - "azureSubscription" - ] + "description": "Azure subscription", + "ignoreCase": "key" }, "appType": { "description": "App type", @@ -12339,11 +12274,6 @@ "functionAppLinux" ] }, - "isFlexConsumption": { - "type": "boolean", - "description": "Is Function App on Flex Consumption Plan", - "ignoreCase": "key" - }, "appName": { "type": "string", "description": "Azure Functions App name", @@ -12391,11 +12321,26 @@ "PYTHON|3.11" ] }, + "startUpCommand": { + "type": "string", + "description": "Startup command ", + "ignoreCase": "key" + }, + "customWebConfig": { + "type": "string", + "description": "Generate web.config parameters for Python, Node.js, Go and Java apps", + "ignoreCase": "key" + }, "appSettings": { "type": "string", "description": "App settings", "ignoreCase": "key" }, + "configurationStrings": { + "type": "string", + "description": "Configuration settings", + "ignoreCase": "key" + }, "deploymentMethod": { "description": "Deployment method", "ignoreCase": "all", @@ -12408,7 +12353,7 @@ }, "additionalProperties": false, "required": [ - "connectedServiceNameARM", + "azureSubscription", "appType", "appName" ] @@ -12426,17 +12371,20 @@ { "properties": { "task": { - "description": "Azure Functions\n\nUpdate a function app with .NET, Python, JavaScript, PowerShell, Java based web applications", + "description": "Azure Functions Deploy\n\nUpdate a function app with .NET, Python, JavaScript, PowerShell, Java based web applications", "ignoreCase": "value", - "pattern": "^AzureFunctionApp@1$" + "pattern": "^AzureFunctionApp@2$" }, "inputs": { - "description": "Azure Functions inputs", + "description": "Azure Functions Deploy inputs", "properties": { - "azureSubscription": { + "connectedServiceNameARM": { "type": "string", - "description": "Azure subscription", - "ignoreCase": "key" + "description": "Azure Resource Manager connection", + "ignoreCase": "key", + "aliases": [ + "azureSubscription" + ] }, "appType": { "description": "App type", @@ -12446,6 +12394,11 @@ "functionAppLinux" ] }, + "isFlexConsumption": { + "type": "boolean", + "description": "Is Function App on Flex Consumption Plan", + "ignoreCase": "key" + }, "appName": { "type": "string", "description": "Azure Functions App name", @@ -12493,26 +12446,11 @@ "PYTHON|3.11" ] }, - "startUpCommand": { - "type": "string", - "description": "Startup command ", - "ignoreCase": "key" - }, - "customWebConfig": { - "type": "string", - "description": "Generate web.config parameters for Python, Node.js, Go and Java apps", - "ignoreCase": "key" - }, "appSettings": { "type": "string", "description": "App settings", "ignoreCase": "key" }, - "configurationStrings": { - "type": "string", - "description": "Configuration settings", - "ignoreCase": "key" - }, "deploymentMethod": { "description": "Deployment method", "ignoreCase": "all", @@ -12525,7 +12463,7 @@ }, "additionalProperties": false, "required": [ - "azureSubscription", + "connectedServiceNameARM", "appType", "appName" ] @@ -14649,12 +14587,12 @@ { "properties": { "task": { - "description": "Xcode Build\n\nBuild an Xcode workspace on Mac OS", + "description": "Xcode\n\nBuild, test, or archive an Xcode workspace on macOS. Optionally package an app.", "ignoreCase": "value", - "pattern": "^Xcode@2$" + "pattern": "^Xcode@5$" }, "inputs": { - "description": "Xcode Build inputs", + "description": "Xcode inputs", "properties": { "actions": { "type": "string", @@ -14673,7 +14611,7 @@ }, "xcWorkspacePath": { "type": "string", - "description": "Workspace/Project Path", + "description": "Workspace or project path", "ignoreCase": "key" }, "scheme": { @@ -14681,31 +14619,42 @@ "description": "Scheme", "ignoreCase": "key" }, - "packageApp": { - "type": "boolean", - "description": "Create App Package", - "ignoreCase": "key" - }, - "packageTool": { - "description": "Create Package (IPA) using", + "xcodeVersion": { + "description": "Xcode version", "ignoreCase": "all", "enum": [ - "xcrun", - "xcodebuild" + "8", + "9", + "10", + "11", + "12", + "13", + "default", + "specifyPath" ] }, + "xcodeDeveloperDir": { + "type": "string", + "description": "Xcode developer path", + "ignoreCase": "key" + }, + "packageApp": { + "type": "boolean", + "description": "Create app package", + "ignoreCase": "key" + }, "archivePath": { "type": "string", - "description": "Archive Path", + "description": "Archive path", "ignoreCase": "key" }, "exportPath": { "type": "string", - "description": "Export Path", + "description": "Export path", "ignoreCase": "key" }, "exportOptions": { - "description": "Export Options", + "description": "Export options", "ignoreCase": "all", "enum": [ "auto", @@ -14715,7 +14664,7 @@ }, "exportMethod": { "type": "string", - "description": "Export Method", + "description": "Export method", "ignoreCase": "key" }, "exportTeamId": { @@ -14725,105 +14674,109 @@ }, "exportOptionsPlist": { "type": "string", - "description": "Export Options Plist", - "ignoreCase": "key" - }, - "xcode8AutomaticSigning": { - "type": "boolean", - "description": "Automatic Signing", + "description": "Export options plist", "ignoreCase": "key" }, - "teamId": { + "exportArgs": { "type": "string", - "description": "Team ID", + "description": "Export arguments", "ignoreCase": "key" }, - "signMethod": { - "description": "Override Using", + "signingOption": { + "description": "Signing style", "ignoreCase": "all", "enum": [ - "file", - "id" + "nosign", + "default", + "manual", + "auto" ] }, - "iosSigningIdentity": { + "signingIdentity": { "type": "string", - "description": "Signing Identity", - "ignoreCase": "key" - }, - "unlockDefaultKeychain": { - "type": "boolean", - "description": "Unlock Default Keychain", + "description": "Signing identity", "ignoreCase": "key" }, - "defaultKeychainPassword": { + "provisioningProfileUuid": { "type": "string", - "description": "Default Keychain Password", + "description": "Provisioning profile UUID", "ignoreCase": "key" }, - "provProfileUuid": { + "provisioningProfileName": { "type": "string", - "description": "Provisioning Profile UUID", + "description": "Provisioning profile name", "ignoreCase": "key" }, - "p12": { + "teamId": { "type": "string", - "description": "P12 Certificate File", + "description": "Team ID", "ignoreCase": "key" }, - "p12pwd": { - "type": "string", - "description": "P12 Password", - "ignoreCase": "key" + "destinationPlatformOption": { + "description": "Destination platform", + "ignoreCase": "all", + "enum": [ + "default", + "iOS", + "tvOS", + "macOS", + "custom" + ] }, - "provProfile": { + "destinationPlatform": { "type": "string", - "description": "Provisioning Profile File", + "description": "Custom destination platform", "ignoreCase": "key" }, - "removeProfile": { - "type": "boolean", - "description": "Remove Profile After Build", - "ignoreCase": "key" + "destinationTypeOption": { + "description": "Destination type", + "ignoreCase": "all", + "enum": [ + "simulators", + "devices" + ] }, - "args": { + "destinationSimulators": { "type": "string", - "description": "Arguments", + "description": "Simulator", "ignoreCase": "key" }, - "cwd": { + "destinationDevices": { "type": "string", - "description": "Working Directory", + "description": "Device", "ignoreCase": "key" }, - "outputPattern": { + "args": { "type": "string", - "description": "Output Directory", + "description": "Arguments", "ignoreCase": "key" }, - "xcodeDeveloperDir": { + "workingDirectory": { "type": "string", - "description": "Xcode Developer Path", - "ignoreCase": "key" + "description": "Working directory", + "ignoreCase": "key", + "aliases": [ + "cwd" + ] }, "useXcpretty": { "type": "boolean", "description": "Use xcpretty", "ignoreCase": "key" }, - "publishJUnitResults": { - "type": "boolean", - "description": "Publish to VSTS/TFS", + "xcprettyArgs": { + "type": "string", + "description": "Xcpretty arguments", "ignoreCase": "key" }, - "useXctool": { + "publishJUnitResults": { "type": "boolean", - "description": "Use xctool", + "description": "Publish test results to Azure Pipelines", "ignoreCase": "key" }, - "xctoolReporter": { + "testRunTitle": { "type": "string", - "description": "xctool Test Reporter Format", + "description": "Test run title", "ignoreCase": "key" } }, @@ -15216,12 +15169,12 @@ { "properties": { "task": { - "description": "Xcode\n\nBuild, test, or archive an Xcode workspace on macOS. Optionally package an app.", + "description": "Xcode Build\n\nBuild an Xcode workspace on Mac OS", "ignoreCase": "value", - "pattern": "^Xcode@5$" + "pattern": "^Xcode@2$" }, "inputs": { - "description": "Xcode inputs", + "description": "Xcode Build inputs", "properties": { "actions": { "type": "string", @@ -15240,7 +15193,7 @@ }, "xcWorkspacePath": { "type": "string", - "description": "Workspace or project path", + "description": "Workspace/Project Path", "ignoreCase": "key" }, "scheme": { @@ -15248,42 +15201,31 @@ "description": "Scheme", "ignoreCase": "key" }, - "xcodeVersion": { - "description": "Xcode version", - "ignoreCase": "all", - "enum": [ - "8", - "9", - "10", - "11", - "12", - "13", - "default", - "specifyPath" - ] - }, - "xcodeDeveloperDir": { - "type": "string", - "description": "Xcode developer path", - "ignoreCase": "key" - }, "packageApp": { "type": "boolean", - "description": "Create app package", + "description": "Create App Package", "ignoreCase": "key" }, + "packageTool": { + "description": "Create Package (IPA) using", + "ignoreCase": "all", + "enum": [ + "xcrun", + "xcodebuild" + ] + }, "archivePath": { "type": "string", - "description": "Archive path", + "description": "Archive Path", "ignoreCase": "key" }, "exportPath": { "type": "string", - "description": "Export path", + "description": "Export Path", "ignoreCase": "key" }, "exportOptions": { - "description": "Export options", + "description": "Export Options", "ignoreCase": "all", "enum": [ "auto", @@ -15293,7 +15235,7 @@ }, "exportMethod": { "type": "string", - "description": "Export method", + "description": "Export Method", "ignoreCase": "key" }, "exportTeamId": { @@ -15303,109 +15245,105 @@ }, "exportOptionsPlist": { "type": "string", - "description": "Export options plist", + "description": "Export Options Plist", "ignoreCase": "key" }, - "exportArgs": { + "xcode8AutomaticSigning": { + "type": "boolean", + "description": "Automatic Signing", + "ignoreCase": "key" + }, + "teamId": { "type": "string", - "description": "Export arguments", + "description": "Team ID", "ignoreCase": "key" }, - "signingOption": { - "description": "Signing style", + "signMethod": { + "description": "Override Using", "ignoreCase": "all", "enum": [ - "nosign", - "default", - "manual", - "auto" + "file", + "id" ] }, - "signingIdentity": { + "iosSigningIdentity": { "type": "string", - "description": "Signing identity", + "description": "Signing Identity", "ignoreCase": "key" }, - "provisioningProfileUuid": { + "unlockDefaultKeychain": { + "type": "boolean", + "description": "Unlock Default Keychain", + "ignoreCase": "key" + }, + "defaultKeychainPassword": { "type": "string", - "description": "Provisioning profile UUID", + "description": "Default Keychain Password", "ignoreCase": "key" }, - "provisioningProfileName": { + "provProfileUuid": { "type": "string", - "description": "Provisioning profile name", + "description": "Provisioning Profile UUID", "ignoreCase": "key" }, - "teamId": { + "p12": { "type": "string", - "description": "Team ID", + "description": "P12 Certificate File", "ignoreCase": "key" }, - "destinationPlatformOption": { - "description": "Destination platform", - "ignoreCase": "all", - "enum": [ - "default", - "iOS", - "tvOS", - "macOS", - "custom" - ] + "p12pwd": { + "type": "string", + "description": "P12 Password", + "ignoreCase": "key" }, - "destinationPlatform": { + "provProfile": { "type": "string", - "description": "Custom destination platform", + "description": "Provisioning Profile File", "ignoreCase": "key" }, - "destinationTypeOption": { - "description": "Destination type", - "ignoreCase": "all", - "enum": [ - "simulators", - "devices" - ] + "removeProfile": { + "type": "boolean", + "description": "Remove Profile After Build", + "ignoreCase": "key" }, - "destinationSimulators": { + "args": { "type": "string", - "description": "Simulator", + "description": "Arguments", "ignoreCase": "key" }, - "destinationDevices": { + "cwd": { "type": "string", - "description": "Device", + "description": "Working Directory", "ignoreCase": "key" }, - "args": { + "outputPattern": { "type": "string", - "description": "Arguments", + "description": "Output Directory", "ignoreCase": "key" }, - "workingDirectory": { + "xcodeDeveloperDir": { "type": "string", - "description": "Working directory", - "ignoreCase": "key", - "aliases": [ - "cwd" - ] + "description": "Xcode Developer Path", + "ignoreCase": "key" }, "useXcpretty": { "type": "boolean", "description": "Use xcpretty", "ignoreCase": "key" }, - "xcprettyArgs": { - "type": "string", - "description": "Xcpretty arguments", + "publishJUnitResults": { + "type": "boolean", + "description": "Publish to VSTS/TFS", "ignoreCase": "key" }, - "publishJUnitResults": { + "useXctool": { "type": "boolean", - "description": "Publish test results to Azure Pipelines", + "description": "Use xctool", "ignoreCase": "key" }, - "testRunTitle": { + "xctoolReporter": { "type": "string", - "description": "Test run title", + "description": "xctool Test Reporter Format", "ignoreCase": "key" } }, @@ -18284,108 +18222,45 @@ "defaultKeychainPassword" ] }, - "signingProvisioningProfileID": { - "type": "string", - "description": "Provisioning profile UUID", - "ignoreCase": "key", - "aliases": [ - "provProfileUuid" - ] - }, - "signingP12File": { - "type": "string", - "description": "P12 certificate file", - "ignoreCase": "key", - "aliases": [ - "p12" - ] - }, - "signingP12Password": { - "type": "string", - "description": "P12 password", - "ignoreCase": "key", - "aliases": [ - "p12pwd" - ] - }, - "signingProvisioningProfileFile": { - "type": "string", - "description": "Provisioning profile file", - "ignoreCase": "key", - "aliases": [ - "provProfile" - ] - }, - "signingRemoveProfile": { - "type": "boolean", - "description": "Remove profile after build", - "ignoreCase": "key", - "aliases": [ - "removeProfile" - ] - } - }, - "additionalProperties": false, - "required": [] - } - }, - "doNotSuggest": false, - "firstProperty": [ - "task" - ], - "required": [ - "task" - ] - }, - { - "properties": { - "task": { - "description": "Publish test results\n\nPublish test results to Azure Pipelines", - "ignoreCase": "value", - "pattern": "^PublishTestResults@1$" - }, - "inputs": { - "description": "Publish test results inputs", - "properties": { - "testRunner": { - "description": "Test Result Format", - "ignoreCase": "all", - "enum": [ - "JUnit", - "NUnit", - "VSTest", - "XUnit" - ] - }, - "testResultsFiles": { - "type": "string", - "description": "Test Results Files", - "ignoreCase": "key" - }, - "mergeTestResults": { - "type": "boolean", - "description": "Merge Test Results", - "ignoreCase": "key" + "signingProvisioningProfileID": { + "type": "string", + "description": "Provisioning profile UUID", + "ignoreCase": "key", + "aliases": [ + "provProfileUuid" + ] }, - "testRunTitle": { + "signingP12File": { "type": "string", - "description": "Test Run Title", - "ignoreCase": "key" + "description": "P12 certificate file", + "ignoreCase": "key", + "aliases": [ + "p12" + ] }, - "platform": { + "signingP12Password": { "type": "string", - "description": "Platform", - "ignoreCase": "key" + "description": "P12 password", + "ignoreCase": "key", + "aliases": [ + "p12pwd" + ] }, - "configuration": { + "signingProvisioningProfileFile": { "type": "string", - "description": "Configuration", - "ignoreCase": "key" + "description": "Provisioning profile file", + "ignoreCase": "key", + "aliases": [ + "provProfile" + ] }, - "publishRunAttachments": { + "signingRemoveProfile": { "type": "boolean", - "description": "Upload Test Attachments", - "ignoreCase": "key" + "description": "Remove profile after build", + "ignoreCase": "key", + "aliases": [ + "removeProfile" + ] } }, "additionalProperties": false, @@ -18493,12 +18368,75 @@ "task" ] }, + { + "properties": { + "task": { + "description": "Publish test results\n\nPublish test results to Azure Pipelines", + "ignoreCase": "value", + "pattern": "^PublishTestResults@1$" + }, + "inputs": { + "description": "Publish test results inputs", + "properties": { + "testRunner": { + "description": "Test Result Format", + "ignoreCase": "all", + "enum": [ + "JUnit", + "NUnit", + "VSTest", + "XUnit" + ] + }, + "testResultsFiles": { + "type": "string", + "description": "Test Results Files", + "ignoreCase": "key" + }, + "mergeTestResults": { + "type": "boolean", + "description": "Merge Test Results", + "ignoreCase": "key" + }, + "testRunTitle": { + "type": "string", + "description": "Test Run Title", + "ignoreCase": "key" + }, + "platform": { + "type": "string", + "description": "Platform", + "ignoreCase": "key" + }, + "configuration": { + "type": "string", + "description": "Configuration", + "ignoreCase": "key" + }, + "publishRunAttachments": { + "type": "boolean", + "description": "Upload Test Attachments", + "ignoreCase": "key" + } + }, + "additionalProperties": false, + "required": [] + } + }, + "doNotSuggest": false, + "firstProperty": [ + "task" + ], + "required": [ + "task" + ] + }, { "properties": { "task": { "description": "Azure file copy\n\nCopy files to Azure Blob Storage or virtual machines", "ignoreCase": "value", - "pattern": "^AzureFileCopy@1$" + "pattern": "^AzureFileCopy@5$" }, "inputs": { "description": "Azure file copy inputs", @@ -18508,25 +18446,6 @@ "description": "Source", "ignoreCase": "key" }, - "azureConnectionType": { - "description": "Azure Connection Type", - "ignoreCase": "all", - "enum": [ - "ConnectedServiceName", - "ConnectedServiceNameARM" - ], - "aliases": [ - "ConnectedServiceNameSelector" - ] - }, - "azureClassicSubscription": { - "type": "string", - "description": "Azure Classic Subscription", - "ignoreCase": "key", - "aliases": [ - "ConnectedServiceName" - ] - }, "azureSubscription": { "type": "string", "description": "Azure Subscription", @@ -18543,14 +18462,6 @@ "AzureVMs" ] }, - "classicStorage": { - "type": "string", - "description": "Classic Storage Account", - "ignoreCase": "key", - "aliases": [ - "StorageAccount" - ] - }, "storage": { "type": "string", "description": "RM Storage Account", @@ -18569,14 +18480,6 @@ "description": "Blob Prefix", "ignoreCase": "key" }, - "cloudService": { - "type": "string", - "description": "Cloud Service", - "ignoreCase": "key", - "aliases": [ - "EnvironmentName" - ] - }, "resourceGroup": { "type": "string", "description": "Resource Group", @@ -18613,9 +18516,19 @@ "description": "Destination Folder", "ignoreCase": "key" }, - "AdditionalArguments": { + "AdditionalArgumentsForBlobCopy": { "type": "string", - "description": "Additional Arguments", + "description": "Optional Arguments (for uploading files to blob)", + "ignoreCase": "key" + }, + "AdditionalArgumentsForVMCopy": { + "type": "string", + "description": "Optional Arguments (for downloading files to VM)", + "ignoreCase": "key" + }, + "sasTokenTimeOutInMinutes": { + "type": "string", + "description": "SAS Token Expiration Period In Minutes", "ignoreCase": "key" }, "enableCopyPrerequisites": { @@ -18637,27 +18550,18 @@ "type": "boolean", "description": "Test Certificate", "ignoreCase": "key" - }, - "outputStorageUri": { - "type": "string", - "description": "Storage Container URI", - "ignoreCase": "key" - }, - "outputStorageContainerSasToken": { - "type": "string", - "description": "Storage Container SAS Token", - "ignoreCase": "key" } }, "additionalProperties": false, "required": [ "SourcePath", - "Destination" + "azureSubscription", + "Destination", + "storage" ] } }, - "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", - "doNotSuggest": true, + "doNotSuggest": false, "firstProperty": [ "task" ], @@ -18671,7 +18575,7 @@ "task": { "description": "Azure file copy\n\nCopy files to Azure Blob Storage or virtual machines", "ignoreCase": "value", - "pattern": "^AzureFileCopy@2$" + "pattern": "^AzureFileCopy@6$" }, "inputs": { "description": "Azure file copy inputs", @@ -18681,25 +18585,6 @@ "description": "Source", "ignoreCase": "key" }, - "azureConnectionType": { - "description": "Azure Connection Type", - "ignoreCase": "all", - "enum": [ - "ConnectedServiceName", - "ConnectedServiceNameARM" - ], - "aliases": [ - "ConnectedServiceNameSelector" - ] - }, - "azureClassicSubscription": { - "type": "string", - "description": "Azure Classic Subscription", - "ignoreCase": "key", - "aliases": [ - "ConnectedServiceName" - ] - }, "azureSubscription": { "type": "string", "description": "Azure Subscription", @@ -18716,14 +18601,6 @@ "AzureVMs" ] }, - "classicStorage": { - "type": "string", - "description": "Classic Storage Account", - "ignoreCase": "key", - "aliases": [ - "StorageAccount" - ] - }, "storage": { "type": "string", "description": "RM Storage Account", @@ -18742,14 +18619,6 @@ "description": "Blob Prefix", "ignoreCase": "key" }, - "cloudService": { - "type": "string", - "description": "Cloud Service", - "ignoreCase": "key", - "aliases": [ - "EnvironmentName" - ] - }, "resourceGroup": { "type": "string", "description": "Resource Group", @@ -18815,27 +18684,18 @@ "type": "boolean", "description": "Test Certificate", "ignoreCase": "key" - }, - "outputStorageUri": { - "type": "string", - "description": "Storage Container URI", - "ignoreCase": "key" - }, - "outputStorageContainerSasToken": { - "type": "string", - "description": "Storage Container SAS Token", - "ignoreCase": "key" } }, "additionalProperties": false, "required": [ "SourcePath", - "Destination" + "azureSubscription", + "Destination", + "storage" ] } }, - "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", - "doNotSuggest": true, + "doNotSuggest": false, "firstProperty": [ "task" ], @@ -18849,7 +18709,7 @@ "task": { "description": "Azure file copy\n\nCopy files to Azure Blob Storage or virtual machines", "ignoreCase": "value", - "pattern": "^AzureFileCopy@3$" + "pattern": "^AzureFileCopy@4$" }, "inputs": { "description": "Azure file copy inputs", @@ -18939,6 +18799,11 @@ "description": "Optional Arguments (for downloading files to VM)", "ignoreCase": "key" }, + "sasTokenTimeOutInMinutes": { + "type": "string", + "description": "SAS Token Expiration Period In Minutes", + "ignoreCase": "key" + }, "enableCopyPrerequisites": { "type": "boolean", "description": "Enable Copy Prerequisites", @@ -18958,21 +18823,6 @@ "type": "boolean", "description": "Test Certificate", "ignoreCase": "key" - }, - "outputStorageUri": { - "type": "string", - "description": "Storage Container URI", - "ignoreCase": "key" - }, - "outputStorageContainerSasToken": { - "type": "string", - "description": "Storage Container SAS Token", - "ignoreCase": "key" - }, - "sasTokenTimeOutInMinutes": { - "type": "string", - "description": "SAS Token Expiration Period In Minutes", - "ignoreCase": "key" } }, "additionalProperties": false, @@ -18984,8 +18834,7 @@ ] } }, - "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", - "doNotSuggest": true, + "doNotSuggest": false, "firstProperty": [ "task" ], @@ -18999,7 +18848,7 @@ "task": { "description": "Azure file copy\n\nCopy files to Azure Blob Storage or virtual machines", "ignoreCase": "value", - "pattern": "^AzureFileCopy@4$" + "pattern": "^AzureFileCopy@2$" }, "inputs": { "description": "Azure file copy inputs", @@ -19009,6 +18858,25 @@ "description": "Source", "ignoreCase": "key" }, + "azureConnectionType": { + "description": "Azure Connection Type", + "ignoreCase": "all", + "enum": [ + "ConnectedServiceName", + "ConnectedServiceNameARM" + ], + "aliases": [ + "ConnectedServiceNameSelector" + ] + }, + "azureClassicSubscription": { + "type": "string", + "description": "Azure Classic Subscription", + "ignoreCase": "key", + "aliases": [ + "ConnectedServiceName" + ] + }, "azureSubscription": { "type": "string", "description": "Azure Subscription", @@ -19025,6 +18893,14 @@ "AzureVMs" ] }, + "classicStorage": { + "type": "string", + "description": "Classic Storage Account", + "ignoreCase": "key", + "aliases": [ + "StorageAccount" + ] + }, "storage": { "type": "string", "description": "RM Storage Account", @@ -19043,6 +18919,14 @@ "description": "Blob Prefix", "ignoreCase": "key" }, + "cloudService": { + "type": "string", + "description": "Cloud Service", + "ignoreCase": "key", + "aliases": [ + "EnvironmentName" + ] + }, "resourceGroup": { "type": "string", "description": "Resource Group", @@ -19089,11 +18973,6 @@ "description": "Optional Arguments (for downloading files to VM)", "ignoreCase": "key" }, - "sasTokenTimeOutInMinutes": { - "type": "string", - "description": "SAS Token Expiration Period In Minutes", - "ignoreCase": "key" - }, "enableCopyPrerequisites": { "type": "boolean", "description": "Enable Copy Prerequisites", @@ -19113,18 +18992,27 @@ "type": "boolean", "description": "Test Certificate", "ignoreCase": "key" + }, + "outputStorageUri": { + "type": "string", + "description": "Storage Container URI", + "ignoreCase": "key" + }, + "outputStorageContainerSasToken": { + "type": "string", + "description": "Storage Container SAS Token", + "ignoreCase": "key" } }, "additionalProperties": false, "required": [ "SourcePath", - "azureSubscription", - "Destination", - "storage" + "Destination" ] } }, - "doNotSuggest": false, + "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", + "doNotSuggest": true, "firstProperty": [ "task" ], @@ -19138,7 +19026,7 @@ "task": { "description": "Azure file copy\n\nCopy files to Azure Blob Storage or virtual machines", "ignoreCase": "value", - "pattern": "^AzureFileCopy@5$" + "pattern": "^AzureFileCopy@3$" }, "inputs": { "description": "Azure file copy inputs", @@ -19228,11 +19116,6 @@ "description": "Optional Arguments (for downloading files to VM)", "ignoreCase": "key" }, - "sasTokenTimeOutInMinutes": { - "type": "string", - "description": "SAS Token Expiration Period In Minutes", - "ignoreCase": "key" - }, "enableCopyPrerequisites": { "type": "boolean", "description": "Enable Copy Prerequisites", @@ -19252,6 +19135,21 @@ "type": "boolean", "description": "Test Certificate", "ignoreCase": "key" + }, + "outputStorageUri": { + "type": "string", + "description": "Storage Container URI", + "ignoreCase": "key" + }, + "outputStorageContainerSasToken": { + "type": "string", + "description": "Storage Container SAS Token", + "ignoreCase": "key" + }, + "sasTokenTimeOutInMinutes": { + "type": "string", + "description": "SAS Token Expiration Period In Minutes", + "ignoreCase": "key" } }, "additionalProperties": false, @@ -19263,7 +19161,8 @@ ] } }, - "doNotSuggest": false, + "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", + "doNotSuggest": true, "firstProperty": [ "task" ], @@ -19277,7 +19176,7 @@ "task": { "description": "Azure file copy\n\nCopy files to Azure Blob Storage or virtual machines", "ignoreCase": "value", - "pattern": "^AzureFileCopy@6$" + "pattern": "^AzureFileCopy@1$" }, "inputs": { "description": "Azure file copy inputs", @@ -19287,6 +19186,25 @@ "description": "Source", "ignoreCase": "key" }, + "azureConnectionType": { + "description": "Azure Connection Type", + "ignoreCase": "all", + "enum": [ + "ConnectedServiceName", + "ConnectedServiceNameARM" + ], + "aliases": [ + "ConnectedServiceNameSelector" + ] + }, + "azureClassicSubscription": { + "type": "string", + "description": "Azure Classic Subscription", + "ignoreCase": "key", + "aliases": [ + "ConnectedServiceName" + ] + }, "azureSubscription": { "type": "string", "description": "Azure Subscription", @@ -19303,6 +19221,14 @@ "AzureVMs" ] }, + "classicStorage": { + "type": "string", + "description": "Classic Storage Account", + "ignoreCase": "key", + "aliases": [ + "StorageAccount" + ] + }, "storage": { "type": "string", "description": "RM Storage Account", @@ -19321,6 +19247,14 @@ "description": "Blob Prefix", "ignoreCase": "key" }, + "cloudService": { + "type": "string", + "description": "Cloud Service", + "ignoreCase": "key", + "aliases": [ + "EnvironmentName" + ] + }, "resourceGroup": { "type": "string", "description": "Resource Group", @@ -19357,14 +19291,9 @@ "description": "Destination Folder", "ignoreCase": "key" }, - "AdditionalArgumentsForBlobCopy": { - "type": "string", - "description": "Optional Arguments (for uploading files to blob)", - "ignoreCase": "key" - }, - "AdditionalArgumentsForVMCopy": { + "AdditionalArguments": { "type": "string", - "description": "Optional Arguments (for downloading files to VM)", + "description": "Additional Arguments", "ignoreCase": "key" }, "enableCopyPrerequisites": { @@ -19386,18 +19315,27 @@ "type": "boolean", "description": "Test Certificate", "ignoreCase": "key" + }, + "outputStorageUri": { + "type": "string", + "description": "Storage Container URI", + "ignoreCase": "key" + }, + "outputStorageContainerSasToken": { + "type": "string", + "description": "Storage Container SAS Token", + "ignoreCase": "key" } }, "additionalProperties": false, "required": [ "SourcePath", - "azureSubscription", - "Destination", - "storage" + "Destination" ] } }, - "doNotSuggest": false, + "deprecationMessage": "AzureFileCopy is deprecated - Copy files to Azure Blob Storage or virtual machines", + "doNotSuggest": true, "firstProperty": [ "task" ], @@ -21010,7 +20948,121 @@ } }, "additionalProperties": false, - "required": [] + "required": [] + } + }, + "doNotSuggest": false, + "firstProperty": [ + "task" + ], + "required": [ + "task" + ] + }, + { + "properties": { + "task": { + "description": "Jenkins download artifacts\n\nDownload artifacts produced by a Jenkins job", + "ignoreCase": "value", + "pattern": "^JenkinsDownloadArtifacts@1$" + }, + "inputs": { + "description": "Jenkins download artifacts inputs", + "properties": { + "jenkinsServerConnection": { + "type": "string", + "description": "Jenkins service connection", + "ignoreCase": "key", + "aliases": [ + "serverEndpoint" + ] + }, + "jobName": { + "type": "string", + "description": "Job name", + "ignoreCase": "key" + }, + "jenkinsJobType": { + "type": "string", + "description": "Jenkins job type", + "ignoreCase": "key" + }, + "saveTo": { + "type": "string", + "description": "Save to", + "ignoreCase": "key" + }, + "jenkinsBuild": { + "description": "Download artifacts produced by", + "ignoreCase": "all", + "enum": [ + "LastSuccessfulBuild", + "BuildNumber" + ] + }, + "jenkinsBuildNumber": { + "type": "string", + "description": "Jenkins build number", + "ignoreCase": "key" + }, + "itemPattern": { + "type": "string", + "description": "Item Pattern", + "ignoreCase": "key" + }, + "downloadCommitsAndWorkItems": { + "type": "boolean", + "description": "Download Commits and WorkItems", + "ignoreCase": "key" + }, + "startJenkinsBuildNumber": { + "type": "string", + "description": "Download commits and work items from", + "ignoreCase": "key" + }, + "artifactDetailsFileNameSuffix": { + "type": "string", + "description": "Commit and WorkItem FileName", + "ignoreCase": "key" + }, + "propagatedArtifacts": { + "type": "boolean", + "description": "Artifacts are propagated to Azure", + "ignoreCase": "key" + }, + "artifactProvider": { + "description": "Artifact Provider", + "ignoreCase": "all", + "enum": [ + "azureStorage" + ] + }, + "ConnectedServiceNameARM": { + "type": "string", + "description": "Azure Subscription", + "ignoreCase": "key" + }, + "storageAccountName": { + "type": "string", + "description": "Storage Account Name", + "ignoreCase": "key" + }, + "containerName": { + "type": "string", + "description": "Container Name", + "ignoreCase": "key" + }, + "commonVirtualPath": { + "type": "string", + "description": "Common Virtual Path", + "ignoreCase": "key" + } + }, + "additionalProperties": false, + "required": [ + "jenkinsServerConnection", + "jobName" + ] } }, "doNotSuggest": false, @@ -21018,7 +21070,8 @@ "task" ], "required": [ - "task" + "task", + "inputs" ] }, { @@ -21026,7 +21079,7 @@ "task": { "description": "Jenkins download artifacts\n\nDownload artifacts produced by a Jenkins job", "ignoreCase": "value", - "pattern": "^JenkinsDownloadArtifacts@1$" + "pattern": "^JenkinsDownloadArtifacts@2$" }, "inputs": { "description": "Jenkins download artifacts inputs", @@ -21269,7 +21322,7 @@ "task": { "description": "Package and deploy Helm charts\n\nDeploy, configure, update a Kubernetes cluster in Azure Container Service by running helm commands", "ignoreCase": "value", - "pattern": "^HelmDeploy@0$" + "pattern": "^HelmDeploy@1$" }, "inputs": { "description": "Package and deploy Helm charts inputs", @@ -21352,7 +21405,6 @@ "ls", "package", "rollback", - "save", "upgrade", "uninstall" ] @@ -21533,7 +21585,7 @@ "task": { "description": "Package and deploy Helm charts\n\nDeploy, configure, update a Kubernetes cluster in Azure Container Service by running helm commands", "ignoreCase": "value", - "pattern": "^HelmDeploy@1$" + "pattern": "^HelmDeploy@0$" }, "inputs": { "description": "Package and deploy Helm charts inputs", @@ -21615,8 +21667,8 @@ "logout", "ls", "package", - "push", "rollback", + "save", "upgrade", "uninstall" ] @@ -22529,7 +22581,8 @@ ] } }, - "doNotSuggest": false, + "deprecationMessage": "SonarQubePreBuild is deprecated - [DEPRECATED] Fetch the Quality Profile from SonarQube to configure the analysis", + "doNotSuggest": true, "firstProperty": [ "task" ], @@ -23885,112 +23938,6 @@ "inputs" ] }, - { - "properties": { - "task": { - "description": "Visual Studio Test\n\nRun tests with Visual Studio test runner", - "ignoreCase": "value", - "pattern": "^VSTest@1$" - }, - "inputs": { - "description": "Visual Studio Test inputs", - "properties": { - "testAssembly": { - "type": "string", - "description": "Test Assembly", - "ignoreCase": "key" - }, - "testFiltercriteria": { - "type": "string", - "description": "Test Filter criteria", - "ignoreCase": "key" - }, - "runSettingsFile": { - "type": "string", - "description": "Run Settings File", - "ignoreCase": "key" - }, - "overrideTestrunParameters": { - "type": "string", - "description": "Override TestRun Parameters", - "ignoreCase": "key" - }, - "codeCoverageEnabled": { - "type": "boolean", - "description": "Code Coverage Enabled", - "ignoreCase": "key" - }, - "runInParallel": { - "type": "boolean", - "description": "Run In Parallel", - "ignoreCase": "key" - }, - "vstestLocationMethod": { - "description": "VSTest", - "ignoreCase": "all", - "enum": [ - "version", - "location" - ] - }, - "vsTestVersion": { - "description": "VSTest version", - "ignoreCase": "all", - "enum": [ - "latest", - "14.0", - "12.0" - ] - }, - "vstestLocation": { - "type": "string", - "description": "Path to vstest.console.exe", - "ignoreCase": "key" - }, - "pathtoCustomTestAdapters": { - "type": "string", - "description": "Path to Custom Test Adapters", - "ignoreCase": "key" - }, - "otherConsoleOptions": { - "type": "string", - "description": "Other console options", - "ignoreCase": "key" - }, - "testRunTitle": { - "type": "string", - "description": "Test Run Title", - "ignoreCase": "key" - }, - "platform": { - "type": "string", - "description": "Platform", - "ignoreCase": "key" - }, - "configuration": { - "type": "string", - "description": "Configuration", - "ignoreCase": "key" - }, - "publishRunAttachments": { - "type": "boolean", - "description": "Upload Test Attachments", - "ignoreCase": "key" - } - }, - "additionalProperties": false, - "required": [] - } - }, - "deprecationMessage": "VSTest is deprecated - Run tests with Visual Studio test runner", - "doNotSuggest": true, - "firstProperty": [ - "task" - ], - "required": [ - "task" - ] - }, { "properties": { "task": { @@ -24517,12 +24464,118 @@ "task" ] }, + { + "properties": { + "task": { + "description": "Visual Studio Test\n\nRun tests with Visual Studio test runner", + "ignoreCase": "value", + "pattern": "^VSTest@1$" + }, + "inputs": { + "description": "Visual Studio Test inputs", + "properties": { + "testAssembly": { + "type": "string", + "description": "Test Assembly", + "ignoreCase": "key" + }, + "testFiltercriteria": { + "type": "string", + "description": "Test Filter criteria", + "ignoreCase": "key" + }, + "runSettingsFile": { + "type": "string", + "description": "Run Settings File", + "ignoreCase": "key" + }, + "overrideTestrunParameters": { + "type": "string", + "description": "Override TestRun Parameters", + "ignoreCase": "key" + }, + "codeCoverageEnabled": { + "type": "boolean", + "description": "Code Coverage Enabled", + "ignoreCase": "key" + }, + "runInParallel": { + "type": "boolean", + "description": "Run In Parallel", + "ignoreCase": "key" + }, + "vstestLocationMethod": { + "description": "VSTest", + "ignoreCase": "all", + "enum": [ + "version", + "location" + ] + }, + "vsTestVersion": { + "description": "VSTest version", + "ignoreCase": "all", + "enum": [ + "latest", + "14.0", + "12.0" + ] + }, + "vstestLocation": { + "type": "string", + "description": "Path to vstest.console.exe", + "ignoreCase": "key" + }, + "pathtoCustomTestAdapters": { + "type": "string", + "description": "Path to Custom Test Adapters", + "ignoreCase": "key" + }, + "otherConsoleOptions": { + "type": "string", + "description": "Other console options", + "ignoreCase": "key" + }, + "testRunTitle": { + "type": "string", + "description": "Test Run Title", + "ignoreCase": "key" + }, + "platform": { + "type": "string", + "description": "Platform", + "ignoreCase": "key" + }, + "configuration": { + "type": "string", + "description": "Configuration", + "ignoreCase": "key" + }, + "publishRunAttachments": { + "type": "boolean", + "description": "Upload Test Attachments", + "ignoreCase": "key" + } + }, + "additionalProperties": false, + "required": [] + } + }, + "deprecationMessage": "VSTest is deprecated - Run tests with Visual Studio test runner", + "doNotSuggest": true, + "firstProperty": [ + "task" + ], + "required": [ + "task" + ] + }, { "properties": { "task": { "description": "Manual validation\n\nPause a pipeline run to wait for manual interaction. Works only with YAML pipelines.", "ignoreCase": "value", - "pattern": "^ManualValidation@0$" + "pattern": "^ManualValidation@1$" }, "inputs": { "description": "Manual validation inputs", @@ -24532,6 +24585,16 @@ "description": "Notify users", "ignoreCase": "key" }, + "approvers": { + "type": "string", + "description": "Approvers", + "ignoreCase": "key" + }, + "allowApproversToApproveTheirOwnRuns": { + "type": "boolean", + "description": "Allow approvers to approve their own run", + "ignoreCase": "key" + }, "instructions": { "type": "string", "description": "Instructions", @@ -24566,7 +24629,7 @@ "task": { "description": "Manual validation\n\nPause a pipeline run to wait for manual interaction. Works only with YAML pipelines.", "ignoreCase": "value", - "pattern": "^ManualValidation@1$" + "pattern": "^ManualValidation@0$" }, "inputs": { "description": "Manual validation inputs", @@ -24576,11 +24639,6 @@ "description": "Notify users", "ignoreCase": "key" }, - "approvers": { - "type": "string", - "description": "Approvers", - "ignoreCase": "key" - }, "instructions": { "type": "string", "description": "Instructions", @@ -25389,12 +25447,12 @@ { "properties": { "task": { - "description": ".NET Core SDK/runtime installer\n\nAcquire a specific version of the .NET Core SDK from the internet or local cache and add it to the PATH", + "description": "Use .NET Core\n\nAcquires a specific version of the .NET Core SDK from the internet or the local cache and adds it to the PATH. Use this task to change the version of .NET Core used in subsequent tasks. Additionally provides proxy support.", "ignoreCase": "value", - "pattern": "^DotNetCoreInstaller@0$" + "pattern": "^UseDotNet@2$" }, "inputs": { - "description": ".NET Core SDK/runtime installer inputs", + "description": "Use .NET Core inputs", "properties": { "packageType": { "description": "Package to install", @@ -25404,18 +25462,52 @@ "sdk" ] }, + "useGlobalJson": { + "type": "boolean", + "description": "Use global json", + "ignoreCase": "key" + }, + "workingDirectory": { + "type": "string", + "description": "Working Directory", + "ignoreCase": "key" + }, "version": { "type": "string", "description": "Version", "ignoreCase": "key" + }, + "vsVersion": { + "type": "string", + "description": "Compatible Visual Studio version", + "ignoreCase": "key" + }, + "includePreviewVersions": { + "type": "boolean", + "description": "Include Preview Versions", + "ignoreCase": "key" + }, + "installationPath": { + "type": "string", + "description": "Path To Install .Net Core", + "ignoreCase": "key" + }, + "performMultiLevelLookup": { + "type": "boolean", + "description": "Perform Multi Level Lookup", + "ignoreCase": "key" + }, + "requestTimeout": { + "type": "integer", + "description": "Set timeout for package download request", + "ignoreCase": "key" } }, "additionalProperties": false, "required": [] } }, - "deprecationMessage": "DotNetCoreInstaller is deprecated - Acquire a specific version of the .NET Core SDK from the internet or local cache and add it to the PATH", - "doNotSuggest": true, + "doNotSuggest": false, "firstProperty": [ "task" ], @@ -25426,12 +25518,12 @@ { "properties": { "task": { - "description": ".NET Core sdk/runtime installer\n\nAcquire a specific version of the .NET Core SDK from the internet or local cache and add it to the PATH", + "description": ".NET Core SDK/runtime installer\n\nAcquire a specific version of the .NET Core SDK from the internet or local cache and add it to the PATH", "ignoreCase": "value", - "pattern": "^DotNetCoreInstaller@1$" + "pattern": "^DotNetCoreInstaller@0$" }, "inputs": { - "description": ".NET Core sdk/runtime installer inputs", + "description": ".NET Core SDK/runtime installer inputs", "properties": { "packageType": { "description": "Package to install", @@ -25445,21 +25537,6 @@ "type": "string", "description": "Version", "ignoreCase": "key" - }, - "includePreviewVersions": { - "type": "boolean", - "description": "Include Preview Versions", - "ignoreCase": "key" - }, - "installationPath": { - "type": "string", - "description": "Path To Install .Net Core", - "ignoreCase": "key" - }, - "performMultiLevelLookup": { - "type": "boolean", - "description": "Perform Multi Level Lookup", - "ignoreCase": "key" } }, "additionalProperties": false, @@ -25478,12 +25555,12 @@ { "properties": { "task": { - "description": "Use .NET Core\n\nAcquires a specific version of the .NET Core SDK from the internet or the local cache and adds it to the PATH. Use this task to change the version of .NET Core used in subsequent tasks. Additionally provides proxy support.", + "description": ".NET Core sdk/runtime installer\n\nAcquire a specific version of the .NET Core SDK from the internet or local cache and add it to the PATH", "ignoreCase": "value", - "pattern": "^UseDotNet@2$" + "pattern": "^DotNetCoreInstaller@1$" }, "inputs": { - "description": "Use .NET Core inputs", + "description": ".NET Core sdk/runtime installer inputs", "properties": { "packageType": { "description": "Package to install", @@ -25493,26 +25570,11 @@ "sdk" ] }, - "useGlobalJson": { - "type": "boolean", - "description": "Use global json", - "ignoreCase": "key" - }, - "workingDirectory": { - "type": "string", - "description": "Working Directory", - "ignoreCase": "key" - }, "version": { "type": "string", "description": "Version", "ignoreCase": "key" }, - "vsVersion": { - "type": "string", - "description": "Compatible Visual Studio version", - "ignoreCase": "key" - }, "includePreviewVersions": { "type": "boolean", "description": "Include Preview Versions", @@ -25527,18 +25589,14 @@ "type": "boolean", "description": "Perform Multi Level Lookup", "ignoreCase": "key" - }, - "requestTimeout": { - "type": "integer", - "description": "Set timeout for package download request", - "ignoreCase": "key" } }, "additionalProperties": false, "required": [] } }, - "doNotSuggest": false, + "deprecationMessage": "DotNetCoreInstaller is deprecated - Acquire a specific version of the .NET Core SDK from the internet or local cache and add it to the PATH", + "doNotSuggest": true, "firstProperty": [ "task" ], @@ -25858,7 +25916,7 @@ "task": { "description": "File transform\n\nReplace tokens with variable values in XML or JSON configuration files", "ignoreCase": "value", - "pattern": "^FileTransform@1$" + "pattern": "^FileTransform@2$" }, "inputs": { "description": "File transform inputs", @@ -25875,20 +25933,17 @@ }, "xmlTransformationRules": { "type": "string", - "description": "Transformation rules", + "description": "XML Transformation rules", "ignoreCase": "key" }, - "fileType": { - "description": "File format", - "ignoreCase": "all", - "enum": [ - "xml", - "json" - ] + "jsonTargetFiles": { + "type": "string", + "description": "JSON target files", + "ignoreCase": "key" }, - "targetFiles": { + "xmlTargetFiles": { "type": "string", - "description": "Target files", + "description": "XML target files", "ignoreCase": "key" } }, @@ -25896,8 +25951,7 @@ "required": [] } }, - "deprecationMessage": "FileTransform is deprecated - Replace tokens with variable values in XML or JSON configuration files", - "doNotSuggest": true, + "doNotSuggest": false, "firstProperty": [ "task" ], @@ -25910,7 +25964,7 @@ "task": { "description": "File transform\n\nReplace tokens with variable values in XML or JSON configuration files", "ignoreCase": "value", - "pattern": "^FileTransform@2$" + "pattern": "^FileTransform@1$" }, "inputs": { "description": "File transform inputs", @@ -25920,19 +25974,27 @@ "description": "Package or folder", "ignoreCase": "key" }, - "xmlTransformationRules": { - "type": "string", - "description": "XML Transformation rules", + "enableXmlTransform": { + "type": "boolean", + "description": "XML transformation", "ignoreCase": "key" }, - "jsonTargetFiles": { + "xmlTransformationRules": { "type": "string", - "description": "JSON target files", + "description": "Transformation rules", "ignoreCase": "key" }, - "xmlTargetFiles": { + "fileType": { + "description": "File format", + "ignoreCase": "all", + "enum": [ + "xml", + "json" + ] + }, + "targetFiles": { "type": "string", - "description": "XML target files", + "description": "Target files", "ignoreCase": "key" } }, @@ -25940,7 +26002,8 @@ "required": [] } }, - "doNotSuggest": false, + "deprecationMessage": "FileTransform is deprecated - Replace tokens with variable values in XML or JSON configuration files", + "doNotSuggest": true, "firstProperty": [ "task" ], @@ -26203,7 +26266,8 @@ ] } }, - "doNotSuggest": false, + "deprecationMessage": "CopyPublishBuildArtifacts is deprecated - [DEPRECATED] Use the Copy Files task and the Publish Build Artifacts task instead", + "doNotSuggest": true, "firstProperty": [ "task" ], @@ -26442,171 +26506,39 @@ "description": "Team project", "ignoreCase": "key", "aliases": [ - "project" - ] - }, - "deploymentGroupName": { - "type": "string", - "description": "Deployment Group", - "ignoreCase": "key" - }, - "copyAzureVMTags": { - "type": "boolean", - "description": "Copy Azure VM tags to agents", - "ignoreCase": "key" - }, - "runAgentServiceAsUser": { - "type": "boolean", - "description": "Run agent service as a user", - "ignoreCase": "key" - }, - "userName": { - "type": "string", - "description": "User name", - "ignoreCase": "key" - }, - "password": { - "type": "string", - "description": "Password", - "ignoreCase": "key" - }, - "outputVariable": { - "type": "string", - "description": "VM details for WinRM", - "ignoreCase": "key" - }, - "deploymentName": { - "type": "string", - "description": "Deployment name", - "ignoreCase": "key" - }, - "deploymentOutputs": { - "type": "string", - "description": "Deployment outputs", - "ignoreCase": "key" - }, - "addSpnToEnvironment": { - "type": "boolean", - "description": "Access service principal details in override parameters", - "ignoreCase": "key" - }, - "useWithoutJSON": { - "type": "boolean", - "description": "Use individual output values without JSON.Stringify applied", - "ignoreCase": "key" - } - }, - "additionalProperties": false, - "required": [ - "azureSubscription", - "resourceGroupName" - ] - } - }, - "doNotSuggest": false, - "firstProperty": [ - "task" - ], - "required": [ - "task", - "inputs" - ] - }, - { - "properties": { - "task": { - "description": "ARM template deployment\n\nDeploy an Azure Resource Manager (ARM) template to all the deployment scopes", - "ignoreCase": "value", - "pattern": "^AzureResourceManagerTemplateDeployment@3$" - }, - "inputs": { - "description": "ARM template deployment inputs", - "properties": { - "deploymentScope": { - "description": "Deployment scope", - "ignoreCase": "all", - "enum": [ - "Management Group", - "Subscription", - "Resource Group" - ] - }, - "azureResourceManagerConnection": { - "type": "string", - "description": "Azure Resource Manager connection", - "ignoreCase": "key", - "aliases": [ - "ConnectedServiceName" - ] - }, - "subscriptionId": { - "type": "string", - "description": "Subscription", - "ignoreCase": "key", - "aliases": [ - "subscriptionName" - ] - }, - "action": { - "description": "Action", - "ignoreCase": "all", - "enum": [ - "Create Or Update Resource Group", - "DeleteRG" - ] - }, - "resourceGroupName": { - "type": "string", - "description": "Resource group", - "ignoreCase": "key" + "project" + ] }, - "location": { + "deploymentGroupName": { "type": "string", - "description": "Location", + "description": "Deployment Group", "ignoreCase": "key" }, - "templateLocation": { - "description": "Template location", - "ignoreCase": "all", - "enum": [ - "Linked artifact", - "URL of the file" - ] - }, - "csmFileLink": { - "type": "string", - "description": "Template link", + "copyAzureVMTags": { + "type": "boolean", + "description": "Copy Azure VM tags to agents", "ignoreCase": "key" }, - "csmParametersFileLink": { - "type": "string", - "description": "Template parameters link", + "runAgentServiceAsUser": { + "type": "boolean", + "description": "Run agent service as a user", "ignoreCase": "key" }, - "csmFile": { + "userName": { "type": "string", - "description": "Template", + "description": "User name", "ignoreCase": "key" }, - "csmParametersFile": { + "password": { "type": "string", - "description": "Template parameters", + "description": "Password", "ignoreCase": "key" }, - "overrideParameters": { + "outputVariable": { "type": "string", - "description": "Override template parameters", + "description": "VM details for WinRM", "ignoreCase": "key" }, - "deploymentMode": { - "description": "Deployment mode", - "ignoreCase": "all", - "enum": [ - "Incremental", - "Complete", - "Validation" - ] - }, "deploymentName": { "type": "string", "description": "Deployment name", @@ -26630,7 +26562,8 @@ }, "additionalProperties": false, "required": [ - "azureResourceManagerConnection" + "azureSubscription", + "resourceGroupName" ] } }, @@ -26784,6 +26717,137 @@ "task" ] }, + { + "properties": { + "task": { + "description": "ARM template deployment\n\nDeploy an Azure Resource Manager (ARM) template to all the deployment scopes", + "ignoreCase": "value", + "pattern": "^AzureResourceManagerTemplateDeployment@3$" + }, + "inputs": { + "description": "ARM template deployment inputs", + "properties": { + "deploymentScope": { + "description": "Deployment scope", + "ignoreCase": "all", + "enum": [ + "Management Group", + "Subscription", + "Resource Group" + ] + }, + "azureResourceManagerConnection": { + "type": "string", + "description": "Azure Resource Manager connection", + "ignoreCase": "key", + "aliases": [ + "ConnectedServiceName" + ] + }, + "subscriptionId": { + "type": "string", + "description": "Subscription", + "ignoreCase": "key", + "aliases": [ + "subscriptionName" + ] + }, + "action": { + "description": "Action", + "ignoreCase": "all", + "enum": [ + "Create Or Update Resource Group", + "DeleteRG" + ] + }, + "resourceGroupName": { + "type": "string", + "description": "Resource group", + "ignoreCase": "key" + }, + "location": { + "type": "string", + "description": "Location", + "ignoreCase": "key" + }, + "templateLocation": { + "description": "Template location", + "ignoreCase": "all", + "enum": [ + "Linked artifact", + "URL of the file" + ] + }, + "csmFileLink": { + "type": "string", + "description": "Template link", + "ignoreCase": "key" + }, + "csmParametersFileLink": { + "type": "string", + "description": "Template parameters link", + "ignoreCase": "key" + }, + "csmFile": { + "type": "string", + "description": "Template", + "ignoreCase": "key" + }, + "csmParametersFile": { + "type": "string", + "description": "Template parameters", + "ignoreCase": "key" + }, + "overrideParameters": { + "type": "string", + "description": "Override template parameters", + "ignoreCase": "key" + }, + "deploymentMode": { + "description": "Deployment mode", + "ignoreCase": "all", + "enum": [ + "Incremental", + "Complete", + "Validation" + ] + }, + "deploymentName": { + "type": "string", + "description": "Deployment name", + "ignoreCase": "key" + }, + "deploymentOutputs": { + "type": "string", + "description": "Deployment outputs", + "ignoreCase": "key" + }, + "addSpnToEnvironment": { + "type": "boolean", + "description": "Access service principal details in override parameters", + "ignoreCase": "key" + }, + "useWithoutJSON": { + "type": "boolean", + "description": "Use individual output values without JSON.Stringify applied", + "ignoreCase": "key" + } + }, + "additionalProperties": false, + "required": [ + "azureResourceManagerConnection" + ] + } + }, + "doNotSuggest": false, + "firstProperty": [ + "task" + ], + "required": [ + "task", + "inputs" + ] + }, { "properties": { "task": { @@ -27383,44 +27447,6 @@ "inputs" ] }, - { - "properties": { - "task": { - "description": "npm\n\nRun an npm command. Use NpmAuthenticate@0 task for latest capabilities.", - "ignoreCase": "value", - "pattern": "^Npm@0$" - }, - "inputs": { - "description": "npm inputs", - "properties": { - "cwd": { - "type": "string", - "description": "working folder", - "ignoreCase": "key" - }, - "command": { - "type": "string", - "description": "npm command", - "ignoreCase": "key" - }, - "arguments": { - "type": "string", - "description": "arguments", - "ignoreCase": "key" - } - }, - "additionalProperties": false, - "required": [] - } - }, - "doNotSuggest": false, - "firstProperty": [ - "task" - ], - "required": [ - "task" - ] - }, { "properties": { "task": { @@ -27487,14 +27513,52 @@ "description": "Target registry", "ignoreCase": "key" }, - "publishPackageMetadata": { - "type": "boolean", - "description": "Publish pipeline metadata", + "publishPackageMetadata": { + "type": "boolean", + "description": "Publish pipeline metadata", + "ignoreCase": "key" + }, + "publishEndpoint": { + "type": "string", + "description": "External Registry", + "ignoreCase": "key" + } + }, + "additionalProperties": false, + "required": [] + } + }, + "doNotSuggest": false, + "firstProperty": [ + "task" + ], + "required": [ + "task" + ] + }, + { + "properties": { + "task": { + "description": "npm\n\nRun an npm command. Use NpmAuthenticate@0 task for latest capabilities.", + "ignoreCase": "value", + "pattern": "^Npm@0$" + }, + "inputs": { + "description": "npm inputs", + "properties": { + "cwd": { + "type": "string", + "description": "working folder", + "ignoreCase": "key" + }, + "command": { + "type": "string", + "description": "npm command", "ignoreCase": "key" }, - "publishEndpoint": { + "arguments": { "type": "string", - "description": "External Registry", + "description": "arguments", "ignoreCase": "key" } }, @@ -27608,6 +27672,16 @@ "type": "string", "description": "Data api location", "ignoreCase": "key" + }, + "azure_access_token": { + "type": "string", + "description": "Azure Access Token", + "ignoreCase": "key" + }, + "default_hostname": { + "type": "string", + "description": "Default Hostname", + "ignoreCase": "key" } }, "additionalProperties": false, @@ -27625,29 +27699,16 @@ { "properties": { "task": { - "description": "Node.js tool installer\n\nFinds or downloads and caches the specified version spec of Node.js and adds it to the PATH", + "description": "Use Node.js ecosystem\n\nSet up a Node.js environment and add it to the PATH, additionally providing proxy support", "ignoreCase": "value", - "pattern": "^NodeTool@0$" + "pattern": "^UseNode@1$" }, "inputs": { - "description": "Node.js tool installer inputs", + "description": "Use Node.js ecosystem inputs", "properties": { - "versionSource": { - "description": "Source of version", - "ignoreCase": "all", - "enum": [ - "spec", - "fromFile" - ] - }, - "versionSpec": { - "type": "string", - "description": "Version Spec", - "ignoreCase": "key" - }, - "versionFilePath": { + "version": { "type": "string", - "description": "Path to the .nvmrc file", + "description": "Version", "ignoreCase": "key" }, "checkLatest": { @@ -27660,11 +27721,6 @@ "description": "Use 32 bit version on x64 agents", "ignoreCase": "key" }, - "nodejsMirror": { - "type": "string", - "description": "Set source for Node.js binaries", - "ignoreCase": "key" - }, "retryCountOnDownloadFails": { "type": "string", "description": "Set retry count when nodes downloads failed", @@ -27691,16 +27747,29 @@ { "properties": { "task": { - "description": "Use Node.js ecosystem\n\nSet up a Node.js environment and add it to the PATH, additionally providing proxy support", + "description": "Node.js tool installer\n\nFinds or downloads and caches the specified version spec of Node.js and adds it to the PATH", "ignoreCase": "value", - "pattern": "^UseNode@1$" + "pattern": "^NodeTool@0$" }, "inputs": { - "description": "Use Node.js ecosystem inputs", + "description": "Node.js tool installer inputs", "properties": { - "version": { + "versionSource": { + "description": "Source of version", + "ignoreCase": "all", + "enum": [ + "spec", + "fromFile" + ] + }, + "versionSpec": { "type": "string", - "description": "Version", + "description": "Version Spec", + "ignoreCase": "key" + }, + "versionFilePath": { + "type": "string", + "description": "Path to the .nvmrc file", "ignoreCase": "key" }, "checkLatest": { @@ -27713,6 +27782,11 @@ "description": "Use 32 bit version on x64 agents", "ignoreCase": "key" }, + "nodejsMirror": { + "type": "string", + "description": "Set source for Node.js binaries", + "ignoreCase": "key" + }, "retryCountOnDownloadFails": { "type": "string", "description": "Set retry count when nodes downloads failed", @@ -29129,31 +29203,21 @@ { "properties": { "task": { - "description": "Azure CLI\n\nRun Azure CLI commands against an Azure subscription in a PowerShell Core/Shell script when running on Linux agent or PowerShell/PowerShell Core/Batch script when running on Windows agent.", + "description": "Azure CLI\n\nRun Azure CLI commands against an Azure subscription in a Shell script when running on Linux agent or Batch script when running on Windows agent.", "ignoreCase": "value", - "pattern": "^AzureCLI@2$" + "pattern": "^AzureCLI@1$" }, "inputs": { "description": "Azure CLI inputs", "properties": { "azureSubscription": { "type": "string", - "description": "Azure Resource Manager connection", + "description": "Azure subscription", "ignoreCase": "key", "aliases": [ "connectedServiceNameARM" ] }, - "scriptType": { - "description": "Script Type", - "ignoreCase": "all", - "enum": [ - "ps", - "pscore", - "batch", - "bash" - ] - }, "scriptLocation": { "description": "Script Location", "ignoreCase": "all", @@ -29174,19 +29238,10 @@ }, "arguments": { "type": "string", - "description": "Script Arguments", + "description": "Arguments", "ignoreCase": "key", "aliases": [ - "scriptArguments" - ] - }, - "powerShellErrorActionPreference": { - "description": "ErrorActionPreference", - "ignoreCase": "all", - "enum": [ - "stop", - "continue", - "silentlyContinue" + "args" ] }, "addSpnToEnvironment": { @@ -29211,27 +29266,11 @@ "type": "boolean", "description": "Fail on Standard Error", "ignoreCase": "key" - }, - "powerShellIgnoreLASTEXITCODE": { - "type": "boolean", - "description": "Ignore $LASTEXITCODE", - "ignoreCase": "key" - }, - "visibleAzLogin": { - "type": "boolean", - "description": "az login output visibility", - "ignoreCase": "key" - }, - "keepAzSessionActive": { - "type": "boolean", - "description": "[Experimental] Keep Azure CLI session active", - "ignoreCase": "key" } }, "additionalProperties": false, "required": [ - "azureSubscription", - "scriptType" + "azureSubscription" ] } }, @@ -29247,21 +29286,31 @@ { "properties": { "task": { - "description": "Azure CLI\n\nRun Azure CLI commands against an Azure subscription in a Shell script when running on Linux agent or Batch script when running on Windows agent.", + "description": "Azure CLI Preview\n\nRun a Shell or Batch script with Azure CLI commands against an azure subscription", "ignoreCase": "value", - "pattern": "^AzureCLI@1$" + "pattern": "^AzureCLI@0$" }, "inputs": { - "description": "Azure CLI inputs", + "description": "Azure CLI Preview inputs", "properties": { - "azureSubscription": { - "type": "string", - "description": "Azure subscription", - "ignoreCase": "key", - "aliases": [ + "connectedServiceNameSelector": { + "description": "Azure Connection Type", + "ignoreCase": "all", + "enum": [ + "connectedServiceName", "connectedServiceNameARM" ] }, + "connectedServiceNameARM": { + "type": "string", + "description": "AzureRM Subscription", + "ignoreCase": "key" + }, + "connectedServiceName": { + "type": "string", + "description": "Azure Classic Subscription", + "ignoreCase": "key" + }, "scriptLocation": { "description": "Script Location", "ignoreCase": "all", @@ -29280,31 +29329,15 @@ "description": "Inline Script", "ignoreCase": "key" }, - "arguments": { + "args": { "type": "string", "description": "Arguments", - "ignoreCase": "key", - "aliases": [ - "args" - ] - }, - "addSpnToEnvironment": { - "type": "boolean", - "description": "Access service principal details in script", - "ignoreCase": "key" - }, - "useGlobalConfig": { - "type": "boolean", - "description": "Use global Azure CLI configuration", "ignoreCase": "key" }, - "workingDirectory": { + "cwd": { "type": "string", "description": "Working Directory", - "ignoreCase": "key", - "aliases": [ - "cwd" - ] + "ignoreCase": "key" }, "failOnStandardError": { "type": "boolean", @@ -29313,9 +29346,7 @@ } }, "additionalProperties": false, - "required": [ - "azureSubscription" - ] + "required": [] } }, "doNotSuggest": false, @@ -29323,37 +29354,36 @@ "task" ], "required": [ - "task", - "inputs" + "task" ] }, { "properties": { "task": { - "description": "Azure CLI Preview\n\nRun a Shell or Batch script with Azure CLI commands against an azure subscription", + "description": "Azure CLI\n\nRun Azure CLI commands against an Azure subscription in a PowerShell Core/Shell script when running on Linux agent or PowerShell/PowerShell Core/Batch script when running on Windows agent.", "ignoreCase": "value", - "pattern": "^AzureCLI@0$" + "pattern": "^AzureCLI@2$" }, "inputs": { - "description": "Azure CLI Preview inputs", + "description": "Azure CLI inputs", "properties": { - "connectedServiceNameSelector": { - "description": "Azure Connection Type", - "ignoreCase": "all", - "enum": [ - "connectedServiceName", + "azureSubscription": { + "type": "string", + "description": "Azure Resource Manager connection", + "ignoreCase": "key", + "aliases": [ "connectedServiceNameARM" ] }, - "connectedServiceNameARM": { - "type": "string", - "description": "AzureRM Subscription", - "ignoreCase": "key" - }, - "connectedServiceName": { - "type": "string", - "description": "Azure Classic Subscription", - "ignoreCase": "key" + "scriptType": { + "description": "Script Type", + "ignoreCase": "all", + "enum": [ + "ps", + "pscore", + "batch", + "bash" + ] }, "scriptLocation": { "description": "Script Location", @@ -29373,24 +29403,67 @@ "description": "Inline Script", "ignoreCase": "key" }, - "args": { + "arguments": { "type": "string", - "description": "Arguments", + "description": "Script Arguments", + "ignoreCase": "key", + "aliases": [ + "scriptArguments" + ] + }, + "powerShellErrorActionPreference": { + "description": "ErrorActionPreference", + "ignoreCase": "all", + "enum": [ + "stop", + "continue", + "silentlyContinue" + ] + }, + "addSpnToEnvironment": { + "type": "boolean", + "description": "Access service principal details in script", "ignoreCase": "key" }, - "cwd": { + "useGlobalConfig": { + "type": "boolean", + "description": "Use global Azure CLI configuration", + "ignoreCase": "key" + }, + "workingDirectory": { "type": "string", "description": "Working Directory", - "ignoreCase": "key" + "ignoreCase": "key", + "aliases": [ + "cwd" + ] }, "failOnStandardError": { "type": "boolean", - "description": "Fail on Standard Error", + "description": "Fail on Standard Error", + "ignoreCase": "key" + }, + "powerShellIgnoreLASTEXITCODE": { + "type": "boolean", + "description": "Ignore $LASTEXITCODE", + "ignoreCase": "key" + }, + "visibleAzLogin": { + "type": "boolean", + "description": "az login output visibility", + "ignoreCase": "key" + }, + "keepAzSessionActive": { + "type": "boolean", + "description": "[Experimental] Keep Azure CLI session active", "ignoreCase": "key" } }, "additionalProperties": false, - "required": [] + "required": [ + "azureSubscription", + "scriptType" + ] } }, "doNotSuggest": false, @@ -29398,7 +29471,8 @@ "task" ], "required": [ - "task" + "task", + "inputs" ] }, { @@ -29406,7 +29480,7 @@ "task": { "description": "GitHub Release\n\nCreate, edit, or delete a GitHub release", "ignoreCase": "value", - "pattern": "^GitHubRelease@0$" + "pattern": "^GitHubRelease@1$" }, "inputs": { "description": "GitHub Release inputs", @@ -29439,8 +29513,8 @@ "description": "Tag source", "ignoreCase": "all", "enum": [ - "auto", - "manual" + "gitTag", + "userSpecifiedTag" ] }, "tagPattern": { @@ -29462,16 +29536,16 @@ "description": "Release notes source", "ignoreCase": "all", "enum": [ - "file", - "input" + "filePath", + "inline" ] }, - "releaseNotesFile": { + "releaseNotesFilePath": { "type": "string", "description": "Release notes file path", "ignoreCase": "key" }, - "releaseNotes": { + "releaseNotesInline": { "type": "string", "description": "Release notes", "ignoreCase": "key" @@ -29538,8 +29612,7 @@ ] } }, - "deprecationMessage": "GitHubRelease is deprecated - Create, edit, or delete a GitHub release", - "doNotSuggest": true, + "doNotSuggest": false, "firstProperty": [ "task" ], @@ -29553,7 +29626,7 @@ "task": { "description": "GitHub Release\n\nCreate, edit, or delete a GitHub release", "ignoreCase": "value", - "pattern": "^GitHubRelease@1$" + "pattern": "^GitHubRelease@0$" }, "inputs": { "description": "GitHub Release inputs", @@ -29586,8 +29659,8 @@ "description": "Tag source", "ignoreCase": "all", "enum": [ - "gitTag", - "userSpecifiedTag" + "auto", + "manual" ] }, "tagPattern": { @@ -29609,16 +29682,16 @@ "description": "Release notes source", "ignoreCase": "all", "enum": [ - "filePath", - "inline" + "file", + "input" ] }, - "releaseNotesFilePath": { + "releaseNotesFile": { "type": "string", "description": "Release notes file path", "ignoreCase": "key" }, - "releaseNotesInline": { + "releaseNotes": { "type": "string", "description": "Release notes", "ignoreCase": "key" @@ -29685,7 +29758,8 @@ ] } }, - "doNotSuggest": false, + "deprecationMessage": "GitHubRelease is deprecated - Create, edit, or delete a GitHub release", + "doNotSuggest": true, "firstProperty": [ "task" ], @@ -30423,52 +30497,6 @@ "task" ] }, - { - "properties": { - "task": { - "description": "Shell Script\n\nRun a shell script using bash", - "ignoreCase": "value", - "pattern": "^ShellScript@1$" - }, - "inputs": { - "description": "Shell Script inputs", - "properties": { - "scriptPath": { - "type": "string", - "description": "Script Path", - "ignoreCase": "key" - }, - "args": { - "type": "string", - "description": "Arguments", - "ignoreCase": "key" - }, - "cwd": { - "type": "string", - "description": "Working Directory", - "ignoreCase": "key" - }, - "failOnStandardError": { - "type": "boolean", - "description": "Fail on Standard Error", - "ignoreCase": "key" - } - }, - "additionalProperties": false, - "required": [ - "scriptPath" - ] - } - }, - "doNotSuggest": false, - "firstProperty": [ - "task" - ], - "required": [ - "task", - "inputs" - ] - }, { "properties": { "task": { @@ -30890,32 +30918,19 @@ "task": { "description": "Azure Cloud Service deployment\n\nDeploy an Azure Cloud Service", "ignoreCase": "value", - "pattern": "^AzureCloudPowerShellDeployment@1$" + "pattern": "^AzureCloudPowerShellDeployment@2$" }, "inputs": { "description": "Azure Cloud Service deployment inputs", "properties": { - "azureClassicSubscription": { - "type": "string", - "description": "Azure subscription (Classic)", - "ignoreCase": "key", - "aliases": [ - "ConnectedServiceName" - ] - }, - "EnableAdvancedStorageOptions": { - "type": "boolean", - "description": "Enable ARM storage support", - "ignoreCase": "key" - }, - "StorageAccount": { + "ARMConnectedServiceName": { "type": "string", - "description": "Storage account (Classic)", + "description": "Azure subscription (ARM)", "ignoreCase": "key" }, - "ARMConnectedServiceName": { + "ResourceGroupName": { "type": "string", - "description": "Azure subscription (ARM)", + "description": "Resource group", "ignoreCase": "key" }, "ARMStorageAccount": { @@ -30933,23 +30948,25 @@ "description": "Service location", "ignoreCase": "key" }, - "CsPkg": { + "CsCfg": { "type": "string", - "description": "CsPkg", + "description": "CsCfg", "ignoreCase": "key" }, - "CsCfg": { + "CsDef": { "type": "string", - "description": "CsCfg", + "description": "CsDef", "ignoreCase": "key" }, - "slotName": { + "CsPkg": { "type": "string", - "description": "Environment (Slot)", - "ignoreCase": "key", - "aliases": [ - "Slot" - ] + "description": "CsPkg", + "ignoreCase": "key" + }, + "KeyVault": { + "type": "string", + "description": "Azure KeyVault", + "ignoreCase": "key" }, "DeploymentLabel": { "type": "string", @@ -30961,19 +30978,14 @@ "description": "Append current date and time", "ignoreCase": "key" }, - "AllowUpgrade": { - "type": "boolean", - "description": "Allow upgrade", - "ignoreCase": "key" - }, - "SimultaneousUpgrade": { - "type": "boolean", - "description": "Simultaneous upgrade", + "UpgradeMode": { + "type": "string", + "description": "Update mode for the cloud service", "ignoreCase": "key" }, - "ForceUpgrade": { + "AllowUpgrade": { "type": "boolean", - "description": "Force upgrade", + "description": "Allow upgrade", "ignoreCase": "key" }, "VerifyRoleInstanceStatus": { @@ -30985,30 +30997,18 @@ "type": "string", "description": "Diagnostic storage account keys", "ignoreCase": "key" - }, - "NewServiceCustomCertificates": { - "type": "string", - "description": "Custom certificates to import", - "ignoreCase": "key" - }, - "NewServiceAdditionalArguments": { - "type": "string", - "description": "Additional arguments", - "ignoreCase": "key" - }, - "NewServiceAffinityGroup": { - "type": "string", - "description": "Affinity group", - "ignoreCase": "key" } }, "additionalProperties": false, "required": [ - "azureClassicSubscription", + "ARMConnectedServiceName", + "ResourceGroupName", + "ARMStorageAccount", "ServiceName", "ServiceLocation", - "CsPkg", - "CsCfg" + "CsCfg", + "CsDef", + "CsPkg" ] } }, @@ -31027,19 +31027,32 @@ "task": { "description": "Azure Cloud Service deployment\n\nDeploy an Azure Cloud Service", "ignoreCase": "value", - "pattern": "^AzureCloudPowerShellDeployment@2$" + "pattern": "^AzureCloudPowerShellDeployment@1$" }, "inputs": { "description": "Azure Cloud Service deployment inputs", "properties": { - "ARMConnectedServiceName": { + "azureClassicSubscription": { "type": "string", - "description": "Azure subscription (ARM)", + "description": "Azure subscription (Classic)", + "ignoreCase": "key", + "aliases": [ + "ConnectedServiceName" + ] + }, + "EnableAdvancedStorageOptions": { + "type": "boolean", + "description": "Enable ARM storage support", "ignoreCase": "key" }, - "ResourceGroupName": { + "StorageAccount": { "type": "string", - "description": "Resource group", + "description": "Storage account (Classic)", + "ignoreCase": "key" + }, + "ARMConnectedServiceName": { + "type": "string", + "description": "Azure subscription (ARM)", "ignoreCase": "key" }, "ARMStorageAccount": { @@ -31057,26 +31070,24 @@ "description": "Service location", "ignoreCase": "key" }, - "CsCfg": { - "type": "string", - "description": "CsCfg", - "ignoreCase": "key" - }, - "CsDef": { - "type": "string", - "description": "CsDef", - "ignoreCase": "key" - }, "CsPkg": { "type": "string", "description": "CsPkg", "ignoreCase": "key" }, - "KeyVault": { + "CsCfg": { "type": "string", - "description": "Azure KeyVault", + "description": "CsCfg", "ignoreCase": "key" }, + "slotName": { + "type": "string", + "description": "Environment (Slot)", + "ignoreCase": "key", + "aliases": [ + "Slot" + ] + }, "DeploymentLabel": { "type": "string", "description": "Deployment label", @@ -31087,16 +31098,21 @@ "description": "Append current date and time", "ignoreCase": "key" }, - "UpgradeMode": { - "type": "string", - "description": "Update mode for the cloud service", - "ignoreCase": "key" - }, "AllowUpgrade": { "type": "boolean", "description": "Allow upgrade", "ignoreCase": "key" }, + "SimultaneousUpgrade": { + "type": "boolean", + "description": "Simultaneous upgrade", + "ignoreCase": "key" + }, + "ForceUpgrade": { + "type": "boolean", + "description": "Force upgrade", + "ignoreCase": "key" + }, "VerifyRoleInstanceStatus": { "type": "boolean", "description": "Verify role instance status", @@ -31106,18 +31122,30 @@ "type": "string", "description": "Diagnostic storage account keys", "ignoreCase": "key" + }, + "NewServiceCustomCertificates": { + "type": "string", + "description": "Custom certificates to import", + "ignoreCase": "key" + }, + "NewServiceAdditionalArguments": { + "type": "string", + "description": "Additional arguments", + "ignoreCase": "key" + }, + "NewServiceAffinityGroup": { + "type": "string", + "description": "Affinity group", + "ignoreCase": "key" } }, "additionalProperties": false, "required": [ - "ARMConnectedServiceName", - "ResourceGroupName", - "ARMStorageAccount", + "azureClassicSubscription", "ServiceName", "ServiceLocation", - "CsCfg", - "CsDef", - "CsPkg" + "CsPkg", + "CsCfg" ] } }, @@ -31942,4 +31970,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/check_jsonschema/builtin_schemas/vendor/bamboo-spec.json b/src/check_jsonschema/builtin_schemas/vendor/bamboo-spec.json index 25db38c5e..1b181ba86 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/bamboo-spec.json +++ b/src/check_jsonschema/builtin_schemas/vendor/bamboo-spec.json @@ -844,6 +844,18 @@ "type": "integer", "default": 2 }, + "branch-overrides": { + "description": "Overrides for specific branches in the plan", + "type": "array", + "items": { + "type": "object", + "patternProperties": { + "[a-zA-Z0-9\\s+_-]": { + "$ref": "#" + } + } + } + }, "other": { "type": "object" } diff --git a/src/check_jsonschema/builtin_schemas/vendor/buildkite.json b/src/check_jsonschema/builtin_schemas/vendor/buildkite.json index e544c8f4c..f2d23824c 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/buildkite.json +++ b/src/check_jsonschema/builtin_schemas/vendor/buildkite.json @@ -21,7 +21,7 @@ ], "definitions": { "allowDependencyFailure": { - "type": "boolean", + "enum": [true, false, "true", "false"], "description": "Whether to proceed with this step and further steps if a step named in the depends_on attribute fails", "default": false }, @@ -131,13 +131,8 @@ "type": "object", "properties": { "paths": { - "anyOf": [ - { "type": "string" }, - { - "type": "array", - "items": { "type": "string" } - } - ] + "type": "array", + "items": { "type": "string" } }, "size": { "type": "string", @@ -161,7 +156,7 @@ ] }, "cancelOnBuildFailing": { - "type": "boolean", + "enum": [true, false, "true", "false"], "description": "Whether to cancel the job as soon as the build is marked as failing", "default": false }, @@ -180,7 +175,7 @@ "properties": { "step": { "type": "string" }, "allow_failure": { - "type": "boolean", + "enum": [true, false, "true", "false"], "default": false } }, @@ -207,7 +202,9 @@ "type": "string", "description": "A unique identifier for a step, must not resemble a UUID", "examples": [ "deploy-staging", "test-integration" ], - "pattern": "^(?!^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$).*$" + "not": { + "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$" + } }, "label": { "type": "string", @@ -311,7 +308,8 @@ "description": "GitHub commit status name", "type": "string" } - } + }, + "additionalProperties": false }, "if": { "$ref": "#/definitions/if" @@ -379,7 +377,7 @@ ] }, "required": { - "type": "boolean", + "enum": [true, false, "true", "false"], "default": true, "description": "Whether the field is required for form submission" }, @@ -435,12 +433,13 @@ ] }, "multiple": { - "type": "boolean", + "enum": [true, false, "true", "false"], "description": "Whether more than one option may be selected", "default": false }, "options": { "type": "array", + "minItems": 1, "items": { "type": "object", "properties": { @@ -462,7 +461,7 @@ ] }, "required": { - "type": "boolean", + "enum": [true, false, "true", "false"], "default": true, "description": "Whether the field is required for form submission" } @@ -475,7 +474,7 @@ } }, "required": { - "type": "boolean", + "enum": [true, false, "true", "false"], "default": true, "description": "Whether the field is required for form submission" } @@ -508,7 +507,7 @@ { "type": "boolean" }, { "type": "string" } ], - "description": "Whether this step should be skipped. You can specify a reason for using a string.", + "description": "Whether this step should be skipped. Passing a string provides a reason for skipping this command", "examples": [ true, false, @@ -519,7 +518,7 @@ "description": "The conditions for marking the step as a soft-fail.", "anyOf": [ { - "type": "boolean" + "enum": [true, false, "true", "false"] }, { "type": "array", @@ -555,6 +554,7 @@ }, "blocked_state": { "type": "string", + "default": "passed", "description": "The state that the build is set to when the build is blocked by this block step", "enum": [ "passed", "failed", "running" ] }, @@ -581,10 +581,10 @@ "deprecated": true }, "label": { - "$ref": "#/definitions/label" + "$ref": "#/definitions/blockStep/properties/block" }, "name": { - "$ref": "#/definitions/label" + "$ref": "#/definitions/blockStep/properties/block" }, "prompt": { "$ref": "#/definitions/prompt" @@ -643,10 +643,10 @@ "deprecated": true }, "label": { - "$ref": "#/definitions/label" + "$ref": "#/definitions/inputStep/properties/input" }, "name": { - "$ref": "#/definitions/label" + "$ref": "#/definitions/inputStep/properties/input" }, "prompt": { "$ref": "#/definitions/prompt" @@ -703,9 +703,6 @@ "cache": { "$ref": "#/definitions/cache" }, - "cache": { - "$ref": "#/definitions/cache" - }, "cancel_on_build_failing": { "$ref": "#/definitions/cancelOnBuildFailing" }, @@ -880,7 +877,7 @@ ] }, "name": { - "$ref": "#/definitions/label" + "$ref": "#/definitions/commandStep/properties/label" }, "notify": { "type": "array", @@ -923,7 +920,8 @@ "message": { "type": "string" } - } + }, + "additionalProperties": false } ] }, @@ -943,7 +941,8 @@ "description": "GitHub commit status name", "type": "string" } - } + }, + "additionalProperties": false }, "if": { "$ref": "#/definitions/if" @@ -1015,8 +1014,7 @@ "automatic": { "anyOf": [ { - "type": ["boolean", "string"], - "pattern": "^(true|false)$" + "enum": [true, false, "true", "false"] }, { "$ref": "#/definitions/automaticRetry" @@ -1040,21 +1038,18 @@ "description": "Whether to allow a job to be retried manually", "anyOf": [ { - "type": ["boolean", "string"], - "pattern": "^(true|false)$" + "enum": [true, false, "true", "false"] }, { "type": "object", "properties": { "allowed": { - "type": ["boolean", "string"], - "pattern": "^(true|false)$", + "enum": [true, false, "true", "false"], "description": "Whether or not this job can be retried manually", "default": true }, "permit_on_passed": { - "type": ["boolean", "string"], - "pattern": "^(true|false)$", + "enum": [true, false, "true", "false"], "description": "Whether or not this job can be retried after it has passed", "default": true }, @@ -1068,9 +1063,11 @@ }, "additionalProperties": false } - ] + ], + "default": true } - } + }, + "additionalProperties": false }, "skip": { "$ref": "#/definitions/skip" @@ -1118,9 +1115,13 @@ "allow_dependency_failure": { "$ref": "#/definitions/allowDependencyFailure" }, + "branches": { + "$ref": "#/definitions/branches" + }, "continue_on_failure": { "description": "Continue to the next steps, even if the previous group of steps fail", - "type": "boolean" + "enum": [true, false, "true", "false"], + "default": false }, "depends_on": { "$ref": "#/definitions/dependsOn" @@ -1132,10 +1133,10 @@ "$ref": "#/definitions/key" }, "label": { - "$ref": "#/definitions/label" + "$ref": "#/definitions/waitStep/properties/wait" }, "name": { - "$ref": "#/definitions/label" + "$ref": "#/definitions/waitStep/properties/wait" }, "identifier": { "$ref": "#/definitions/waitStep/properties/key" @@ -1150,16 +1151,10 @@ }, "wait": { "description": "Waits for previous steps to pass before continuing", - "anyOf": [ - { "type": "null" }, - { "type": "string", "enum": [ "" ] } - ] + "type": ["string", "null"] }, "waiter": { - "anyOf": [ - { "type": "null" }, - { "type": "string", "enum": [ "" ] } - ] + "type": ["string", "null"] } }, "additionalProperties": false @@ -1184,7 +1179,7 @@ "$ref": "#/definitions/allowDependencyFailure" }, "async": { - "type": "boolean", + "enum": [true, false, "true", "false"], "default": false, "description": "Whether to continue the build without waiting for the triggered step to complete" }, @@ -1254,7 +1249,7 @@ "$ref": "#/definitions/label" }, "name": { - "$ref": "#/definitions/label" + "$ref": "#/definitions/triggerStep/properties/label" }, "type": { "type": "string", @@ -1313,7 +1308,7 @@ "$ref": "#/definitions/groupStep/properties/group" }, "name": { - "$ref": "#/definitions/groupStep/properties/label" + "$ref": "#/definitions/groupStep/properties/group" }, "allow_dependency_failure": { "$ref": "#/definitions/allowDependencyFailure" @@ -1345,13 +1340,9 @@ ] }, "minItems": 1 - }, - "type": { - "type": "string", - "enum": [ "group" ] } }, - "required": ["steps"], + "required": ["group", "steps"], "additionalProperties": false } }, diff --git a/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json b/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json index 3cbc2c68c..2f54c3f0d 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json +++ b/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json @@ -1071,7 +1071,38 @@ "description": "Jobs are run in parallel by default, so you must explicitly require any dependencies by their job name.", "type": "array", "items": { - "type": "string" + "oneOf": [ + { + "description": "A dependency defined by their job name.", + "type": "string" + }, + { + "description": "A dependency defined by their job name, and required statuses.", + "type": "object", + "minProperties": 1, + "maxProperties": 1, + "patternProperties": { + "^[A-Za-z][A-Za-z\\s\\d_-]*$": { + "oneOf": [ + { + "description": "A status that the job must have to satisfy the dependency.", + "type": "string", + "enum": ["success", "failed", "canceled"] + }, + { + "description": "A list of statuses that the job must have one of to satisfy the dependency.", + "type": "array", + "minLength": 1, + "items": { + "type": "string", + "enum": ["success", "failed", "canceled"] + } + } + ] + } + } + } + ] } }, "name": { diff --git a/src/check_jsonschema/builtin_schemas/vendor/dependabot.json b/src/check_jsonschema/builtin_schemas/vendor/dependabot.json index 0923e33ba..c860ceac1 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/dependabot.json +++ b/src/check_jsonschema/builtin_schemas/vendor/dependabot.json @@ -652,6 +652,7 @@ "composer", "devcontainers", "docker", + "dotnet-sdk", "elm", "gitsubmodule", "github-actions", diff --git a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json b/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json index df75eef7b..15b27b319 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json +++ b/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json @@ -397,14 +397,14 @@ "format": "uri-reference", "pattern": "\\w\\.ya?ml$", "anyOf": [ - { - "pattern": "^https?://" - }, - { - "not": { - "pattern": "^\\w+://" - } + { + "pattern": "^https?://" + }, + { + "not": { + "pattern": "^\\w+://" } + } ] }, { @@ -1755,7 +1755,7 @@ "default": false }, "inputs": { - "markdownDescription": "Used to pass input values to included templates or components. [Learn More](https://docs.gitlab.com/ee/ci/yaml/includes.html#set-input-parameter-values-with-includeinputs).", + "markdownDescription": "Used to pass input values to included templates or components. [Learn More](https://docs.gitlab.com/ee/ci/yaml/inputs.html#set-input-values-when-using-include).", "type": "object" }, "job": { @@ -2009,6 +2009,14 @@ "type": "string", "description": "The kubernetes namespace where this environment should be deployed to.", "minLength": 1 + }, + "agent": { + "type": "string", + "description": "Specifies the Gitlab Agent for Kubernetes. The format is `path/to/agent/project:agent-name`." + }, + "flux_resource_path": { + "type": "string", + "description": "The Flux resource path to associate with this environment. This must be the full resource path. For example, 'helm.toolkit.fluxcd.io/v2/namespaces/gitlab-agent/helmreleases/gitlab-agent'." } } }, @@ -2222,8 +2230,14 @@ "type": "string", "format": "uri-reference", "pattern": "\\.ya?ml$" + }, + "inputs": { + "$ref": "#/definitions/inputs" } - } + }, + "required": [ + "local" + ] }, { "type": "object", @@ -2234,8 +2248,14 @@ "type": "string", "format": "uri-reference", "pattern": "\\.ya?ml$" + }, + "inputs": { + "$ref": "#/definitions/inputs" } - } + }, + "required": [ + "template" + ] }, { "type": "object", @@ -2250,6 +2270,9 @@ "job": { "description": "Job name which generates the artifact", "type": "string" + }, + "inputs": { + "$ref": "#/definitions/inputs" } }, "required": [ @@ -2276,12 +2299,50 @@ "type": "string", "format": "uri-reference", "pattern": "\\.ya?ml$" + }, + "inputs": { + "$ref": "#/definitions/inputs" } }, "required": [ "project", "file" ] + }, + { + "type": "object", + "additionalProperties": false, + "properties": { + "component": { + "description": "Local path to component directory or full path to external component directory.", + "type": "string", + "format": "uri-reference" + }, + "inputs": { + "$ref": "#/definitions/inputs" + } + }, + "required": [ + "component" + ] + }, + { + "type": "object", + "additionalProperties": false, + "properties": { + "remote": { + "description": "URL to a `yaml`/`yml` template file using HTTP/HTTPS.", + "type": "string", + "format": "uri-reference", + "pattern": "^https?://.+\\.ya?ml$" + }, + "inputs": { + "$ref": "#/definitions/inputs" + } + }, + "required": [ + "remote" + ] } ] } diff --git a/src/check_jsonschema/builtin_schemas/vendor/mergify.json b/src/check_jsonschema/builtin_schemas/vendor/mergify.json index cbaf25bf8..3745006d4 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/mergify.json +++ b/src/check_jsonschema/builtin_schemas/vendor/mergify.json @@ -274,9 +274,11 @@ } ], "default": null, + "description": "Mergify can impersonate a GitHub user to copy a pull request. If no `bot_account` is set, Mergify copies the pull request itself.", "title": "Bot Account" }, "branches": { + "description": "The list of branches the pull request should be copied to.", "items": { "$ref": "#/$defs/BranchName" }, @@ -285,6 +287,7 @@ "type": "array" }, "regexes": { + "description": "The list of regexes to find branches the pull request should be copied to.", "items": { "format": "regex", "type": "string" @@ -295,10 +298,12 @@ }, "ignore_conflicts": { "default": true, + "description": "Whether to create the pull requests even if there are conflicts when cherry-picking the commits.", "title": "Ignore Conflicts", "type": "boolean" }, "assignees": { + "description": "Users to assign the newly created pull request to. As the type is a data type template, you could use, e.g., `{{author}}` to assign the pull request to its original author.", "items": { "description": "A string template using the Jinja2 syntax.", "format": "template", @@ -310,6 +315,7 @@ "type": "array" }, "labels": { + "description": "The list of labels to add to the created pull requests.", "items": { "type": "string" }, @@ -319,19 +325,20 @@ }, "label_conflicts": { "default": "conflicts", + "description": "The label to add to the created pull request if it has conflicts and `ignore_conflicts` is set to `true`.", "title": "Label Conflicts", "type": "string" }, "title": { "default": "{{ title }} (backport #{{ number }})", - "description": "A string template using the Jinja2 syntax.", + "description": "The pull request's title.", "format": "template", "title": "Template", "type": "string" }, "body": { "default": "{{ body }}
This is an automatic backport of pull request #{{number}} done by [Mergify](https://mergify.com).\n", - "description": "A string template using the Jinja2 syntax.", + "description": "The pull request's body.", "format": "template", "title": "Template", "type": "string" @@ -340,6 +347,7 @@ "default": [ "check" ], + "description": "List of reporting modes for the action's result.", "items": { "enum": [ "check", @@ -353,6 +361,7 @@ }, "merge_conflict_style": { "default": "merge", + "description": "Style used by git when displaying merge conflicts", "enum": [ "merge", "diff3" @@ -730,9 +739,11 @@ } ], "default": null, + "description": "Mergify can impersonate a GitHub user to copy a pull request. If no `bot_account` is set, Mergify copies the pull request itself.", "title": "Bot Account" }, "branches": { + "description": "The list of branches the pull request should be copied to.", "items": { "$ref": "#/$defs/BranchName" }, @@ -741,6 +752,7 @@ "type": "array" }, "regexes": { + "description": "The list of regexes to find branches the pull request should be copied to.", "items": { "format": "regex", "type": "string" @@ -751,10 +763,12 @@ }, "ignore_conflicts": { "default": true, + "description": "Whether to create the pull requests even if there are conflicts when cherry-picking the commits.", "title": "Ignore Conflicts", "type": "boolean" }, "assignees": { + "description": "Users to assign the newly created pull request to. As the type is a data type template, you could use, e.g., `{{author}}` to assign the pull request to its original author.", "items": { "description": "A string template using the Jinja2 syntax.", "format": "template", @@ -766,6 +780,7 @@ "type": "array" }, "labels": { + "description": "The list of labels to add to the created pull requests.", "items": { "type": "string" }, @@ -775,19 +790,20 @@ }, "label_conflicts": { "default": "conflicts", + "description": "The label to add to the created pull request if it has conflicts and `ignore_conflicts` is set to `true`.", "title": "Label Conflicts", "type": "string" }, "title": { "default": "{{ title }} (copy #{{ number }})", - "description": "A string template using the Jinja2 syntax.", + "description": "The pull request's title.", "format": "template", "title": "Template", "type": "string" }, "body": { "default": "{{ body }}
This is an automatic copy of pull request #{{number}} done by [Mergify](https://mergify.com).\n", - "description": "A string template using the Jinja2 syntax.", + "description": "The pull request's body.", "format": "template", "title": "Template", "type": "string" @@ -796,6 +812,7 @@ "default": [ "check" ], + "description": "List of reporting modes for the action's result.", "items": { "enum": [ "check", @@ -809,6 +826,7 @@ }, "merge_conflict_style": { "default": "merge", + "description": "Style used by git when displaying merge conflicts", "enum": [ "merge", "diff3" @@ -1670,7 +1688,8 @@ "DRAFT_PULL_REQUEST_CHANGED", "PULL_REQUEST_UPDATED", "MERGE_QUEUE_RESET", - "INCOMPATIBILITY_WITH_BRANCH_PROTECTIONS" + "INCOMPATIBILITY_WITH_BRANCH_PROTECTIONS", + "PR_MANUALLY_MERGED" ], "type": "string" }, @@ -2511,7 +2530,9 @@ }, "queue_branch_prefix": { "default": "mergify/merge-queue/", - "title": "Queue Branch Prefix", + "description": "Prefix for the merge queue branch name", + "format": "template", + "title": "Template", "type": "string" }, "allow_queue_branch_edit": { @@ -2624,11 +2645,6 @@ "title": "Update Bot Account" }, "disallow_checks_interruption_from_queues": { - "configuration_deprecated_attribute": { - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. This option has been replaced by `allow_checks_interruption` at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules", - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. This option has been replaced by `allow_checks_interruption` at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules" - }, - "deprecated": true, "items": { "type": "string" }, @@ -2772,7 +2788,9 @@ }, "queue_branch_prefix": { "default": "mergify/merge-queue/", - "title": "Queue Branch Prefix", + "description": "Prefix for the merge queue branch name", + "format": "template", + "title": "Template", "type": "string" }, "allow_queue_branch_edit": { @@ -2885,11 +2903,6 @@ "title": "Update Bot Account" }, "disallow_checks_interruption_from_queues": { - "configuration_deprecated_attribute": { - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. This option has been replaced by `allow_checks_interruption` at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules", - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. This option has been replaced by `allow_checks_interruption` at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules" - }, - "deprecated": true, "items": { "type": "string" }, diff --git a/src/check_jsonschema/builtin_schemas/vendor/readthedocs.json b/src/check_jsonschema/builtin_schemas/vendor/readthedocs.json index 716b04e55..f11436c0c 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/readthedocs.json +++ b/src/check_jsonschema/builtin_schemas/vendor/readthedocs.json @@ -337,7 +337,8 @@ "default": false } }, - "additionalProperties": false + "additionalProperties": false, + "required": ["configuration"] }, "mkdocs": { "title": "mkdocs", @@ -356,7 +357,8 @@ "default": false } }, - "additionalProperties": false + "additionalProperties": false, + "required": ["configuration"] }, "submodules": { "title": "Submodules", diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.json b/src/check_jsonschema/builtin_schemas/vendor/renovate.json index e15f210a1..dd5814cd7 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/renovate.json +++ b/src/check_jsonschema/builtin_schemas/vendor/renovate.json @@ -340,7 +340,7 @@ "type": "object", "default": { "fileMatch": [ - "(^|/)MODULE\\.bazel$" + "(^|/|\\.)MODULE\\.bazel$" ] }, "$ref": "#" @@ -486,7 +486,7 @@ "type": "object", "default": { "fileMatch": [ - "(^|/)bun\\.lockb$" + "(^|/)bun\\.lockb?$" ], "digest": { "prBodyDefinitions": { @@ -595,6 +595,16 @@ "type": "boolean", "default": false }, + "cloneSubmodulesFilter": { + "description": "List of submodules names or patterns to clone when cloneSubmodules=true.", + "type": "array", + "items": { + "type": "string" + }, + "default": [ + "*" + ] + }, "cloudbuild": { "description": "Configuration object for the cloudbuild manager", "type": "object", @@ -1062,7 +1072,7 @@ "dockerSidecarImage": { "description": "Change this value to override the default Renovate sidecar image.", "type": "string", - "default": "ghcr.io/containerbase/sidecar:13.0.22" + "default": "ghcr.io/containerbase/sidecar:13.5.8" }, "dockerUser": { "description": "Set the `UID` and `GID` for Docker-based binaries if you use `binarySource=docker`.", @@ -2150,8 +2160,7 @@ "default": { "fileMatch": [ "(^|/)mix\\.exs$" - ], - "versioning": "hex" + ] }, "$ref": "#" }, @@ -2780,6 +2789,7 @@ "gomodTidyE", "gomodUpdateImportPaths", "gomodSkipVendor", + "gomodVendor", "helmUpdateSubChartArchives", "npmDedupe", "pnpmDedupe", @@ -3622,6 +3632,7 @@ "conan", "deb", "debian", + "devbox", "docker", "git", "glasskube", @@ -3642,6 +3653,7 @@ "pep440", "perl", "poetry", + "pvp", "python", "redhat", "regex", diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/azure-pipelines.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/azure-pipelines.sha256 index b5119d70d..ffca9bc73 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/azure-pipelines.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/azure-pipelines.sha256 @@ -1 +1 @@ -f2226d40bb35249b3f4fca9506dfd02ba62ebcc94836dfffeb824714e24eb9f2 \ No newline at end of file +2ec6cc72f601459bc8b71ecc2ee49f3419c2daba554cd8653c7f72811446aa28 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/bamboo-spec.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/bamboo-spec.sha256 index 39b3d97c7..28e614fde 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/bamboo-spec.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/bamboo-spec.sha256 @@ -1 +1 @@ -e1e83c1f89e5ebdf9b87edb34f1edd75e7cc84897a796ad0ad72c6a87d492cf5 \ No newline at end of file +c7724c5e67e2d3fcb081a36adcbe2ba5f59c884937a09397139d85afc86985a2 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/buildkite.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/buildkite.sha256 index c9be8e74f..532cf89f0 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/buildkite.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/buildkite.sha256 @@ -1 +1 @@ -0878a74cdd66c80709a974fcff228fcf88bdf91bd5e2dc9f4585095e048ddabc \ No newline at end of file +761ceff545736b65fabe577b8e7d06ceb5baa9d339f8faa0192cd3c3d85d5a11 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 index bfc4ed031..557aa8af6 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 @@ -1 +1 @@ -d4c0017fcac91757f275ab6ffb20db5875c834027801970e897f118c87f2cf8a \ No newline at end of file +cd652ef789d666c07f2fd5e6236ae2a491e11506addb42466f6c9911fa997955 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 index 8324011d9..d75fcffb8 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 @@ -1 +1 @@ -235f4185dbf74d5fd7027c149a859701246f7880ba400f6a57e3617b5f51a36e \ No newline at end of file +bb1d6e2ddccbdc94a4ea84617fa89af57f6938b9ef72095583a31b6914c8ae1c \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 index 7d61b190b..b226c3b98 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 @@ -1 +1 @@ -6a37445f76d06a123cde0394e4515182beadac09601a3498fb97cae92f56b7dc \ No newline at end of file +da5b6762e83b0d89dd145d0f9b8a25ef068b790577304df65d2d2bd5a4e0b21f \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 index ff2cd035f..2b05ccd37 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 @@ -1 +1 @@ -b186fbf3e5c9e05b9d7e093f78d3f00b66fdf0d48bfc3d47fa5a98bae82eaaad \ No newline at end of file +d2afb9ba1f220ce421931d064c71a366e4e2c96f08bcb59e26d6b0c554cf21ba \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/readthedocs.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/readthedocs.sha256 index 1a3701294..5b21ceb74 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/readthedocs.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/readthedocs.sha256 @@ -1 +1 @@ -bee0e6132fa6026c47200ba811090b6cf52fe540a7e5eace0772cfb75fdc6a4a \ No newline at end of file +77278afd8de08da09665e12d305c9c23721e940d3869355eb6bda2a024a2f0d7 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 index c85d1b0fb..463e2b100 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 @@ -1 +1 @@ -21ab7b4d58d3b969075b252a311927c1400e10991f9156ccd850d6f8e0520ecb \ No newline at end of file +881689db799388cfc85d84bd89f565d69dd0869c0dfc60b83096252216980999 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 index 3b51f28dd..ba28a1442 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 @@ -1 +1 @@ -930b1b18014033bf786453195829eaa53ce8bd7834dc26c41f659f03b80ce265 \ No newline at end of file +e991e9f53f0615caf16c0777d9f38e5aa8243407283205110f3514d1375097ff \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/taskfile.json b/src/check_jsonschema/builtin_schemas/vendor/taskfile.json index 9389d04c5..da25a209f 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/taskfile.json +++ b/src/check_jsonschema/builtin_schemas/vendor/taskfile.json @@ -360,14 +360,7 @@ "type": "string" }, { - "type": "object", - "properties": { - "task": { - "description": "Name of the task to defer", - "type": "string" - } - }, - "additionalProperties": false + "$ref": "#/definitions/task_call" } ] } @@ -660,6 +653,13 @@ "type": "string" } }, + "excludes": { + "description": "A list of tasks to be excluded from inclusion.", + "type": "array", + "items": { + "type": "string" + } + }, "vars": { "description": "A set of variables to apply to the included Taskfile.", "$ref": "#/definitions/vars" diff --git a/src/check_jsonschema/catalog.py b/src/check_jsonschema/catalog.py index 0ac915c23..cebbd78a5 100644 --- a/src/check_jsonschema/catalog.py +++ b/src/check_jsonschema/catalog.py @@ -31,7 +31,12 @@ def _githubusercontent_url(owner: str, repo: str, ref: str, path: str) -> str: "Validate Azure Pipelines config against the schema provided " "by Microsoft" ), - "add_args": ["--data-transform", "azure-pipelines"], + "add_args": [ + "--data-transform", + "azure-pipelines", + "--regex-variant", + "nonunicode", + ], "files": r"^(\.)?azure-pipelines\.(yml|yaml)$", "types": "yaml", }, diff --git a/src/check_jsonschema/checker.py b/src/check_jsonschema/checker.py index 63d42d4e6..c6cd852eb 100644 --- a/src/check_jsonschema/checker.py +++ b/src/check_jsonschema/checker.py @@ -11,6 +11,7 @@ from .formats import FormatOptions from .instance_loader import InstanceLoader from .parsers import ParseError +from .regex_variants import RegexImplementation from .reporter import Reporter from .result import CheckResult from .schema_loader import SchemaLoaderBase, SchemaParseError, UnsupportedUrlScheme @@ -28,7 +29,8 @@ def __init__( instance_loader: InstanceLoader, reporter: Reporter, *, - format_opts: FormatOptions | None = None, + format_opts: FormatOptions, + regex_impl: RegexImplementation, traceback_mode: str = "short", fill_defaults: bool = False, ) -> None: @@ -36,7 +38,8 @@ def __init__( self._instance_loader = instance_loader self._reporter = reporter - self._format_opts = format_opts if format_opts is not None else FormatOptions() + self._format_opts = format_opts + self._regex_impl = regex_impl self._traceback_mode = traceback_mode self._fill_defaults = fill_defaults @@ -51,12 +54,12 @@ def get_validator( ) -> jsonschema.protocols.Validator: try: return self._schema_loader.get_validator( - path, doc, self._format_opts, self._fill_defaults + path, doc, self._format_opts, self._regex_impl, self._fill_defaults ) except SchemaParseError as e: self._fail("Error: schemafile could not be parsed as JSON", e) except jsonschema.SchemaError as e: - self._fail(f"Error: schemafile was not valid: {e}\n", e) + self._fail("Error: schemafile was not valid\n", e) except UnsupportedUrlScheme as e: self._fail(f"Error: {e}\n", e) except Exception as e: diff --git a/src/check_jsonschema/cli/main_command.py b/src/check_jsonschema/cli/main_command.py index 3a7aae643..9e93ff1ff 100644 --- a/src/check_jsonschema/cli/main_command.py +++ b/src/check_jsonschema/cli/main_command.py @@ -1,7 +1,6 @@ from __future__ import annotations import os -import sys import textwrap import typing as t @@ -10,9 +9,10 @@ from ..catalog import CUSTOM_SCHEMA_NAMES, SCHEMA_CATALOG from ..checker import SchemaChecker -from ..formats import KNOWN_FORMATS, RegexVariantName +from ..formats import KNOWN_FORMATS from ..instance_loader import InstanceLoader from ..parsers import SUPPORTED_FILE_FORMATS +from ..regex_variants import RegexImplementation, RegexVariantName from ..reporter import REPORTER_BY_NAME, Reporter from ..schema_loader import ( BuiltinSchemaLoader, @@ -24,11 +24,6 @@ from .param_types import CommaDelimitedList, LazyBinaryReadFile, ValidatorClassName from .parse_result import ParseResult, SchemaLoadingMode -if sys.version_info >= (3, 8): - from typing import Literal -else: - from typing_extensions import Literal - BUILTIN_SCHEMA_NAMES = [f"vendor.{k}" for k in SCHEMA_CATALOG.keys()] + [ f"custom.{k}" for k in CUSTOM_SCHEMA_NAMES ] @@ -74,10 +69,11 @@ def pretty_helptext_list(values: list[str] | tuple[str, ...]) -> str: date, date-time, email, ipv4, ipv6, regex, uuid \b -For the "regex" format, there are multiple modes which can be specified with -'--format-regex': - default | check that the string is a valid ECMAScript regex - python | check that the string is a valid python regex +For handling of regexes, there are multiple modes which can be specified with +'--regex-variant': + default | use ECMAScript regex syntax (via regress) + nonunicode | use ECMAScript regex syntax, but in non-unicode mode (via regress) + python | use python regex syntax \b The '--builtin-schema' flag supports the following schema names: @@ -144,11 +140,18 @@ def pretty_helptext_list(values: list[str] | tuple[str, ...]) -> str: ) @click.option( "--format-regex", + hidden=True, + help="Legacy name for `--regex-variant`.", + default=None, + type=click.Choice([x.value for x in RegexVariantName], case_sensitive=False), +) +@click.option( + "--regex-variant", help=( - "Set the mode of format validation for regexes. " - "If `--disable-formats regex` is used, this option has no effect." + "Name of which regex dialect should be used for format checking " + "and 'pattern' matching." ), - default=RegexVariantName.default.value, + default=None, type=click.Choice([x.value for x in RegexVariantName], case_sensitive=False), ) @click.option( @@ -236,19 +239,22 @@ def main( no_cache: bool, cache_filename: str | None, disable_formats: tuple[list[str], ...], - format_regex: Literal["python", "default"], - default_filetype: Literal["json", "yaml", "toml", "json5"], - traceback_mode: Literal["full", "short"], - data_transform: Literal["azure-pipelines", "gitlab-ci"] | None, + format_regex: t.Literal["python", "nonunicode", "default"] | None, + regex_variant: t.Literal["python", "nonunicode", "default"] | None, + default_filetype: t.Literal["json", "yaml", "toml", "json5"], + traceback_mode: t.Literal["full", "short"], + data_transform: t.Literal["azure-pipelines", "gitlab-ci"] | None, fill_defaults: bool, validator_class: type[jsonschema.protocols.Validator] | None, - output_format: Literal["text", "json"], + output_format: t.Literal["text", "json"], verbose: int, quiet: int, instancefiles: tuple[t.IO[bytes], ...], ) -> None: args = ParseResult() + args.set_regex_variant(regex_variant, legacy_opt=format_regex) + args.set_schema(schemafile, builtin_schema, check_metaschema) args.set_validator(validator_class) @@ -263,7 +269,6 @@ def main( else: args.disable_formats = normalized_disable_formats - args.format_regex = RegexVariantName(format_regex) args.disable_cache = no_cache args.default_filetype = default_filetype args.fill_defaults = fill_defaults @@ -324,6 +329,7 @@ def build_checker(args: ParseResult) -> SchemaChecker: instance_loader, reporter, format_opts=args.format_opts, + regex_impl=RegexImplementation(args.regex_variant), traceback_mode=args.traceback_mode, fill_defaults=args.fill_defaults, ) diff --git a/src/check_jsonschema/cli/parse_result.py b/src/check_jsonschema/cli/parse_result.py index a317378f9..bfd9065b1 100644 --- a/src/check_jsonschema/cli/parse_result.py +++ b/src/check_jsonschema/cli/parse_result.py @@ -6,7 +6,8 @@ import click import jsonschema -from ..formats import FormatOptions, RegexVariantName +from ..formats import FormatOptions +from ..regex_variants import RegexImplementation, RegexVariantName from ..transforms import Transform @@ -36,12 +37,24 @@ def __init__(self) -> None: # regex format options self.disable_all_formats: bool = False self.disable_formats: tuple[str, ...] = () - self.format_regex: RegexVariantName = RegexVariantName.default + self.regex_variant: RegexVariantName = RegexVariantName.default # error and output controls self.verbosity: int = 1 self.traceback_mode: str = "short" self.output_format: str = "text" + def set_regex_variant( + self, + variant_opt: t.Literal["python", "nonunicode", "default"] | None, + *, + legacy_opt: t.Literal["python", "nonunicode", "default"] | None = None, + ) -> None: + variant_name: t.Literal["python", "nonunicode", "default"] | None = ( + variant_opt or legacy_opt + ) + if variant_name: + self.regex_variant = RegexVariantName(variant_name) + def set_schema( self, schemafile: str | None, builtin_schema: str | None, check_metaschema: bool ) -> None: @@ -82,7 +95,7 @@ def set_validator( @property def format_opts(self) -> FormatOptions: return FormatOptions( + regex_impl=RegexImplementation(self.regex_variant), enabled=not self.disable_all_formats, - regex_variant=self.format_regex, disabled_formats=self.disable_formats, ) diff --git a/src/check_jsonschema/formats/__init__.py b/src/check_jsonschema/formats/__init__.py index 8202d9a00..2308c4313 100644 --- a/src/check_jsonschema/formats/__init__.py +++ b/src/check_jsonschema/formats/__init__.py @@ -1,14 +1,11 @@ from __future__ import annotations import copy -import enum -import re -import typing as t import jsonschema import jsonschema.validators -import regress +from ..regex_variants import RegexImplementation from .implementations import validate_rfc3339, validate_time # all known format strings except for a selection from draft3 which have either @@ -39,42 +36,16 @@ ) -class RegexVariantName(enum.Enum): - default = "default" - python = "python" - - -class RegexImplementation: - def __init__(self, variant: RegexVariantName) -> None: - self.variant = variant - - def check_format(self, instance: t.Any) -> bool: - if not isinstance(instance, str): - return True - - try: - if self.variant == RegexVariantName.default: - regress.Regex(instance) - else: - re.compile(instance) - # something is wrong with RegressError getting into the published types - # needs investigation... for now, ignore the error - except (regress.RegressError, re.error): # type: ignore[attr-defined] - return False - - return True - - class FormatOptions: def __init__( self, *, + regex_impl: RegexImplementation, enabled: bool = True, - regex_variant: RegexVariantName = RegexVariantName.default, disabled_formats: tuple[str, ...] = (), ) -> None: self.enabled = enabled - self.regex_variant = regex_variant + self.regex_impl = regex_impl self.disabled_formats = disabled_formats @@ -95,14 +66,10 @@ def make_format_checker( if not opts.enabled: return None - # copy the base checker - base_checker = get_base_format_checker(schema_dialect) - checker = copy.deepcopy(base_checker) + # customize around regex checking first + checker = format_checker_for_regex_impl(opts.regex_impl) - # replace the regex check - del checker.checkers["regex"] - regex_impl = RegexImplementation(opts.regex_variant) - checker.checks("regex")(regex_impl.check_format) + # add other custom format checks checker.checks("date-time")(validate_rfc3339) checker.checks("time")(validate_time) @@ -113,3 +80,18 @@ def make_format_checker( del checker.checkers[checkname] return checker + + +def format_checker_for_regex_impl( + regex_impl: RegexImplementation, schema_dialect: str | None = None +) -> jsonschema.FormatChecker: + # convert to a schema-derived format checker, and copy it + # for safe modification + base_checker = get_base_format_checker(schema_dialect) + checker = copy.deepcopy(base_checker) + + # replace the regex check + del checker.checkers["regex"] + checker.checks("regex")(regex_impl.check_format) + + return checker diff --git a/src/check_jsonschema/regex_variants.py b/src/check_jsonschema/regex_variants.py new file mode 100644 index 000000000..b76527867 --- /dev/null +++ b/src/check_jsonschema/regex_variants.py @@ -0,0 +1,142 @@ +import enum +import re +import typing as t + +import jsonschema +import regress + + +class RegexVariantName(enum.Enum): + default = "default" + nonunicode = "nonunicode" + python = "python" + + +class RegexImplementation: + """ + A high-level interface for getting at the different possible + implementations of regex behaviors. + """ + + _concrete: "_ConcreteImplementation" + + def __init__(self, variant: RegexVariantName) -> None: + self.variant = variant + + if self.variant == RegexVariantName.default: + self._concrete = _RegressImplementation() + elif self.variant == RegexVariantName.nonunicode: + self._concrete = _NonunicodeRegressImplementation() + else: + self._concrete = _PythonImplementation() + + self.check_format = self._concrete.check_format + self.pattern_keyword = self._concrete.pattern_keyword + self.patternProperties_keyword = self._concrete.patternProperties_keyword + + +class _ConcreteImplementation(t.Protocol): + def check_format(self, instance: t.Any) -> bool: ... + + def pattern_keyword( + self, validator: t.Any, pattern: str, instance: str, schema: t.Any + ) -> t.Iterator[jsonschema.ValidationError]: ... + + def patternProperties_keyword( + self, + validator: t.Any, + patternProperties: dict[str, t.Any], + instance: dict[str, t.Any], + schema: t.Any, + ) -> t.Iterator[jsonschema.ValidationError]: ... + + +class _RegressImplementation: + def _compile_pattern(self, pattern: str) -> regress.Regex: + return regress.Regex(pattern, flags="u") + + def check_format(self, instance: t.Any) -> bool: + if not isinstance(instance, str): + return True + try: + self._compile_pattern(instance) + except regress.RegressError: + return False + return True + + def pattern_keyword( + self, validator: t.Any, pattern: str, instance: str, schema: t.Any + ) -> t.Iterator[jsonschema.ValidationError]: + if not validator.is_type(instance, "string"): + return + + regress_pattern = self._compile_pattern(pattern) + if not regress_pattern.find(instance): + yield jsonschema.ValidationError(f"{instance!r} does not match {pattern!r}") + + def patternProperties_keyword( + self, + validator: t.Any, + patternProperties: dict[str, t.Any], + instance: dict[str, t.Any], + schema: t.Any, + ) -> t.Iterator[jsonschema.ValidationError]: + if not validator.is_type(instance, "object"): + return + + for pattern, subschema in patternProperties.items(): + regress_pattern = self._compile_pattern(pattern) + for k, v in instance.items(): + if regress_pattern.find(k): + yield from validator.descend( + v, + subschema, + path=k, + schema_path=pattern, + ) + + +class _NonunicodeRegressImplementation(_RegressImplementation): + def _compile_pattern(self, pattern: str) -> regress.Regex: + return regress.Regex(pattern) + + +class _PythonImplementation: + def check_format(self, instance: t.Any) -> bool: + if not isinstance(instance, str): + return True + try: + re.compile(instance) + except re.error: + return False + return True + + def pattern_keyword( + self, validator: t.Any, pattern: str, instance: str, schema: t.Any + ) -> t.Iterator[jsonschema.ValidationError]: + if not validator.is_type(instance, "string"): + return + + re_pattern = re.compile(pattern) + if not re_pattern.search(instance): + yield jsonschema.ValidationError(f"{instance!r} does not match {pattern!r}") + + def patternProperties_keyword( + self, + validator: t.Any, + patternProperties: dict[str, t.Any], + instance: dict[str, t.Any], + schema: t.Any, + ) -> t.Iterator[jsonschema.ValidationError]: + if not validator.is_type(instance, "object"): + return + + for pattern, subschema in patternProperties.items(): + for k, v in instance.items(): + if re.search(pattern, k): + yield from validator.descend( + v, + subschema, + path=k, + schema_path=pattern, + ) diff --git a/src/check_jsonschema/schema_loader/main.py b/src/check_jsonschema/schema_loader/main.py index 099107455..e056389a9 100644 --- a/src/check_jsonschema/schema_loader/main.py +++ b/src/check_jsonschema/schema_loader/main.py @@ -9,8 +9,9 @@ import jsonschema from ..builtin_schemas import get_builtin_schema -from ..formats import FormatOptions, make_format_checker +from ..formats import FormatOptions, format_checker_for_regex_impl, make_format_checker from ..parsers import ParserSet +from ..regex_variants import RegexImplementation from ..utils import is_url_ish from .errors import UnsupportedUrlScheme from .readers import HttpSchemaReader, LocalSchemaReader, StdinSchemaReader @@ -45,12 +46,26 @@ def set_defaults_then_validate( ) +def _extend_with_pattern_implementation( + validator_class: type[jsonschema.protocols.Validator], + regex_impl: RegexImplementation, +) -> type[jsonschema.Validator]: + return jsonschema.validators.extend( + validator_class, + { + "pattern": regex_impl.pattern_keyword, + "patternProperties": regex_impl.patternProperties_keyword, + }, + ) + + class SchemaLoaderBase: def get_validator( self, path: pathlib.Path | str, instance_doc: dict[str, t.Any], format_opts: FormatOptions, + regex_impl: RegexImplementation, fill_defaults: bool, ) -> jsonschema.protocols.Validator: raise NotImplementedError @@ -124,22 +139,21 @@ def get_validator( path: pathlib.Path | str, instance_doc: dict[str, t.Any], format_opts: FormatOptions, + regex_impl: RegexImplementation, fill_defaults: bool, ) -> jsonschema.protocols.Validator: - return self._get_validator(format_opts, fill_defaults) + return self._get_validator(format_opts, regex_impl, fill_defaults) @functools.lru_cache def _get_validator( self, format_opts: FormatOptions, + regex_impl: RegexImplementation, fill_defaults: bool, ) -> jsonschema.protocols.Validator: retrieval_uri = self.get_schema_retrieval_uri() schema = self.get_schema() - - schema_dialect = schema.get("$schema") - if schema_dialect is not None and not isinstance(schema_dialect, str): - schema_dialect = None + schema_dialect = _dialect_of_schema(schema) # format checker (which may be None) format_checker = make_format_checker(format_opts, schema_dialect) @@ -153,7 +167,8 @@ def _get_validator( if self.validator_class is None: # get the correct validator class and check the schema under its metaschema validator_cls = jsonschema.validators.validator_for(schema) - validator_cls.check_schema(schema) + + _check_schema(validator_cls, schema, regex_impl=regex_impl) else: # for a user-provided validator class, don't check_schema # on the grounds that it might *not* be valid but the user wants to use @@ -168,6 +183,9 @@ def _get_validator( if fill_defaults: validator_cls = _extend_with_default(validator_cls) + # set the regex variant for 'pattern' keywords + validator_cls = _extend_with_pattern_implementation(validator_cls, regex_impl) + # now that we know it's safe to try to create the validator instance, do it validator = validator_cls( schema, @@ -177,6 +195,44 @@ def _get_validator( return t.cast(jsonschema.protocols.Validator, validator) +def _check_schema( + validator_cls: type[jsonschema.protocols.Validator], + schema: dict[str, t.Any], + *, + regex_impl: RegexImplementation, +) -> None: + """A variant definition of Validator.check_schema which uses the regex + implementation and format checker specified.""" + # construct the metaschema validator class (with customized regex impl) + schema_validator_cls = jsonschema.validators.validator_for( + validator_cls.META_SCHEMA, default=validator_cls + ) + schema_validator_cls = _extend_with_pattern_implementation( + schema_validator_cls, regex_impl + ) + + # construct a specialized format checker (again, customized regex impl) + metaschema_dialect = _dialect_of_schema(validator_cls.META_SCHEMA) + format_checker = format_checker_for_regex_impl(regex_impl, metaschema_dialect) + + # now, construct and apply the actual validator + schema_validator = schema_validator_cls( + validator_cls.META_SCHEMA, format_checker=format_checker + ) + for error in schema_validator.iter_errors(schema): + raise jsonschema.exceptions.SchemaError.create_from(error) + + +def _dialect_of_schema(schema: dict[str, t.Any] | bool) -> str | None: + if not isinstance(schema, dict): + return None + + schema_dialect = schema.get("$schema") + if schema_dialect is not None and not isinstance(schema_dialect, str): + schema_dialect = None + return schema_dialect + + class BuiltinSchemaLoader(SchemaLoader): def __init__(self, schema_name: str, *, base_uri: str | None = None) -> None: self.schema_name = schema_name @@ -206,6 +262,7 @@ def get_validator( path: pathlib.Path | str, instance_doc: dict[str, t.Any], format_opts: FormatOptions, + regex_impl: RegexImplementation, fill_defaults: bool, ) -> jsonschema.protocols.Validator: schema_validator = jsonschema.validators.validator_for(instance_doc) diff --git a/tests/acceptance/test_custom_validator_class.py b/tests/acceptance/test_custom_validator_class.py index 170f4524b..9504b963b 100644 --- a/tests/acceptance/test_custom_validator_class.py +++ b/tests/acceptance/test_custom_validator_class.py @@ -66,24 +66,32 @@ def _foo_module(mock_module): """\ import jsonschema -class MyValidator: - def __init__(self, schema, *args, **kwargs): - self.schema = schema - self.real_validator = jsonschema.validators.Draft7Validator( - schema, *args, **kwargs - ) - - def iter_errors(self, data, *args, **kwargs): - yield from self.real_validator.iter_errors(data, *args, **kwargs) - for event in data["events"]: - if "Occult" in event["title"]: + +def check_occult_properties(validator, properties, instance, schema): + if not validator.is_type(instance, "object"): + return + + for property, subschema in properties.items(): + if property in instance: + if property == "title" and "Occult" in instance["title"]: yield jsonschema.exceptions.ValidationError( "Error! Occult event detected! Run!", - validator=None, + validator=validator, validator_value=None, - instance=event, - schema=self.schema, + instance=instance, + schema=schema, ) + yield from validator.descend( + instance[property], + subschema, + path=property, + schema_path=property, + ) + +MyValidator = jsonschema.validators.extend( + jsonschema.validators.Draft7Validator, + {"properties": check_occult_properties}, +) """, ) @@ -115,7 +123,7 @@ def test_custom_validator_class_can_detect_custom_conditions(run_line, tmp_path) str(doc), ], ) - assert result.exit_code == 1 # fail + assert result.exit_code == 1, result.stdout # fail assert "Occult event detected" in result.stdout, result.stdout diff --git a/tests/acceptance/test_example_files.py b/tests/acceptance/test_example_files.py index 057f07a5a..10411741f 100644 --- a/tests/acceptance/test_example_files.py +++ b/tests/acceptance/test_example_files.py @@ -63,7 +63,7 @@ def test_hook_positive_examples(case_name, run_line): hook_id = POSITIVE_HOOK_CASES[case_name] ret = run_line(HOOK_CONFIG[hook_id] + [rcase.path] + rcase.add_args) - assert ret.exit_code == 0, _format_cli_result(rcase, ret) + assert ret.exit_code == 0, _format_cli_result(ret, rcase) @pytest.mark.parametrize("case_name", NEGATIVE_HOOK_CASES.keys()) @@ -72,7 +72,7 @@ def test_hook_negative_examples(case_name, run_line): hook_id = NEGATIVE_HOOK_CASES[case_name] ret = run_line(HOOK_CONFIG[hook_id] + [rcase.path] + rcase.add_args) - assert ret.exit_code == 1, _format_cli_result(rcase, ret) + assert ret.exit_code == 1, _format_cli_result(ret, rcase) @pytest.mark.parametrize("case_name", _get_explicit_cases("positive")) @@ -102,7 +102,37 @@ def test_explicit_positive_examples(case_name, run_line): str(instance), ] ) - assert ret.exit_code == 0 + assert ret.exit_code == 0, _format_cli_result(ret) + + +@pytest.mark.parametrize("case_name", _get_explicit_cases("negative")) +def test_explicit_negative_examples(case_name, run_line): + _check_file_format_skip(case_name) + casedir = EXAMPLE_EXPLICIT_FILES / "negative" / case_name + + instance = casedir / "instance.json" + if not instance.exists(): + instance = casedir / "instance.yaml" + if not instance.exists(): + instance = casedir / "instance.toml" + if not instance.exists(): + raise Exception("could not find an instance file for test case") + + schema = casedir / "schema.json" + if not schema.exists(): + schema = casedir / "schema.yaml" + if not schema.exists(): + raise Exception("could not find a schema file for test case") + + ret = run_line( + [ + "check-jsonschema", + "--schemafile", + str(schema), + str(instance), + ] + ) + assert ret.exit_code == 1, _format_cli_result(ret) def _check_file_format_skip(case_name): @@ -166,10 +196,12 @@ def _package_is_installed(pkg: str) -> bool: return True -def _format_cli_result(rcase: ResolvedCase, result) -> str: +def _format_cli_result(result, rcase: ResolvedCase | None = None) -> str: + prefix = "" + if rcase is not None: + prefix = f"config.add_args={rcase.add_args}\n" return ( - "\n" - f"config.add_args={rcase.add_args}\n" + f"\n{prefix}" f"{result.exit_code=}\n" f"result.stdout={result.output}\n" f"{result.stderr=}" diff --git a/tests/acceptance/test_format_regex_opts.py b/tests/acceptance/test_format_regex_opts.py index 1f0486170..deb4e0fe7 100644 --- a/tests/acceptance/test_format_regex_opts.py +++ b/tests/acceptance/test_format_regex_opts.py @@ -1,6 +1,6 @@ # test on a JavaScript regex which is not a valid python regex -# `--format-regex=default` should accept it -# `--format-regex=python` should reject it +# `--regex-variant=default` should accept it +# `--regex-variant=python` should reject it # # check these options against documents with invalid and valid python regexes to confirm # that they are behaving as expected @@ -43,6 +43,10 @@ ("--disable-formats", "regex"), ("--format-regex", "default"), ("--format-regex", "python"), + ("--regex-variant", "python"), + ("--regex-variant", "default"), + ("--regex-variant", "default", "--format-regex", "python"), + ("--regex-variant", "python", "--format-regex", "default"), ] ) def regexopts(request): @@ -108,7 +112,10 @@ def test_regex_format_js_specific(run_line, tmp_path, regexopts): doc = tmp_path / "doc.json" doc.write_text(json.dumps(JS_REGEX_DOCUMENT)) - expect_ok = regexopts != ("--format-regex", "python") + expect_ok = regexopts[:2] not in ( + ("--format-regex", "python"), + ("--regex-variant", "python"), + ) res = run_line( [ diff --git a/tests/acceptance/test_invalid_schema_files.py b/tests/acceptance/test_invalid_schema_files.py index c4cf62c72..71efda024 100644 --- a/tests/acceptance/test_invalid_schema_files.py +++ b/tests/acceptance/test_invalid_schema_files.py @@ -1,3 +1,6 @@ +import pytest + + def test_checker_non_json_schemafile(run_line, tmp_path): foo = tmp_path / "foo.json" bar = tmp_path / "bar.json" @@ -29,3 +32,24 @@ def test_checker_invalid_schemafile_scheme(run_line, tmp_path): res = run_line(["check-jsonschema", "--schemafile", f"ftp://{foo}", str(bar)]) assert res.exit_code == 1 assert "only supports http, https" in res.stderr + + +@pytest.mark.parametrize( + "add_args", + [ + pytest.param([], id="noargs"), + # ensure that this works even when regex checking is disabled + pytest.param(["--disable-formats", "*"], id="all-formats-disabled"), + pytest.param(["--disable-formats", "regex"], id="regex-format-disabled"), + ], +) +def test_checker_invalid_schemafile_due_to_bad_regex(run_line, tmp_path, add_args): + foo = tmp_path / "foo.json" + bar = tmp_path / "bar.json" + # too many backslash escapes -- not a valid Unicode-mode regex + foo.write_text(r'{"properties": {"foo": {"pattern": "\\\\p{N}"}}}') + bar.write_text("{}") + + res = run_line(["check-jsonschema", "--schemafile", str(foo), str(bar), *add_args]) + assert res.exit_code == 1 + assert "schemafile was not valid" in res.stderr diff --git a/tests/example-files/explicit-schema/negative/unicode_pattern/instance.json b/tests/example-files/explicit-schema/negative/unicode_pattern/instance.json new file mode 100644 index 000000000..0bce573bf --- /dev/null +++ b/tests/example-files/explicit-schema/negative/unicode_pattern/instance.json @@ -0,0 +1,4 @@ +{ + "key": "foo 1", + "value": "bar 2" +} diff --git a/tests/example-files/explicit-schema/negative/unicode_pattern/schema.json b/tests/example-files/explicit-schema/negative/unicode_pattern/schema.json new file mode 100644 index 000000000..3511f41b2 --- /dev/null +++ b/tests/example-files/explicit-schema/negative/unicode_pattern/schema.json @@ -0,0 +1,20 @@ +{ + "additionalProperties": false, + "properties": { + "key": { + "description": "some key", + "maxLength": 128, + "minLength": 1, + "pattern": "^\\p{L}\\p{Z}\\p{N}$", + "type": "string" + }, + "value": { + "description": "some value", + "maxLength": 256, + "minLength": 0, + "pattern": "^\\p{L}\\p{Z}\\p{N}$", + "type": "string" + } + }, + "type": "object" +} diff --git a/tests/example-files/explicit-schema/positive/unicode_pattern/instance.json b/tests/example-files/explicit-schema/positive/unicode_pattern/instance.json new file mode 100644 index 000000000..6766d3091 --- /dev/null +++ b/tests/example-files/explicit-schema/positive/unicode_pattern/instance.json @@ -0,0 +1,4 @@ +{ + "key": "a 1", + "value": "b 2" +} diff --git a/tests/example-files/explicit-schema/positive/unicode_pattern/schema.json b/tests/example-files/explicit-schema/positive/unicode_pattern/schema.json new file mode 100644 index 000000000..3511f41b2 --- /dev/null +++ b/tests/example-files/explicit-schema/positive/unicode_pattern/schema.json @@ -0,0 +1,20 @@ +{ + "additionalProperties": false, + "properties": { + "key": { + "description": "some key", + "maxLength": 128, + "minLength": 1, + "pattern": "^\\p{L}\\p{Z}\\p{N}$", + "type": "string" + }, + "value": { + "description": "some value", + "maxLength": 256, + "minLength": 0, + "pattern": "^\\p{L}\\p{Z}\\p{N}$", + "type": "string" + } + }, + "type": "object" +} diff --git a/tox.ini b/tox.ini index 3970e31cd..6edec916f 100644 --- a/tox.ini +++ b/tox.ini @@ -2,10 +2,10 @@ envlist = mypy cov_clean - py38-mindeps{,-format} - py{312,311,310,39,38} - py{38,312}-{json5,pyjson5}{,-format} - py{38,312}-{disable_orjson} + py39-mindeps{,-format} + py{313,312,311,310,39} + py{39,313}-{json5,pyjson5}{,-format} + py{39,313}-{disable_orjson} cov skip_missing_interpreters = true minversion = 4.0.0 @@ -24,19 +24,20 @@ deps = mindeps: jsonschema==4.18.0 mindeps: click==8.0.0 mindeps: requests==2.0.0 - mindeps: importlib-resources==1.4.0 !disable_orjson: orjson json5: json5 pyjson5: pyjson5 format: jsonschema[format] commands = coverage run -m pytest {posargs:--junitxml={envdir}/pytest.xml} +depends = cov_clean [testenv:cov_clean] description = "erase coverage data to prepare for a new run" deps = coverage skip_install = true commands = coverage erase +depends = [testenv:cov] description = "combine and report coverage data" @@ -44,6 +45,7 @@ deps = coverage skip_install = true commands_pre = - coverage combine commands = coverage report --skip-covered +depends = py{,38,39,310,311,312}{,-mindeps,-format,-json5,-pyjson5,-disable_orjson} [testenv:mypy] description = "check type annotations with mypy" @@ -52,6 +54,7 @@ deps = mypy types-requests click commands = mypy src/ {posargs} +depends = [testenv:pyright] description = "check type annotations with pyright"