Merge pull request #695 from nchaulet/feature-categories-kibana-version

[Fleet] Allow to specify kibana.version when fetching categories

CHANGELOG.md

@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Support filtering /categories using `kibana.version` query param [#695](https://github.com/elastic/package-registry/pull/695)
+
 ### Deprecated
 
 ### Known Issues

categories.go

@@ -12,6 +12,8 @@ import (
  "strconv"
  "time"
 
+ "github.com/Masterminds/semver/v3"
+
  "github.com/elastic/package-registry/util"
 )
 
@@ -33,6 +35,7 @@ func categoriesHandler(packagesBasePaths []string, cacheTime time.Duration) func
  query := r.URL.Query()
  var experimental bool
  var includePolicyTemplates bool
+ var kibanaVersion *semver.Version
 
  // Read query filter params which can affect the output
  if len(query) > 0 {
@@ -44,6 +47,14 @@ func categoriesHandler(packagesBasePaths []string, cacheTime time.Duration) func
  }
  }
 
+ if v := query.Get("kibana.version"); v != "" {
+ kibanaVersion, err = semver.NewVersion(v)
+ if err != nil {
+ badRequest(w, fmt.Sprintf("invalid Kibana version '%s': %s", v, err))
+ return
+ }
+ }
+
  if v := query.Get("include_policy_templates"); v != "" {
  includePolicyTemplates, err = strconv.ParseBool(v)
  if err != nil {
@@ -56,6 +67,12 @@ func categoriesHandler(packagesBasePaths []string, cacheTime time.Duration) func
  packageList := map[string]util.Package{}
  // Get unique list of newest packages
  for _, p := range packages {
+ // Check if the package is compatible with Kibana version
+ if kibanaVersion != nil {
+ if valid := p.HasKibanaVersion(kibanaVersion); !valid {
+ continue
+ }
+ }
 
  // Skip internal packages
  if p.Internal {

main_test.go

@@ -51,6 +51,7 @@ func TestEndpoints(t *testing.T) {
  {"/categories", "/categories", "categories.json", categoriesHandler(packagesBasePaths, testCacheTime)},
  {"/categories?experimental=true", "/categories", "categories-experimental.json", categoriesHandler(packagesBasePaths, testCacheTime)},
  {"/categories?experimental=foo", "/categories", "categories-experimental-error.json", categoriesHandler(packagesBasePaths, testCacheTime)},
+ {"/categories?experimental=true&kibana.version=6.5.2", "/categories", "categories-kibana652.json", categoriesHandler(packagesBasePaths, testCacheTime)},
  {"/categories?include_policy_templates=true", "/categories", "categories-include-policy-templates.json", categoriesHandler(packagesBasePaths, testCacheTime)},
  {"/categories?include_policy_templates=foo", "/categories", "categories-include-policy-templates-error.json", categoriesHandler(packagesBasePaths, testCacheTime)},
  {"/search?kibana.version=6.5.2", "/search", "search-kibana652.json", searchHandler(packagesBasePaths, testCacheTime)},

testdata/generated/categories-kibana652.json

@@ -0,0 +1,32 @@
+[
+ {
+ "id": "aws",
+ "title": "AWS",
+ "count": 1
+ },
+ {
+ "id": "containers",
+ "title": "Containers",
+ "count": 1
+ },
+ {
+ "id": "custom",
+ "title": "Custom",
+ "count": 6
+ },
+ {
+ "id": "message_queue",
+ "title": "Message Queue",
+ "count": 1
+ },
+ {
+ "id": "monitoring",
+ "title": "Monitoring",
+ "count": 1
+ },
+ {
+ "id": "web",
+ "title": "Web",
+ "count": 1
+ }
+]