Skip to content

Commit 72f57c8

Browse files
authored
Add comments inadvertently removed during migrate
A few files had their first comment removed even though it did not contain a license. This re-adds those comments.
1 parent cfc66a1 commit 72f57c8

File tree

19 files changed

+55
-0
lines changed

19 files changed

+55
-0
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Role mapping configuration file which has elasticsearch roles as keys
2+
# that map to one or more user or group distinguished names
3+
4+
#roleA: this is an elasticsearch role
5+
# - groupA-DN this is a group distinguished name
6+
# - groupB-DN
7+
# - user1-DN this is the full user distinguished name
8+
9+
#power_user:
10+
# - "cn=admins,dc=example,dc=com"
11+
#user:
12+
# - "cn=users,dc=example,dc=com"
13+
# - "cn=admins,dc=example,dc=com"
14+
# - "cn=John Doe,cn=other users,dc=example,dc=com"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# The default roles file is empty as the preferred method of defining roles is
2+
# through the API/UI. File based roles are useful in error scenarios when the
3+
# API based roles may not be available.

x-pack/plugin/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/role_mapping.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# AD Realm Role Mapping
12
group_role:
23
- "CN=Avengers,CN=users,DC=ad,DC=test,DC=elasticsearch,DC=com"
34
user_role:

x-pack/plugin/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldapWithGroupSearch.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# This LDAP connection does group lookup by a subtree search, no role mapping
12
ldap:
23
urls:
34
- ldap://ldap.example.com:1389

x-pack/plugin/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldapWithRoleMapping.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# This LDAP connection does group lookup by attribute with group to role mapping
12
ldap:
23
urls: # these connections are not round-robin, but primary, secondary, etc. When the first fails the second is attempted
34
- ldap://ldap.example.com:1389
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
# Role mappings for PKI tests
2+
13
user:
24
- "CN=Elasticsearch Test Node, OU=elasticsearch, O=org"

x-pack/plugin/security/src/test/resources/org/elasticsearch/xpack/security/authc/support/role_mapping.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# roleA this is an elasticsearch role
2+
# - groupA-DN this is any group, ldap DN, or unix group
3+
# - groupB-DN
4+
# - user1-DN
5+
6+
#This is an example of ldap mapping configuration
17
security:
28
- "cn=avengers,ou=marvel,o=superheros"
39
- "cn=shield,ou=marvel,o=superheros"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# The default roles file is empty as the preferred method of defining roles is
2+
# through the API/UI. File based roles are useful in error scenarios when the
3+
# API based roles may not be available.

x-pack/plugin/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/reserved_roles.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# All cluster rights
2+
# All operations on all indices
13
admin:
24
cluster:
35
- all

x-pack/plugin/src/test/resources/rest-api-spec/test/xpack/10_basic.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Integration tests for monitoring
2+
#
13
"X-Pack loaded":
24
- do:
35
cluster.state: {}

x-pack/plugin/src/test/resources/rest-api-spec/test/xpack/15_basic.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Integration tests xpack info and usage API
2+
#
13
"X-Pack Info and Usage":
24

35
- do:

x-pack/qa/core-rest-tests-with-security/src/test/resources/rest-api-spec/test/rankeval/10_rankeval.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# remove this test from core-tests-with-security as soon as we can
2+
# pull in rest test from modules in core
13
---
24
"Basic Rankeval test":
35

x-pack/qa/reindex-tests-with-security/roles.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# All cluster rights
2+
# All operations on all indices
3+
# Run as all users
14
admin:
25
cluster:
36
- all

x-pack/qa/security-migrate-tests/roles.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# A role that has all sorts of configuration:
2+
# - it can monitor the cluster
3+
# - for index1 and index2 it can do CRUD things and refresh
4+
# - for other indices it has search-only privileges
15
actual_role:
26
run_as: [ "joe" ]
37
cluster:

x-pack/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Integration tests for smoke testing plugins
2+
#
13
"Plugins are actually installed":
24
- do:
35
cluster.state: {}

x-pack/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/20_settings_filter.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Integration tests for smoke testing plugins
2+
#
13
"Secret settings are correctly filtered":
24
- do:
35
cluster.state: {}

x-pack/qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Integration tests for smoke testing plugins
2+
#
13
"Plugins are actually installed":
24
- do:
35
cluster.state: {}

x-pack/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_painless/50_update_scripts.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# When a script is specified in a watch, updates should be taken into account
2+
# See https://github.com/elastic/x-plugins/issues/4237
13
---
24
"Test transform scripts are updated on execution":
35
- skip:

x-pack/qa/sql/security/roles.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# tag::rest
12
rest_minimal:
23
indices:
34
- names: test

0 commit comments

Comments
 (0)