Remove support for requirements in package manifest (#574)

This is replaced by conditions. In this PR, only the old code is removed.
elastic · Jul 1, 2020 · e9dc95b · e9dc95b
1 parent cbd9baa
commit e9dc95b
Show file tree

Hide file tree

Showing 32 changed files with 22 additions and 138 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,7 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Remove `removable` flag from package manifest. [#532](https://github.com/elastic/package-registry/pull/532)
 * Rename `datasources` to `config_templates` in dataset manifest. [#570](https://github.com/elastic/package-registry/pull/570)
 * Remove support for logs and metrics category. [#571](https://github.com/elastic/package-registry/pull/571)
-* Remove `dataset.type: event` as suported type. [#](https://github.com/elastic/package-registry/pull/)
+* Remove `dataset.type: event` as suported type. [#567](https://github.com/elastic/package-registry/pull/567)
+* Remove support for requirements. Use conditions instead. [#574](https://github.com/elastic/package-registry/pull/574)
 
 ### Bugfixes
 

diff --git a/testdata/generated/example-0.0.2.tar.gz-preview.txt b/testdata/generated/example-0.0.2.tar.gz-preview.txt
@@ -23,4 +23,4 @@
 1995 example-0.0.2/kibana/visualization/7e4084e0-5c99-11e9-8477-077ec9664dbd.json
 1849 example-0.0.2/kibana/visualization/80844540-5c97-11e9-8477-077ec9664dbd.json
 1920 example-0.0.2/kibana/visualization/ab48c3f0-5ca6-11e9-8477-077ec9664dbd.json
-195 example-0.0.2/manifest.yml
+193 example-0.0.2/manifest.yml
diff --git a/testdata/generated/package.json b/testdata/generated/package.json
@@ -23,11 +23,6 @@
   "conditions": {
     "kibana.version": "~7.x.x"
   },
-  "requirement": {
-    "kibana": {
-      "versions": "\u003e=7.0.0"
-    }
-  },
   "screenshots": [
     {
       "src": "/package/example/1.0.0/img/kibana-iptables.png",

diff --git a/testdata/generated/package/base/0.2.0/index.json b/testdata/generated/package/base/0.2.0/index.json
@@ -21,11 +21,6 @@
   "conditions": {
     "kibana.version": "\u003e7.9.0"
   },
-  "requirement": {
-    "kibana": {
-      "versions": "\u003e7.9.0"
-    }
-  },
   "assets": [
     "/package/base/0.2.0/manifest.yml",
     "/package/base/0.2.0/docs/README.md",

diff --git a/testdata/generated/package/datasources/1.0.0/index.json b/testdata/generated/package/datasources/1.0.0/index.json
@@ -19,9 +19,6 @@
     "custom"
   ],
   "release": "beta",
-  "requirement": {
-    "kibana": {}
-  },
   "assets": [
     "/package/datasources/1.0.0/manifest.yml",
     "/package/datasources/1.0.0/docs/README.md",

diff --git a/testdata/generated/package/default_pipeline/0.0.2/index.json b/testdata/generated/package/default_pipeline/0.0.2/index.json
@@ -20,9 +20,6 @@
     "message_queue"
   ],
   "release": "beta",
-  "requirement": {
-    "kibana": {}
-  },
   "assets": [
     "/package/default_pipeline/0.0.2/manifest.yml",
     "/package/default_pipeline/0.0.2/docs/README.md",

diff --git a/testdata/generated/package/ecs_style_dataset/0.0.1/index.json b/testdata/generated/package/ecs_style_dataset/0.0.1/index.json
@@ -19,9 +19,6 @@
     "monitoring"
   ],
   "release": "beta",
-  "requirement": {
-    "kibana": {}
-  },
   "assets": [
     "/package/ecs_style_dataset/0.0.1/manifest.yml",
     "/package/ecs_style_dataset/0.0.1/docs/README.md",

diff --git a/testdata/generated/package/example/0.0.2/index.json b/testdata/generated/package/example/0.0.2/index.json
@@ -22,11 +22,6 @@
   "conditions": {
     "kibana.version": "\u003e=6.0.0"
   },
-  "requirement": {
-    "kibana": {
-      "versions": "\u003e=6.0.0"
-    }
-  },
   "assets": [
     "/package/example/0.0.2/manifest.yml",
     "/package/example/0.0.2/docs/README.md",

diff --git a/testdata/generated/package/example/1.0.0/index.json b/testdata/generated/package/example/1.0.0/index.json
@@ -23,11 +23,6 @@
   "conditions": {
     "kibana.version": "~7.x.x"
   },
-  "requirement": {
-    "kibana": {
-      "versions": "\u003e=7.0.0"
-    }
-  },
   "screenshots": [
     {
       "src": "/package/example/1.0.0/img/kibana-iptables.png",

diff --git a/testdata/generated/package/experimental/0.0.1/index.json b/testdata/generated/package/experimental/0.0.1/index.json
@@ -19,9 +19,6 @@
     "aws"
   ],
   "release": "experimental",
-  "requirement": {
-    "kibana": {}
-  },
   "assets": [
     "/package/experimental/0.0.1/manifest.yml",
     "/package/experimental/0.0.1/docs/README.md"

diff --git a/testdata/generated/package/foo/1.0.0/index.json b/testdata/generated/package/foo/1.0.0/index.json
@@ -22,11 +22,6 @@
   "conditions": {
     "kibana.version": "\u003e=7.0.0"
   },
-  "requirement": {
-    "kibana": {
-      "versions": "\u003e=7.0.0"
-    }
-  },
   "assets": [
     "/package/foo/1.0.0/manifest.yml",
     "/package/foo/1.0.0/docs/README.md"

diff --git a/testdata/generated/package/internal/1.2.0/index.json b/testdata/generated/package/internal/1.2.0/index.json
@@ -18,9 +18,6 @@
   "license": "basic",
   "categories": [],
   "release": "beta",
-  "requirement": {
-    "kibana": {}
-  },
   "assets": [
     "/package/internal/1.2.0/manifest.yml",
     "/package/internal/1.2.0/docs/README.md"

diff --git a/testdata/generated/package/longdocs/1.0.4/index.json b/testdata/generated/package/longdocs/1.0.4/index.json
@@ -29,11 +29,6 @@
   "conditions": {
     "kibana.version": "\u003e6.7.0"
   },
-  "requirement": {
-    "kibana": {
-      "versions": "\u003e6.7.0"
-    }
-  },
   "assets": [
     "/package/longdocs/1.0.4/manifest.yml",
     "/package/longdocs/1.0.4/docs/README.md",

diff --git a/testdata/generated/package/metricsonly/2.0.1/index.json b/testdata/generated/package/metricsonly/2.0.1/index.json
@@ -25,9 +25,6 @@
     "custom"
   ],
   "release": "ga",
-  "requirement": {
-    "kibana": {}
-  },
   "assets": [
     "/package/metricsonly/2.0.1/manifest.yml",
     "/package/metricsonly/2.0.1/docs/README.md",

diff --git a/testdata/generated/package/multiple_false/0.0.1/index.json b/testdata/generated/package/multiple_false/0.0.1/index.json
@@ -19,9 +19,6 @@
     "custom"
   ],
   "release": "beta",
-  "requirement": {
-    "kibana": {}
-  },
   "assets": [
     "/package/multiple_false/0.0.1/manifest.yml",
     "/package/multiple_false/0.0.1/docs/README.md",

diff --git a/testdata/generated/package/multiversion/1.0.3/index.json b/testdata/generated/package/multiversion/1.0.3/index.json
@@ -29,11 +29,6 @@
   "conditions": {
     "kibana.version": "\u003e6.7.0"
   },
-  "requirement": {
-    "kibana": {
-      "versions": "\u003e6.7.0"
-    }
-  },
   "assets": [
     "/package/multiversion/1.0.3/changelog.yml",
     "/package/multiversion/1.0.3/manifest.yml",

diff --git a/testdata/generated/package/multiversion/1.0.4/index.json b/testdata/generated/package/multiversion/1.0.4/index.json
@@ -29,11 +29,6 @@
   "conditions": {
     "kibana.version": "\u003e6.7.0"
   },
-  "requirement": {
-    "kibana": {
-      "versions": "\u003e6.7.0"
-    }
-  },
   "assets": [
     "/package/multiversion/1.0.4/changelog.yml",
     "/package/multiversion/1.0.4/manifest.yml",

diff --git a/testdata/generated/package/multiversion/1.1.0/index.json b/testdata/generated/package/multiversion/1.1.0/index.json
@@ -29,9 +29,6 @@
   "conditions": {
     "kibana.version": "\u003e6.7.0"
   },
-  "requirement": {
-    "kibana": {}
-  },
   "assets": [
     "/package/multiversion/1.1.0/changelog.yml",
     "/package/multiversion/1.1.0/manifest.yml",

diff --git a/testdata/generated/package/no_stream_configs/1.0.0/index.json b/testdata/generated/package/no_stream_configs/1.0.0/index.json
@@ -19,9 +19,6 @@
     "custom"
   ],
   "release": "beta",
-  "requirement": {
-    "kibana": {}
-  },
   "assets": [
     "/package/no_stream_configs/1.0.0/manifest.yml",
     "/package/no_stream_configs/1.0.0/docs/README.md",

diff --git a/testdata/generated/package/reference/1.0.0/index.json b/testdata/generated/package/reference/1.0.0/index.json
@@ -30,11 +30,6 @@
   "conditions": {
     "kibana.version": "\u003e6.7.0  \u003c7.6.0"
   },
-  "requirement": {
-    "kibana": {
-      "versions": "\u003e6.7.0  \u003c7.6.0"
-    }
-  },
   "assets": [
     "/package/reference/1.0.0/changelog.yml",
     "/package/reference/1.0.0/manifest.yml",

diff --git a/testdata/generated/package/yamlpipeline/1.0.0/index.json b/testdata/generated/package/yamlpipeline/1.0.0/index.json
@@ -19,9 +19,6 @@
     "custom"
   ],
   "release": "beta",
-  "requirement": {
-    "kibana": {}
-  },
   "assets": [
     "/package/yamlpipeline/1.0.0/manifest.yml",
     "/package/yamlpipeline/1.0.0/docs/README.md",

diff --git a/testdata/package/base/0.2.0/manifest.yml b/testdata/package/base/0.2.0/manifest.yml
@@ -17,10 +17,10 @@ license: basic
 # This is called type integration because it is required for all the integration packages
 type: integration
 
-requirement:
+conditions:
   kibana:
     # Requires ILM which was released in 6.6.
-    versions: ">7.9.0"
+    version: ">7.9.0"
 
 # No icons
 icons:

diff --git a/testdata/package/example/0.0.2/manifest.yml b/testdata/package/example/0.0.2/manifest.yml
@@ -7,6 +7,6 @@ version: 0.0.2
 categories: ["web"]
 release: beta
 
-requirement:
+conditions:
   kibana:
-    versions: ">=6.0.0"
+    version: ">=6.0.0"
diff --git a/testdata/package/example/1.0.0/manifest.yml b/testdata/package/example/1.0.0/manifest.yml
@@ -13,10 +13,6 @@ owner.github: "ruflin"
 conditions:
   kibana.version: "~7.x.x"
 
-requirement:
-  kibana:
-    versions: ">=7.0.0"
-
 screenshots:
   - src: /img/kibana-iptables.png
     title: IP Tables Overview dashboard

diff --git a/testdata/package/foo/1.0.0/manifest.yml b/testdata/package/foo/1.0.0/manifest.yml
@@ -8,7 +8,7 @@ categories: ["custom"]
 type: solution
 release: beta
 
-requirement:
+conditions:
   kibana:
-    versions: ">=7.0.0"
+    version: ">=7.0.0"
 
diff --git a/testdata/package/longdocs/1.0.4/manifest.yml b/testdata/package/longdocs/1.0.4/manifest.yml
@@ -13,9 +13,9 @@ categories: ["custom", "web"]
 release: ga
 license: basic
 
-requirement:
+conditions:
   kibana:
-    versions: ">6.7.0"
+    version: ">6.7.0"
 
 icons:
 - src: "/img/icon.svg"

diff --git a/testdata/package/multiversion/1.0.3/manifest.yml b/testdata/package/multiversion/1.0.3/manifest.yml
@@ -9,9 +9,9 @@ categories: ["custom", "web"]
 release: ga
 license: basic
 
-requirement:
+conditions:
   kibana:
-    versions: ">6.7.0"
+    version: ">6.7.0"
 
 icons:
 - src: "/img/icon.svg"

diff --git a/testdata/package/multiversion/1.0.4/manifest.yml b/testdata/package/multiversion/1.0.4/manifest.yml
@@ -10,9 +10,9 @@ release: ga
 license: basic
 type: integration
 
-requirement:
+conditions:
   kibana:
-    versions: ">6.7.0"
+    version: ">6.7.0"
 
 icons:
 - src: "/img/icon.svg"

diff --git a/testdata/package/multiversion/1.1.0/manifest.yml b/testdata/package/multiversion/1.1.0/manifest.yml
@@ -9,9 +9,9 @@ categories: ["custom", "web"]
 release: ga
 license: basic
 
-requirement:
+conditions:
   kibana:
-    versions: ">6.7.0"
+    version: ">6.7.0"
 
 icons:
 - src: "/img/icon.svg"

diff --git a/testdata/package/reference/1.0.0/manifest.yml b/testdata/package/reference/1.0.0/manifest.yml
@@ -36,13 +36,6 @@ owner:
 conditions:
   kibana.version: ">6.7.0  <7.6.0"
 
-requirement:
-  kibana:
-    versions: ">6.7.0  <7.6.0"
-  elasticsearch:
-    versions: ">7.0.1"
-
-
 compatibility: [1.0.2, 2.0.1]
 os.platform: [darwin, freebsd, linux, macos, openbsd, windows]