Skip to content

Commit

Permalink
Add comments inadvertently removed during migrate (#27)
Browse files Browse the repository at this point in the history
A few files had their first comment removed even though it did not
contain a license. This re-adds those comments.
  • Loading branch information
hub-cap authored Apr 24, 2018
1 parent e63e96e commit edf37ec
Show file tree
Hide file tree
Showing 19 changed files with 55 additions and 0 deletions.
14 changes: 14 additions & 0 deletions x-pack/plugin/security/src/main/config/role_mapping.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Role mapping configuration file which has elasticsearch roles as keys
# that map to one or more user or group distinguished names

#roleA: this is an elasticsearch role
# - groupA-DN this is a group distinguished name
# - groupB-DN
# - user1-DN this is the full user distinguished name

#power_user:
# - "cn=admins,dc=example,dc=com"
#user:
# - "cn=users,dc=example,dc=com"
# - "cn=admins,dc=example,dc=com"
# - "cn=John Doe,cn=other users,dc=example,dc=com"
3 changes: 3 additions & 0 deletions x-pack/plugin/security/src/main/config/roles.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# The default roles file is empty as the preferred method of defining roles is
# through the API/UI. File based roles are useful in error scenarios when the
# API based roles may not be available.
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# AD Realm Role Mapping
group_role:
- "CN=Avengers,CN=users,DC=ad,DC=test,DC=elasticsearch,DC=com"
user_role:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This LDAP connection does group lookup by a subtree search, no role mapping
ldap:
urls:
- ldap://ldap.example.com:1389
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This LDAP connection does group lookup by attribute with group to role mapping
ldap:
urls: # these connections are not round-robin, but primary, secondary, etc. When the first fails the second is attempted
- ldap://ldap.example.com:1389
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# Role mappings for PKI tests

user:
- "CN=Elasticsearch Test Node, OU=elasticsearch, O=org"
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# roleA this is an elasticsearch role
# - groupA-DN this is any group, ldap DN, or unix group
# - groupB-DN
# - user1-DN

#This is an example of ldap mapping configuration
security:
- "cn=avengers,ou=marvel,o=superheros"
- "cn=shield,ou=marvel,o=superheros"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# The default roles file is empty as the preferred method of defining roles is
# through the API/UI. File based roles are useful in error scenarios when the
# API based roles may not be available.
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# All cluster rights
# All operations on all indices
admin:
cluster:
- all
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Integration tests for monitoring
#
"X-Pack loaded":
- do:
cluster.state: {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Integration tests xpack info and usage API
#
"X-Pack Info and Usage":

- do:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# remove this test from core-tests-with-security as soon as we can
# pull in rest test from modules in core
---
"Basic Rankeval test":

Expand Down
3 changes: 3 additions & 0 deletions x-pack/qa/reindex-tests-with-security/roles.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# All cluster rights
# All operations on all indices
# Run as all users
admin:
cluster:
- all
Expand Down
4 changes: 4 additions & 0 deletions x-pack/qa/security-migrate-tests/roles.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# A role that has all sorts of configuration:
# - it can monitor the cluster
# - for index1 and index2 it can do CRUD things and refresh
# - for other indices it has search-only privileges
actual_role:
run_as: [ "joe" ]
cluster:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Integration tests for smoke testing plugins
#
"Plugins are actually installed":
- do:
cluster.state: {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Integration tests for smoke testing plugins
#
"Secret settings are correctly filtered":
- do:
cluster.state: {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Integration tests for smoke testing plugins
#
"Plugins are actually installed":
- do:
cluster.state: {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# When a script is specified in a watch, updates should be taken into account
# See https://github.com/elastic/x-plugins/issues/4237
---
"Test transform scripts are updated on execution":
- skip:
Expand Down
1 change: 1 addition & 0 deletions x-pack/qa/sql/security/roles.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# tag::rest
rest_minimal:
indices:
- names: test
Expand Down

0 comments on commit edf37ec

Please sign in to comment.