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

Add support for elasticsearch.privileges.cluster #750

Merged
merged 6 commits into from
Oct 14, 2021
Merged

Add support for elasticsearch.privileges.cluster #750

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b7285e5
Add support for elasticsearch.privileges.cluster
nchaulet Oct 13, 2021
bc5ccaa
Fix after review
nchaulet Oct 14, 2021
649ebbb
Merge branch 'master' of github.com:elastic/package-registry into fea…
nchaulet Oct 14, 2021
9cc6f54
Add a changelog entry
nchaulet Oct 14, 2021
fd53bc5
Fix test data to use existing cluster privileges
nchaulet Oct 14, 2021
aaf4fd3
Merge branch 'master' into feature-support-elasticsearch-cluster-priv…
jsoriano Oct 14, 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
20 changes: 10 additions & 10 deletions packages/datastream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ type DataStream struct {
Release string `config:"release" json:"release"`

// Deprecated: Replaced by elasticsearch.ingest_pipeline.name
IngestPipeline string `config:"ingest_pipeline,omitempty" config:"ingest_pipeline" json:"ingest_pipeline,omitempty" yaml:"ingest_pipeline,omitempty"`
Streams []Stream `config:"streams" json:"streams,omitempty" yaml:"streams,omitempty" `
Package string `json:"package,omitempty" yaml:"package,omitempty"`
Elasticsearch *Elasticsearch `config:"elasticsearch,omitempty" json:"elasticsearch,omitempty" yaml:"elasticsearch,omitempty"`
IngestPipeline string `config:"ingest_pipeline,omitempty" config:"ingest_pipeline" json:"ingest_pipeline,omitempty" yaml:"ingest_pipeline,omitempty"`
Streams []Stream `config:"streams" json:"streams,omitempty" yaml:"streams,omitempty" `
Package string `json:"package,omitempty" yaml:"package,omitempty"`
Elasticsearch *DsElasticsearch `config:"elasticsearch,omitempty" json:"elasticsearch,omitempty" yaml:"elasticsearch,omitempty"`

// Generated fields
Path string `json:"path,omitempty" yaml:"path,omitempty"`
Expand Down Expand Up @@ -94,14 +94,14 @@ type Variable struct {
Default interface{} `config:"default" json:"default,omitempty" yaml:"default,omitempty"`
}

type Elasticsearch struct {
IndexTemplateSettings map[string]interface{} `config:"index_template.settings" json:"index_template.settings,omitempty" yaml:"index_template.settings,omitempty"`
IndexTemplateMappings map[string]interface{} `config:"index_template.mappings" json:"index_template.mappings,omitempty" yaml:"index_template.mappings,omitempty"`
IngestPipelineName string `config:"ingest_pipeline.name,omitempty" json:"ingest_pipeline.name,omitempty" yaml:"ingest_pipeline.name,omitempty"`
Privileges *ElasticsearchPrivileges `config:"privileges,omitempty" json:"privileges,omitempty" yaml:"privileges,omitempty"`
type DsElasticsearch struct {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: let's expand the Ds and replace it with DataStreamElasticsearch

IndexTemplateSettings map[string]interface{} `config:"index_template.settings" json:"index_template.settings,omitempty" yaml:"index_template.settings,omitempty"`
IndexTemplateMappings map[string]interface{} `config:"index_template.mappings" json:"index_template.mappings,omitempty" yaml:"index_template.mappings,omitempty"`
IngestPipelineName string `config:"ingest_pipeline.name,omitempty" json:"ingest_pipeline.name,omitempty" yaml:"ingest_pipeline.name,omitempty"`
Privileges *DsElasticsearchPrivileges `config:"privileges,omitempty" json:"privileges,omitempty" yaml:"privileges,omitempty"`
}

type ElasticsearchPrivileges struct {
type DsElasticsearchPrivileges struct {
Indices []string `config:"indices,omitempty" json:"indices,omitempty" yaml:"indices,omitempty"`
}

Expand Down
21 changes: 15 additions & 6 deletions packages/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@ type Package struct {
Readme *string `config:"readme,omitempty" json:"readme,omitempty" yaml:"readme,omitempty"`
License string `config:"license,omitempty" json:"license,omitempty" yaml:"license,omitempty"`
versionSemVer *semver.Version
Categories []string `config:"categories" json:"categories"`
Screenshots []Image `config:"screenshots,omitempty" json:"screenshots,omitempty" yaml:"screenshots,omitempty"`
Assets []string `config:"assets,omitempty" json:"assets,omitempty" yaml:"assets,omitempty"`
PolicyTemplates []PolicyTemplate `config:"policy_templates,omitempty" json:"policy_templates,omitempty" yaml:"policy_templates,omitempty"`
DataStreams []*DataStream `config:"data_streams,omitempty" json:"data_streams,omitempty" yaml:"data_streams,omitempty"`
Vars []Variable `config:"vars" json:"vars,omitempty" yaml:"vars,omitempty"`
Categories []string `config:"categories" json:"categories"`
Screenshots []Image `config:"screenshots,omitempty" json:"screenshots,omitempty" yaml:"screenshots,omitempty"`
Assets []string `config:"assets,omitempty" json:"assets,omitempty" yaml:"assets,omitempty"`
PolicyTemplates []PolicyTemplate `config:"policy_templates,omitempty" json:"policy_templates,omitempty" yaml:"policy_templates,omitempty"`
DataStreams []*DataStream `config:"data_streams,omitempty" json:"data_streams,omitempty" yaml:"data_streams,omitempty"`
Vars []Variable `config:"vars" json:"vars,omitempty" yaml:"vars,omitempty"`
Elasticsearch *PkgElasticsearch `config:"elasticsearch,omitempty" json:"elasticsearch,omitempty" yaml:"elasticsearch,omitempty"`

// Local path to the package dir
BasePath string `json:"-" yaml:"-"`
Expand Down Expand Up @@ -144,6 +145,14 @@ type Image struct {
Type string `config:"type" json:"type,omitempty"`
}

type PkgElasticsearch struct {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: same situation, PackageElasticsearch

Privileges *PkgElasticsearchPrivileges `config:"privileges,omitempty" json:"privileges,omitempty" yaml:"privileges,omitempty"`
}

type PkgElasticsearchPrivileges struct {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: PackageElasticsearchPrivileges

Cluster []string `config:"cluster,omitempty" json:"cluster,omitempty" yaml:"cluster,omitempty"`
}

func (i Image) getPath(p *Package) string {
return path.Join(packagePathPrefix, p.Name, p.Version, i.Src)
}
Expand Down
11 changes: 9 additions & 2 deletions testdata/generated/package/elasticsearch_privileges/1.0.0/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "Elasticsearch Privileges",
"version": "1.0.0",
"release": "beta",
"description": "Test package-specified Elasticsearch index privileges",
"description": "Test package-specified Elasticsearch index privileges and cluster privileges",
"type": "solution",
"download": "/epr/elasticsearch_privileges/elasticsearch_privileges-1.0.0.zip",
"path": "/package/elasticsearch_privileges/1.0.0",
Expand Down Expand Up @@ -44,5 +44,12 @@
},
"path": "elasticsearch_privileges"
}
]
],
"elasticsearch": {
"privileges": {
"cluster": [
"monitor/main"
]
}
}
}
2 changes: 1 addition & 1 deletion testdata/generated/search-all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"title": "Elasticsearch Privileges",
"version": "1.0.0",
"release": "beta",
"description": "Test package-specified Elasticsearch index privileges",
"description": "Test package-specified Elasticsearch index privileges and cluster privileges",
"type": "solution",
"download": "/epr/elasticsearch_privileges/elasticsearch_privileges-1.0.0.zip",
"path": "/package/elasticsearch_privileges/1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion testdata/generated/search-category-custom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"title": "Elasticsearch Privileges",
"version": "1.0.0",
"release": "beta",
"description": "Test package-specified Elasticsearch index privileges",
"description": "Test package-specified Elasticsearch index privileges and cluster privileges",
"type": "solution",
"download": "/epr/elasticsearch_privileges/elasticsearch_privileges-1.0.0.zip",
"path": "/package/elasticsearch_privileges/1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion testdata/generated/search-package-experimental.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"title": "Elasticsearch Privileges",
"version": "1.0.0",
"release": "beta",
"description": "Test package-specified Elasticsearch index privileges",
"description": "Test package-specified Elasticsearch index privileges and cluster privileges",
"type": "solution",
"download": "/epr/elasticsearch_privileges/elasticsearch_privileges-1.0.0.zip",
"path": "/package/elasticsearch_privileges/1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion testdata/generated/search-package-internal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"title": "Elasticsearch Privileges",
"version": "1.0.0",
"release": "beta",
"description": "Test package-specified Elasticsearch index privileges",
"description": "Test package-specified Elasticsearch index privileges and cluster privileges",
"type": "solution",
"download": "/epr/elasticsearch_privileges/elasticsearch_privileges-1.0.0.zip",
"path": "/package/elasticsearch_privileges/1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion testdata/generated/search.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"title": "Elasticsearch Privileges",
"version": "1.0.0",
"release": "beta",
"description": "Test package-specified Elasticsearch index privileges",
"description": "Test package-specified Elasticsearch index privileges and cluster privileges",
"type": "solution",
"download": "/epr/elasticsearch_privileges/elasticsearch_privileges-1.0.0.zip",
"path": "/package/elasticsearch_privileges/1.0.0",
Expand Down
7 changes: 5 additions & 2 deletions testdata/package/elasticsearch_privileges/1.0.0/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
format_version: 1.0.0

name: elasticsearch_privileges
description: Test package-specified Elasticsearch index privileges
description: Test package-specified Elasticsearch index privileges and cluster privileges
version: 1.0.0
title: Elasticsearch Privileges
categories: ["custom"]
type: solution
release: beta

elasticsearch:
privileges:
cluster: ["monitor/main"]

conditions:
kibana:
version: ">=7.16.0"