Improve validation for grafanaDependency (#26936)

7319527f · Marcus Olsson · GitHub · 338943d3 · 7319527f · 7319527f
Commit 7319527f authored Aug 17, 2020 by Marcus Olsson Committed by GitHub Aug 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

docs/sources/developers/plugins/metadata.md
+1 -1

docs/sources/developers/plugins/plugin.schema.json
+2 -2

No files found.
--- a/docs/sources/developers/plugins/metadata.md
+++ b/docs/sources/developers/plugins/metadata.md
@@ -50,7 +50,7 @@ Plugin dependencies.
 | Property            | Type     | Required | Description                                                                                                                   |
 |---------------------|----------|----------|-------------------------------------------------------------------------------------------------------------------------------|
-| `grafanaDependency` | string   | **Yes**  | Required Grafana version for this plugin, e.g. `>=7.0.0` to denote plugin requires Grafana 7.0.0 or later.                    |
+| `grafanaDependency` | string   | **Yes**  | Required Grafana version for this plugin. Validated using https://github.com/npm/node-semver.                                 |
 | `grafanaVersion`    | string   | No       | (Deprecated) Required Grafana version for this plugin, e.g. `6.x.x 7.x.x` to denote plugin requires Grafana v6.x.x or v7.x.x. |
 | `plugins`           | string[] | No       | An array of required plugins on which this plugin depends.                                                                    |

--- a/docs/sources/developers/plugins/plugin.schema.json
+++ b/docs/sources/developers/plugins/plugin.schema.json
@@ -131,8 +131,8 @@
        },
        "grafanaDependency": {
          "type": "string",
-          "description": "Required Grafana version for this plugin, e.g. `>=7.0.0` to denote plugin requires Grafana 7.0.0 or later.",
+          "description": "Required Grafana version for this plugin. Validated using https://github.com/npm/node-semver.",
-          "pattern": "^(>=|<|>|<=)?([0-9]+)(\\.[0-9]+)?(\\.[0-9])?$"
+          "pattern": "^(<=|>=|<|>|=|~|\\^)?([0-9]+)(\\.[0-9x\\*]+)(\\.[0-9x\\*])?(\\s(<=|>=|<|=>)?([0-9]+)(\\.[0-9x]+)(\\.[0-9x]))?$"
        },
        "plugins": {
          "type": "array",