Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
May 11, 2021
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2670e1
[Fleet] Allow to specify kibana.version when fetching categories
nchaulet May 10, 2021
1db74ed
Add tests and update changelog
nchaulet May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions categories.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
"strconv"
"time"

"github.com/Masterminds/semver/v3"

"github.com/elastic/package-registry/util"
)

Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down