From ffbd64851f4a62584e8c77046f3a40b0b3676cba Mon Sep 17 00:00:00 2001 From: ruflin Date: Tue, 30 Jun 2020 12:00:18 +0200 Subject: [PATCH 1/5] Remove support for logs/metrics categories The metrics and logs categories are not supported anymore. This removes support for it. But it can only be merged after https://github.com/elastic/package-storage/pull/97 landed. --- util/package.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/util/package.go b/util/package.go index f3ef8cb98..79246d616 100644 --- a/util/package.go +++ b/util/package.go @@ -44,11 +44,6 @@ var CategoryTitles = map[string]string{ "ticketing": "Ticketing", "version_control": "Version Control", "web": "Web", - - // Old categories, to be removed - "logs": "Logs", - "metrics": "Metrics", - //"security": "Security", } type Package struct { From 441ba5066ebe4a18e48ca993a8245447d2cd62a4 Mon Sep 17 00:00:00 2001 From: ruflin Date: Tue, 30 Jun 2020 16:05:11 +0200 Subject: [PATCH 2/5] add new generated data --- main_test.go | 4 +- .../generated/categories-experimental.json | 37 +++- testdata/generated/categories.json | 32 +++- .../example-0.0.2.tar.gz-preview.txt | 2 +- testdata/generated/package.json | 4 +- .../package/datasources/1.0.0/index.json | 2 +- .../package/default_pipeline/0.0.2/index.json | 2 +- .../ecs_style_dataset/0.0.1/index.json | 2 +- .../package/example/0.0.2/index.json | 2 +- .../package/example/1.0.0/index.json | 4 +- .../package/experimental/0.0.1/index.json | 2 +- .../generated/package/foo/1.0.0/index.json | 2 +- .../package/longdocs/1.0.4/index.json | 4 +- .../package/metricsonly/2.0.1/index.json | 2 +- .../package/multiple_false/0.0.1/index.json | 2 +- .../package/multiversion/1.0.3/index.json | 4 +- .../package/multiversion/1.0.4/index.json | 4 +- .../package/multiversion/1.1.0/index.json | 4 +- .../no_stream_configs/1.0.0/index.json | 2 +- .../package/reference/1.0.0/index.json | 4 +- .../package/yamlpipeline/1.0.0/index.json | 2 +- .../generated/search-category-custom.json | 162 +++++++++++++++++ testdata/generated/search-category-logs.json | 172 +----------------- .../generated/search-category-metrics.json | 118 +----------- testdata/generated/search-category-web.json | 81 +++++++++ .../package/datasources/1.0.0/manifest.yml | 2 +- .../default_pipeline/0.0.2/manifest.yml | 2 +- .../ecs_style_dataset/0.0.1/manifest.yml | 2 +- testdata/package/example/0.0.2/manifest.yml | 2 +- testdata/package/example/1.0.0/manifest.yml | 2 +- .../package/experimental/0.0.1/manifest.yml | 2 +- testdata/package/foo/1.0.0/manifest.yml | 2 +- testdata/package/longdocs/1.0.4/manifest.yml | 2 +- .../package/metricsonly/2.0.1/manifest.yml | 2 +- .../package/multiple_false/0.0.1/manifest.yml | 2 +- .../package/multiversion/1.0.3/manifest.yml | 2 +- .../package/multiversion/1.0.4/manifest.yml | 2 +- .../package/multiversion/1.1.0/manifest.yml | 2 +- .../no_stream_configs/1.0.0/manifest.yml | 2 +- testdata/package/reference/1.0.0/manifest.yml | 2 +- .../package/yamlpipeline/1.0.0/manifest.yml | 2 +- 41 files changed, 345 insertions(+), 343 deletions(-) create mode 100644 testdata/generated/search-category-custom.json create mode 100644 testdata/generated/search-category-web.json diff --git a/main_test.go b/main_test.go index 26fc5773a..ff17b2ec2 100644 --- a/main_test.go +++ b/main_test.go @@ -55,8 +55,8 @@ func TestEndpoints(t *testing.T) { {"/categories?experimental=foo", "/categories", "categories-experimental-error.json", categoriesHandler(packagesBasePaths, testCacheTime)}, {"/search?kibana.version=6.5.2", "/search", "search-kibana652.json", searchHandler(packagesBasePaths, testCacheTime)}, {"/search?kibana.version=7.2.1", "/search", "search-kibana721.json", searchHandler(packagesBasePaths, testCacheTime)}, - {"/search?category=metrics", "/search", "search-category-metrics.json", searchHandler(packagesBasePaths, testCacheTime)}, - {"/search?category=logs", "/search", "search-category-logs.json", searchHandler(packagesBasePaths, testCacheTime)}, + {"/search?category=web", "/search", "search-category-web.json", searchHandler(packagesBasePaths, testCacheTime)}, + {"/search?category=custom", "/search", "search-category-custom.json", searchHandler(packagesBasePaths, testCacheTime)}, {"/search?package=example", "/search", "search-package-example.json", searchHandler(packagesBasePaths, testCacheTime)}, {"/search?package=example&all=true", "/search", "search-package-example-all.json", searchHandler(packagesBasePaths, testCacheTime)}, {"/search?internal=true", "/search", "search-package-internal.json", searchHandler(packagesBasePaths, testCacheTime)}, diff --git a/testdata/generated/categories-experimental.json b/testdata/generated/categories-experimental.json index 09f520a2c..9447670a3 100644 --- a/testdata/generated/categories-experimental.json +++ b/testdata/generated/categories-experimental.json @@ -1,8 +1,28 @@ [ { - "id": "logs", - "title": "Logs", - "count": 10 + "id": "aws", + "title": "AWS", + "count": 1 + }, + { + "id": "azure", + "title": "Azure", + "count": 1 + }, + { + "id": "containers", + "title": "Containers", + "count": 1 + }, + { + "id": "crm", + "title": "CRM", + "count": 1 + }, + { + "id": "custom", + "title": "Custom", + "count": 9 }, { "id": "message_queue", @@ -10,8 +30,13 @@ "count": 1 }, { - "id": "metrics", - "title": "Metrics", - "count": 7 + "id": "monitoring", + "title": "Monitoring", + "count": 1 + }, + { + "id": "web", + "title": "Web", + "count": 3 } ] \ No newline at end of file diff --git a/testdata/generated/categories.json b/testdata/generated/categories.json index d4ffc9efe..c25d31519 100644 --- a/testdata/generated/categories.json +++ b/testdata/generated/categories.json @@ -1,8 +1,23 @@ [ { - "id": "logs", - "title": "Logs", - "count": 10 + "id": "azure", + "title": "Azure", + "count": 1 + }, + { + "id": "containers", + "title": "Containers", + "count": 1 + }, + { + "id": "crm", + "title": "CRM", + "count": 1 + }, + { + "id": "custom", + "title": "Custom", + "count": 9 }, { "id": "message_queue", @@ -10,8 +25,13 @@ "count": 1 }, { - "id": "metrics", - "title": "Metrics", - "count": 6 + "id": "monitoring", + "title": "Monitoring", + "count": 1 + }, + { + "id": "web", + "title": "Web", + "count": 3 } ] \ No newline at end of file diff --git a/testdata/generated/example-0.0.2.tar.gz-preview.txt b/testdata/generated/example-0.0.2.tar.gz-preview.txt index 7be4b4f4c..6828de4ac 100644 --- 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 -196 example-0.0.2/manifest.yml +195 example-0.0.2/manifest.yml diff --git a/testdata/generated/package.json b/testdata/generated/package.json index e037a0388..1c87bbc83 100644 --- a/testdata/generated/package.json +++ b/testdata/generated/package.json @@ -16,8 +16,8 @@ "readme": "/package/example/1.0.0/docs/README.md", "license": "basic", "categories": [ - "logs", - "metrics" + "crm", + "azure" ], "release": "ga", "requirement": { diff --git a/testdata/generated/package/datasources/1.0.0/index.json b/testdata/generated/package/datasources/1.0.0/index.json index a5388a797..6a667dbc3 100644 --- a/testdata/generated/package/datasources/1.0.0/index.json +++ b/testdata/generated/package/datasources/1.0.0/index.json @@ -16,7 +16,7 @@ "readme": "/package/datasources/1.0.0/docs/README.md", "license": "basic", "categories": [ - "logs" + "custom" ], "release": "beta", "requirement": { diff --git a/testdata/generated/package/default_pipeline/0.0.2/index.json b/testdata/generated/package/default_pipeline/0.0.2/index.json index 401f77a22..01944230e 100644 --- a/testdata/generated/package/default_pipeline/0.0.2/index.json +++ b/testdata/generated/package/default_pipeline/0.0.2/index.json @@ -16,7 +16,7 @@ "readme": "/package/default_pipeline/0.0.2/docs/README.md", "license": "basic", "categories": [ - "logs", + "containers", "message_queue" ], "release": "beta", 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 index 8fe8cfde0..650035de7 100644 --- a/testdata/generated/package/ecs_style_dataset/0.0.1/index.json +++ b/testdata/generated/package/ecs_style_dataset/0.0.1/index.json @@ -16,7 +16,7 @@ "readme": "/package/ecs_style_dataset/0.0.1/docs/README.md", "license": "basic", "categories": [ - "logs" + "monitoring" ], "release": "beta", "requirement": { diff --git a/testdata/generated/package/example/0.0.2/index.json b/testdata/generated/package/example/0.0.2/index.json index 0c56cf5a5..21fdb406b 100644 --- a/testdata/generated/package/example/0.0.2/index.json +++ b/testdata/generated/package/example/0.0.2/index.json @@ -16,7 +16,7 @@ "readme": "/package/example/0.0.2/docs/README.md", "license": "basic", "categories": [ - "logs" + "web" ], "release": "beta", "requirement": { diff --git a/testdata/generated/package/example/1.0.0/index.json b/testdata/generated/package/example/1.0.0/index.json index e037a0388..1c87bbc83 100644 --- a/testdata/generated/package/example/1.0.0/index.json +++ b/testdata/generated/package/example/1.0.0/index.json @@ -16,8 +16,8 @@ "readme": "/package/example/1.0.0/docs/README.md", "license": "basic", "categories": [ - "logs", - "metrics" + "crm", + "azure" ], "release": "ga", "requirement": { diff --git a/testdata/generated/package/experimental/0.0.1/index.json b/testdata/generated/package/experimental/0.0.1/index.json index 87f252fa4..00d07c8da 100644 --- a/testdata/generated/package/experimental/0.0.1/index.json +++ b/testdata/generated/package/experimental/0.0.1/index.json @@ -16,7 +16,7 @@ "readme": "/package/experimental/0.0.1/docs/README.md", "license": "basic", "categories": [ - "metrics" + "aws" ], "release": "experimental", "requirement": { diff --git a/testdata/generated/package/foo/1.0.0/index.json b/testdata/generated/package/foo/1.0.0/index.json index 2a9a8be2c..76af7e68e 100644 --- a/testdata/generated/package/foo/1.0.0/index.json +++ b/testdata/generated/package/foo/1.0.0/index.json @@ -16,7 +16,7 @@ "readme": "/package/foo/1.0.0/docs/README.md", "license": "basic", "categories": [ - "metrics" + "custom" ], "release": "beta", "requirement": { diff --git a/testdata/generated/package/longdocs/1.0.4/index.json b/testdata/generated/package/longdocs/1.0.4/index.json index 1b9732ef4..670acc942 100644 --- a/testdata/generated/package/longdocs/1.0.4/index.json +++ b/testdata/generated/package/longdocs/1.0.4/index.json @@ -22,8 +22,8 @@ "readme": "/package/longdocs/1.0.4/docs/README.md", "license": "basic", "categories": [ - "logs", - "metrics" + "custom", + "web" ], "release": "ga", "requirement": { diff --git a/testdata/generated/package/metricsonly/2.0.1/index.json b/testdata/generated/package/metricsonly/2.0.1/index.json index c70b6d89c..aa85dbd8e 100644 --- a/testdata/generated/package/metricsonly/2.0.1/index.json +++ b/testdata/generated/package/metricsonly/2.0.1/index.json @@ -22,7 +22,7 @@ "readme": "/package/metricsonly/2.0.1/docs/README.md", "license": "basic", "categories": [ - "metrics" + "custom" ], "release": "ga", "requirement": { diff --git a/testdata/generated/package/multiple_false/0.0.1/index.json b/testdata/generated/package/multiple_false/0.0.1/index.json index 4f675e972..e9b7fe762 100644 --- a/testdata/generated/package/multiple_false/0.0.1/index.json +++ b/testdata/generated/package/multiple_false/0.0.1/index.json @@ -16,7 +16,7 @@ "readme": "/package/multiple_false/0.0.1/docs/README.md", "license": "basic", "categories": [ - "logs" + "custom" ], "release": "beta", "requirement": { diff --git a/testdata/generated/package/multiversion/1.0.3/index.json b/testdata/generated/package/multiversion/1.0.3/index.json index c5fb87094..f7471b690 100644 --- a/testdata/generated/package/multiversion/1.0.3/index.json +++ b/testdata/generated/package/multiversion/1.0.3/index.json @@ -22,8 +22,8 @@ "readme": "/package/multiversion/1.0.3/docs/README.md", "license": "basic", "categories": [ - "logs", - "metrics" + "custom", + "web" ], "release": "ga", "requirement": { diff --git a/testdata/generated/package/multiversion/1.0.4/index.json b/testdata/generated/package/multiversion/1.0.4/index.json index 71a4532d0..4a6d8f090 100644 --- a/testdata/generated/package/multiversion/1.0.4/index.json +++ b/testdata/generated/package/multiversion/1.0.4/index.json @@ -22,8 +22,8 @@ "readme": "/package/multiversion/1.0.4/docs/README.md", "license": "basic", "categories": [ - "logs", - "metrics" + "custom", + "web" ], "release": "ga", "requirement": { diff --git a/testdata/generated/package/multiversion/1.1.0/index.json b/testdata/generated/package/multiversion/1.1.0/index.json index bd9bd482a..a91f26e64 100644 --- a/testdata/generated/package/multiversion/1.1.0/index.json +++ b/testdata/generated/package/multiversion/1.1.0/index.json @@ -22,8 +22,8 @@ "readme": "/package/multiversion/1.1.0/docs/README.md", "license": "basic", "categories": [ - "logs", - "metrics" + "custom", + "web" ], "release": "ga", "requirement": { 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 index 1e31870d4..766405057 100644 --- a/testdata/generated/package/no_stream_configs/1.0.0/index.json +++ b/testdata/generated/package/no_stream_configs/1.0.0/index.json @@ -16,7 +16,7 @@ "readme": "/package/no_stream_configs/1.0.0/docs/README.md", "license": "basic", "categories": [ - "logs" + "custom" ], "release": "beta", "requirement": { diff --git a/testdata/generated/package/reference/1.0.0/index.json b/testdata/generated/package/reference/1.0.0/index.json index 32c12f7d0..a46bf251f 100644 --- a/testdata/generated/package/reference/1.0.0/index.json +++ b/testdata/generated/package/reference/1.0.0/index.json @@ -23,8 +23,8 @@ "readme": "/package/reference/1.0.0/docs/README.md", "license": "basic", "categories": [ - "logs", - "metrics" + "custom", + "web" ], "release": "ga", "requirement": { diff --git a/testdata/generated/package/yamlpipeline/1.0.0/index.json b/testdata/generated/package/yamlpipeline/1.0.0/index.json index fda37ee15..f79b42c43 100644 --- a/testdata/generated/package/yamlpipeline/1.0.0/index.json +++ b/testdata/generated/package/yamlpipeline/1.0.0/index.json @@ -16,7 +16,7 @@ "readme": "/package/yamlpipeline/1.0.0/docs/README.md", "license": "basic", "categories": [ - "logs" + "custom" ], "release": "beta", "requirement": { diff --git a/testdata/generated/search-category-custom.json b/testdata/generated/search-category-custom.json new file mode 100644 index 000000000..0fc716d65 --- /dev/null +++ b/testdata/generated/search-category-custom.json @@ -0,0 +1,162 @@ +[ + { + "name": "datasources", + "title": "Default datasource Integration", + "version": "1.0.0", + "description": "Package with data sources", + "type": "integration", + "download": "/epr/datasources/datasources-1.0.0.tar.gz", + "downloads": [ + { + "path": "/epr/datasources/datasources-1.0.0.tar.gz", + "type": "tar" + } + ], + "path": "/package/datasources/1.0.0" + }, + { + "name": "foo", + "title": "Foo", + "version": "1.0.0", + "description": "This is the foo integration", + "type": "solution", + "download": "/epr/foo/foo-1.0.0.tar.gz", + "downloads": [ + { + "path": "/epr/foo/foo-1.0.0.tar.gz", + "type": "tar" + } + ], + "path": "/package/foo/1.0.0" + }, + { + "name": "longdocs", + "title": "Long Docs", + "version": "1.0.4", + "description": "This integration contains pretty long documentation.\nIt is used to show the different visualisations inside a documentation to test how we handle it.\nThe integration does not contain any assets except the documentation page.\n", + "type": "integration", + "download": "/epr/longdocs/longdocs-1.0.4.tar.gz", + "downloads": [ + { + "path": "/epr/longdocs/longdocs-1.0.4.tar.gz", + "type": "tar" + } + ], + "path": "/package/longdocs/1.0.4", + "icons": [ + { + "src": "/package/longdocs/1.0.4/img/icon.svg", + "type": "image/svg+xml" + } + ] + }, + { + "name": "metricsonly", + "title": "Metrics Only", + "version": "2.0.1", + "description": "This is an integration with only the metrics category.\n", + "type": "integration", + "download": "/epr/metricsonly/metricsonly-2.0.1.tar.gz", + "downloads": [ + { + "path": "/epr/metricsonly/metricsonly-2.0.1.tar.gz", + "type": "tar" + } + ], + "path": "/package/metricsonly/2.0.1", + "icons": [ + { + "src": "/package/metricsonly/2.0.1/img/icon.svg", + "type": "image/svg+xml" + } + ] + }, + { + "name": "multiple_false", + "title": "Multiple false", + "version": "0.0.1", + "description": "Tests that multiple can be set to false", + "type": "integration", + "download": "/epr/multiple_false/multiple_false-0.0.1.tar.gz", + "downloads": [ + { + "path": "/epr/multiple_false/multiple_false-0.0.1.tar.gz", + "type": "tar" + } + ], + "path": "/package/multiple_false/0.0.1" + }, + { + "name": "multiversion", + "title": "Multi Version", + "version": "1.1.0", + "description": "Multiple versions of this integration exist.\n", + "type": "integration", + "download": "/epr/multiversion/multiversion-1.1.0.tar.gz", + "downloads": [ + { + "path": "/epr/multiversion/multiversion-1.1.0.tar.gz", + "type": "tar" + } + ], + "path": "/package/multiversion/1.1.0", + "icons": [ + { + "src": "/package/multiversion/1.1.0/img/icon.svg", + "type": "image/svg+xml" + } + ] + }, + { + "name": "no_stream_configs", + "title": "No Stream configs", + "version": "1.0.0", + "description": "This package does contain a dataset but not stream configs.\n", + "type": "integration", + "download": "/epr/no_stream_configs/no_stream_configs-1.0.0.tar.gz", + "downloads": [ + { + "path": "/epr/no_stream_configs/no_stream_configs-1.0.0.tar.gz", + "type": "tar" + } + ], + "path": "/package/no_stream_configs/1.0.0" + }, + { + "name": "reference", + "title": "Reference package", + "version": "1.0.0", + "description": "This package is used for defining all the properties of a package, the possible assets etc. It serves as a reference on all the config options which are possible.\n", + "type": "integration", + "download": "/epr/reference/reference-1.0.0.tar.gz", + "downloads": [ + { + "path": "/epr/reference/reference-1.0.0.tar.gz", + "type": "tar" + } + ], + "path": "/package/reference/1.0.0", + "icons": [ + { + "src": "/package/reference/1.0.0/img/icon.svg", + "size": "32x32", + "type": "image/svg+xml" + } + ] + }, + { + "name": "yamlpipeline", + "title": "Yaml Pipeline package", + "version": "1.0.0", + "description": "This package contains a yaml pipeline.\n", + "type": "integration", + "download": "/epr/yamlpipeline/yamlpipeline-1.0.0.tar.gz", + "downloads": [ + { + "path": "/epr/yamlpipeline/yamlpipeline-1.0.0.tar.gz", + "type": "tar" + } + ], + "path": "/package/yamlpipeline/1.0.0" + } +] \ No newline at end of file diff --git a/testdata/generated/search-category-logs.json b/testdata/generated/search-category-logs.json index 7e2564b43..0637a088a 100644 --- a/testdata/generated/search-category-logs.json +++ b/testdata/generated/search-category-logs.json @@ -1,171 +1 @@ -[ - { - "name": "datasources", - "title": "Default datasource Integration", - "version": "1.0.0", - "description": "Package with data sources", - "type": "integration", - "download": "/epr/datasources/datasources-1.0.0.tar.gz", - "downloads": [ - { - "path": "/epr/datasources/datasources-1.0.0.tar.gz", - "type": "tar" - } - ], - "path": "/package/datasources/1.0.0" - }, - { - "name": "default_pipeline", - "title": "Default pipeline Integration", - "version": "0.0.2", - "description": "Tests if no pipeline is set, it defaults to the default one", - "type": "integration", - "download": "/epr/default_pipeline/default_pipeline-0.0.2.tar.gz", - "downloads": [ - { - "path": "/epr/default_pipeline/default_pipeline-0.0.2.tar.gz", - "type": "tar" - } - ], - "path": "/package/default_pipeline/0.0.2" - }, - { - "name": "ecs_style_dataset", - "title": "Default pipeline Integration", - "version": "0.0.1", - "description": "Tests the registry validations works for dataset fields using the ecs style format", - "type": "integration", - "download": "/epr/ecs_style_dataset/ecs_style_dataset-0.0.1.tar.gz", - "downloads": [ - { - "path": "/epr/ecs_style_dataset/ecs_style_dataset-0.0.1.tar.gz", - "type": "tar" - } - ], - "path": "/package/ecs_style_dataset/0.0.1" - }, - { - "name": "example", - "title": "Example Integration", - "version": "1.0.0", - "description": "This is the example integration", - "type": "integration", - "download": "/epr/example/example-1.0.0.tar.gz", - "downloads": [ - { - "path": "/epr/example/example-1.0.0.tar.gz", - "type": "tar" - } - ], - "path": "/package/example/1.0.0" - }, - { - "name": "longdocs", - "title": "Long Docs", - "version": "1.0.4", - "description": "This integration contains pretty long documentation.\nIt is used to show the different visualisations inside a documentation to test how we handle it.\nThe integration does not contain any assets except the documentation page.\n", - "type": "integration", - "download": "/epr/longdocs/longdocs-1.0.4.tar.gz", - "downloads": [ - { - "path": "/epr/longdocs/longdocs-1.0.4.tar.gz", - "type": "tar" - } - ], - "path": "/package/longdocs/1.0.4", - "icons": [ - { - "src": "/package/longdocs/1.0.4/img/icon.svg", - "type": "image/svg+xml" - } - ] - }, - { - "name": "multiple_false", - "title": "Multiple false", - "version": "0.0.1", - "description": "Tests that multiple can be set to false", - "type": "integration", - "download": "/epr/multiple_false/multiple_false-0.0.1.tar.gz", - "downloads": [ - { - "path": "/epr/multiple_false/multiple_false-0.0.1.tar.gz", - "type": "tar" - } - ], - "path": "/package/multiple_false/0.0.1" - }, - { - "name": "multiversion", - "title": "Multi Version", - "version": "1.1.0", - "description": "Multiple versions of this integration exist.\n", - "type": "integration", - "download": "/epr/multiversion/multiversion-1.1.0.tar.gz", - "downloads": [ - { - "path": "/epr/multiversion/multiversion-1.1.0.tar.gz", - "type": "tar" - } - ], - "path": "/package/multiversion/1.1.0", - "icons": [ - { - "src": "/package/multiversion/1.1.0/img/icon.svg", - "type": "image/svg+xml" - } - ] - }, - { - "name": "no_stream_configs", - "title": "No Stream configs", - "version": "1.0.0", - "description": "This package does contain a dataset but not stream configs.\n", - "type": "integration", - "download": "/epr/no_stream_configs/no_stream_configs-1.0.0.tar.gz", - "downloads": [ - { - "path": "/epr/no_stream_configs/no_stream_configs-1.0.0.tar.gz", - "type": "tar" - } - ], - "path": "/package/no_stream_configs/1.0.0" - }, - { - "name": "reference", - "title": "Reference package", - "version": "1.0.0", - "description": "This package is used for defining all the properties of a package, the possible assets etc. It serves as a reference on all the config options which are possible.\n", - "type": "integration", - "download": "/epr/reference/reference-1.0.0.tar.gz", - "downloads": [ - { - "path": "/epr/reference/reference-1.0.0.tar.gz", - "type": "tar" - } - ], - "path": "/package/reference/1.0.0", - "icons": [ - { - "src": "/package/reference/1.0.0/img/icon.svg", - "size": "32x32", - "type": "image/svg+xml" - } - ] - }, - { - "name": "yamlpipeline", - "title": "Yaml Pipeline package", - "version": "1.0.0", - "description": "This package contains a yaml pipeline.\n", - "type": "integration", - "download": "/epr/yamlpipeline/yamlpipeline-1.0.0.tar.gz", - "downloads": [ - { - "path": "/epr/yamlpipeline/yamlpipeline-1.0.0.tar.gz", - "type": "tar" - } - ], - "path": "/package/yamlpipeline/1.0.0" - } -] \ No newline at end of file +[] \ No newline at end of file diff --git a/testdata/generated/search-category-metrics.json b/testdata/generated/search-category-metrics.json index 52efe491a..0637a088a 100644 --- a/testdata/generated/search-category-metrics.json +++ b/testdata/generated/search-category-metrics.json @@ -1,117 +1 @@ -[ - { - "name": "example", - "title": "Example Integration", - "version": "1.0.0", - "description": "This is the example integration", - "type": "integration", - "download": "/epr/example/example-1.0.0.tar.gz", - "downloads": [ - { - "path": "/epr/example/example-1.0.0.tar.gz", - "type": "tar" - } - ], - "path": "/package/example/1.0.0" - }, - { - "name": "foo", - "title": "Foo", - "version": "1.0.0", - "description": "This is the foo integration", - "type": "solution", - "download": "/epr/foo/foo-1.0.0.tar.gz", - "downloads": [ - { - "path": "/epr/foo/foo-1.0.0.tar.gz", - "type": "tar" - } - ], - "path": "/package/foo/1.0.0" - }, - { - "name": "longdocs", - "title": "Long Docs", - "version": "1.0.4", - "description": "This integration contains pretty long documentation.\nIt is used to show the different visualisations inside a documentation to test how we handle it.\nThe integration does not contain any assets except the documentation page.\n", - "type": "integration", - "download": "/epr/longdocs/longdocs-1.0.4.tar.gz", - "downloads": [ - { - "path": "/epr/longdocs/longdocs-1.0.4.tar.gz", - "type": "tar" - } - ], - "path": "/package/longdocs/1.0.4", - "icons": [ - { - "src": "/package/longdocs/1.0.4/img/icon.svg", - "type": "image/svg+xml" - } - ] - }, - { - "name": "metricsonly", - "title": "Metrics Only", - "version": "2.0.1", - "description": "This is an integration with only the metrics category.\n", - "type": "integration", - "download": "/epr/metricsonly/metricsonly-2.0.1.tar.gz", - "downloads": [ - { - "path": "/epr/metricsonly/metricsonly-2.0.1.tar.gz", - "type": "tar" - } - ], - "path": "/package/metricsonly/2.0.1", - "icons": [ - { - "src": "/package/metricsonly/2.0.1/img/icon.svg", - "type": "image/svg+xml" - } - ] - }, - { - "name": "multiversion", - "title": "Multi Version", - "version": "1.1.0", - "description": "Multiple versions of this integration exist.\n", - "type": "integration", - "download": "/epr/multiversion/multiversion-1.1.0.tar.gz", - "downloads": [ - { - "path": "/epr/multiversion/multiversion-1.1.0.tar.gz", - "type": "tar" - } - ], - "path": "/package/multiversion/1.1.0", - "icons": [ - { - "src": "/package/multiversion/1.1.0/img/icon.svg", - "type": "image/svg+xml" - } - ] - }, - { - "name": "reference", - "title": "Reference package", - "version": "1.0.0", - "description": "This package is used for defining all the properties of a package, the possible assets etc. It serves as a reference on all the config options which are possible.\n", - "type": "integration", - "download": "/epr/reference/reference-1.0.0.tar.gz", - "downloads": [ - { - "path": "/epr/reference/reference-1.0.0.tar.gz", - "type": "tar" - } - ], - "path": "/package/reference/1.0.0", - "icons": [ - { - "src": "/package/reference/1.0.0/img/icon.svg", - "size": "32x32", - "type": "image/svg+xml" - } - ] - } -] \ No newline at end of file +[] \ No newline at end of file diff --git a/testdata/generated/search-category-web.json b/testdata/generated/search-category-web.json new file mode 100644 index 000000000..37f81ff0d --- /dev/null +++ b/testdata/generated/search-category-web.json @@ -0,0 +1,81 @@ +[ + { + "name": "example", + "title": "Example", + "version": "0.0.2", + "description": "This is the example integration.", + "type": "integration", + "download": "/epr/example/example-0.0.2.tar.gz", + "downloads": [ + { + "path": "/epr/example/example-0.0.2.tar.gz", + "type": "tar" + } + ], + "path": "/package/example/0.0.2" + }, + { + "name": "longdocs", + "title": "Long Docs", + "version": "1.0.4", + "description": "This integration contains pretty long documentation.\nIt is used to show the different visualisations inside a documentation to test how we handle it.\nThe integration does not contain any assets except the documentation page.\n", + "type": "integration", + "download": "/epr/longdocs/longdocs-1.0.4.tar.gz", + "downloads": [ + { + "path": "/epr/longdocs/longdocs-1.0.4.tar.gz", + "type": "tar" + } + ], + "path": "/package/longdocs/1.0.4", + "icons": [ + { + "src": "/package/longdocs/1.0.4/img/icon.svg", + "type": "image/svg+xml" + } + ] + }, + { + "name": "multiversion", + "title": "Multi Version", + "version": "1.1.0", + "description": "Multiple versions of this integration exist.\n", + "type": "integration", + "download": "/epr/multiversion/multiversion-1.1.0.tar.gz", + "downloads": [ + { + "path": "/epr/multiversion/multiversion-1.1.0.tar.gz", + "type": "tar" + } + ], + "path": "/package/multiversion/1.1.0", + "icons": [ + { + "src": "/package/multiversion/1.1.0/img/icon.svg", + "type": "image/svg+xml" + } + ] + }, + { + "name": "reference", + "title": "Reference package", + "version": "1.0.0", + "description": "This package is used for defining all the properties of a package, the possible assets etc. It serves as a reference on all the config options which are possible.\n", + "type": "integration", + "download": "/epr/reference/reference-1.0.0.tar.gz", + "downloads": [ + { + "path": "/epr/reference/reference-1.0.0.tar.gz", + "type": "tar" + } + ], + "path": "/package/reference/1.0.0", + "icons": [ + { + "src": "/package/reference/1.0.0/img/icon.svg", + "size": "32x32", + "type": "image/svg+xml" + } + ] + } +] \ No newline at end of file diff --git a/testdata/package/datasources/1.0.0/manifest.yml b/testdata/package/datasources/1.0.0/manifest.yml index 964837deb..0201ae58a 100644 --- a/testdata/package/datasources/1.0.0/manifest.yml +++ b/testdata/package/datasources/1.0.0/manifest.yml @@ -4,7 +4,7 @@ name: datasources description: Package with data sources version: 1.0.0 title: Default datasource Integration -categories: ["logs"] +categories: ["custom"] type: integration license: basic release: beta diff --git a/testdata/package/default_pipeline/0.0.2/manifest.yml b/testdata/package/default_pipeline/0.0.2/manifest.yml index 4fb2e13e2..b7b371f58 100644 --- a/testdata/package/default_pipeline/0.0.2/manifest.yml +++ b/testdata/package/default_pipeline/0.0.2/manifest.yml @@ -4,7 +4,7 @@ name: default_pipeline description: Tests if no pipeline is set, it defaults to the default one version: 0.0.2 title: Default pipeline Integration -categories: ["logs", "message_queue"] +categories: ["containers", "message_queue"] type: integration release: beta diff --git a/testdata/package/ecs_style_dataset/0.0.1/manifest.yml b/testdata/package/ecs_style_dataset/0.0.1/manifest.yml index 4761ec214..07cd13e8e 100644 --- a/testdata/package/ecs_style_dataset/0.0.1/manifest.yml +++ b/testdata/package/ecs_style_dataset/0.0.1/manifest.yml @@ -4,7 +4,7 @@ name: ecs_style_dataset description: Tests the registry validations works for dataset fields using the ecs style format version: 0.0.1 title: Default pipeline Integration -categories: ["logs"] +categories: ["monitoring"] type: integration release: beta diff --git a/testdata/package/example/0.0.2/manifest.yml b/testdata/package/example/0.0.2/manifest.yml index 386a1bdff..9674495cb 100644 --- a/testdata/package/example/0.0.2/manifest.yml +++ b/testdata/package/example/0.0.2/manifest.yml @@ -4,7 +4,7 @@ name: example title: Example description: This is the example integration. version: 0.0.2 -categories: ["logs"] +categories: ["web"] release: beta requirement: diff --git a/testdata/package/example/1.0.0/manifest.yml b/testdata/package/example/1.0.0/manifest.yml index 25befbb80..d28e9bf76 100644 --- a/testdata/package/example/1.0.0/manifest.yml +++ b/testdata/package/example/1.0.0/manifest.yml @@ -4,7 +4,7 @@ name: example description: This is the example integration version: 1.0.0 title: Example Integration -categories: ["logs", "metrics"] +categories: ["crm", "azure"] type: integration release: ga diff --git a/testdata/package/experimental/0.0.1/manifest.yml b/testdata/package/experimental/0.0.1/manifest.yml index 9863f6fb0..da4c54d09 100644 --- a/testdata/package/experimental/0.0.1/manifest.yml +++ b/testdata/package/experimental/0.0.1/manifest.yml @@ -4,7 +4,7 @@ name: experimental description: Experimental package, should be set by default version: 0.0.1 title: Experimental -categories: [metrics] +categories: ["aws"] type: solution diff --git a/testdata/package/foo/1.0.0/manifest.yml b/testdata/package/foo/1.0.0/manifest.yml index 10ccc454b..65c385239 100644 --- a/testdata/package/foo/1.0.0/manifest.yml +++ b/testdata/package/foo/1.0.0/manifest.yml @@ -4,7 +4,7 @@ name: foo description: This is the foo integration version: 1.0.0 title: Foo -categories: [metrics] +categories: ["custom"] type: solution release: beta diff --git a/testdata/package/longdocs/1.0.4/manifest.yml b/testdata/package/longdocs/1.0.4/manifest.yml index 8c6a433f2..7ec9884d3 100644 --- a/testdata/package/longdocs/1.0.4/manifest.yml +++ b/testdata/package/longdocs/1.0.4/manifest.yml @@ -9,7 +9,7 @@ description: > The integration does not contain any assets except the documentation page. version: 1.0.4 -categories: ["logs", "metrics"] +categories: ["custom", "web"] release: ga license: basic diff --git a/testdata/package/metricsonly/2.0.1/manifest.yml b/testdata/package/metricsonly/2.0.1/manifest.yml index df85f6e61..f99186edb 100644 --- a/testdata/package/metricsonly/2.0.1/manifest.yml +++ b/testdata/package/metricsonly/2.0.1/manifest.yml @@ -5,7 +5,7 @@ title: Metrics Only description: > This is an integration with only the metrics category. version: 2.0.1 -categories: ["metrics"] +categories: ["custom"] release: ga license: basic diff --git a/testdata/package/multiple_false/0.0.1/manifest.yml b/testdata/package/multiple_false/0.0.1/manifest.yml index e34c6009f..2ab8b9818 100644 --- a/testdata/package/multiple_false/0.0.1/manifest.yml +++ b/testdata/package/multiple_false/0.0.1/manifest.yml @@ -4,7 +4,7 @@ name: multiple_false description: Tests that multiple can be set to false version: 0.0.1 title: Multiple false -categories: ["logs"] +categories: ["custom"] type: integration release: beta diff --git a/testdata/package/multiversion/1.0.3/manifest.yml b/testdata/package/multiversion/1.0.3/manifest.yml index 000552de2..0c1e6ef8d 100644 --- a/testdata/package/multiversion/1.0.3/manifest.yml +++ b/testdata/package/multiversion/1.0.3/manifest.yml @@ -5,7 +5,7 @@ title: Multi Version description: > Multiple versions of this integration exist. version: 1.0.3 -categories: ["logs", "metrics"] +categories: ["custom", "web"] release: ga license: basic diff --git a/testdata/package/multiversion/1.0.4/manifest.yml b/testdata/package/multiversion/1.0.4/manifest.yml index 228f98db0..b4271dd79 100644 --- a/testdata/package/multiversion/1.0.4/manifest.yml +++ b/testdata/package/multiversion/1.0.4/manifest.yml @@ -5,7 +5,7 @@ title: Multi Version description: > Multiple versions of this integration exist. version: 1.0.4 -categories: ["logs", "metrics"] +categories: ["custom", "web"] release: ga license: basic type: integration diff --git a/testdata/package/multiversion/1.1.0/manifest.yml b/testdata/package/multiversion/1.1.0/manifest.yml index 76d944a2a..0f10442ea 100644 --- a/testdata/package/multiversion/1.1.0/manifest.yml +++ b/testdata/package/multiversion/1.1.0/manifest.yml @@ -5,7 +5,7 @@ title: Multi Version description: > Multiple versions of this integration exist. version: 1.1.0 -categories: ["logs", "metrics"] +categories: ["custom", "web"] release: ga license: basic diff --git a/testdata/package/no_stream_configs/1.0.0/manifest.yml b/testdata/package/no_stream_configs/1.0.0/manifest.yml index a6affd1df..5f554f540 100644 --- a/testdata/package/no_stream_configs/1.0.0/manifest.yml +++ b/testdata/package/no_stream_configs/1.0.0/manifest.yml @@ -5,7 +5,7 @@ title: No Stream configs description: > This package does contain a dataset but not stream configs. version: 1.0.0 -categories: [logs] +categories: ["custom"] release: beta license: basic diff --git a/testdata/package/reference/1.0.0/manifest.yml b/testdata/package/reference/1.0.0/manifest.yml index c1e03536f..2f370f960 100644 --- a/testdata/package/reference/1.0.0/manifest.yml +++ b/testdata/package/reference/1.0.0/manifest.yml @@ -16,7 +16,7 @@ description: > version: 1.0.0 # Categories this package fits in. The current two categories are "logs" and "metrics" -categories: ["logs", "metrics"] +categories: ["custom", "web"] # Release of this package. The possible options are experimental, beta, ga. The default if not set is experimental. release: ga diff --git a/testdata/package/yamlpipeline/1.0.0/manifest.yml b/testdata/package/yamlpipeline/1.0.0/manifest.yml index 015c63b9d..daccd8683 100644 --- a/testdata/package/yamlpipeline/1.0.0/manifest.yml +++ b/testdata/package/yamlpipeline/1.0.0/manifest.yml @@ -5,7 +5,7 @@ title: Yaml Pipeline package description: > This package contains a yaml pipeline. version: 1.0.0 -categories: [logs] +categories: ["custom"] release: beta license: basic From 6989889f8746beaedeeb617a7546dfa7da04b6d9 Mon Sep 17 00:00:00 2001 From: ruflin Date: Tue, 30 Jun 2020 16:05:36 +0200 Subject: [PATCH 3/5] new files --- testdata/generated/search-category-logs.json | 1 - testdata/generated/search-category-metrics.json | 1 - 2 files changed, 2 deletions(-) delete mode 100644 testdata/generated/search-category-logs.json delete mode 100644 testdata/generated/search-category-metrics.json diff --git a/testdata/generated/search-category-logs.json b/testdata/generated/search-category-logs.json deleted file mode 100644 index 0637a088a..000000000 --- a/testdata/generated/search-category-logs.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/testdata/generated/search-category-metrics.json b/testdata/generated/search-category-metrics.json deleted file mode 100644 index 0637a088a..000000000 --- a/testdata/generated/search-category-metrics.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file From 883772711fa8ad085364e2bf8a847d24c01c9906 Mon Sep 17 00:00:00 2001 From: ruflin Date: Tue, 30 Jun 2020 16:07:36 +0200 Subject: [PATCH 4/5] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 488b471be..745d14e73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Rename `kibana` query param to `kibana.version`. [#518](https://github.com/elastic/package-registry/pull/518) * 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) ### Bugfixes From 2f601739517e9d4cab066aac196e23b1531402b3 Mon Sep 17 00:00:00 2001 From: ruflin Date: Tue, 30 Jun 2020 19:47:27 +0200 Subject: [PATCH 5/5] fix package test --- util/package_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util/package_test.go b/util/package_test.go index 48b0a2643..993be28dd 100644 --- a/util/package_test.go +++ b/util/package_test.go @@ -57,7 +57,7 @@ var packageTests = []struct { Versions: ">=1.2.3 <=4.5.6", }, }, - Categories: []string{"metrics", "logs", "foo"}, + Categories: []string{"custom", "foo"}, }, false, "invalid category ", @@ -68,7 +68,7 @@ var packageTests = []struct { Title: &title, Description: "my description", }, - Categories: []string{"metrics", "logs"}, + Categories: []string{"custom", "web"}, }, false, "missing format_version", @@ -79,7 +79,7 @@ var packageTests = []struct { Title: &title, Description: "my description", }, - Categories: []string{"metrics", "logs"}, + Categories: []string{"custom", "web"}, FormatVersion: "1.0", }, false, @@ -92,7 +92,7 @@ var packageTests = []struct { Description: "my description", Version: "1.0", }, - Categories: []string{"metrics", "logs"}, + Categories: []string{"custom", "web"}, FormatVersion: "1.0.0", }, false, @@ -105,7 +105,7 @@ var packageTests = []struct { Description: "my description", Version: "1.2.3", }, - Categories: []string{"metrics", "logs"}, + Categories: []string{"custom", "web"}, FormatVersion: "1.0.0", }, true,