Skip to content
This repository has been archived by the owner on Sep 22, 2022. It is now read-only.

Xpack users roles creation #33

Merged
merged 2 commits into from
Mar 16, 2016

Conversation

tsullivan
Copy link
Member

Creating users in Elasticsearch 5.x / 3.x is different from previous versions because Shield is now an XPack feature. The config files for users are no longer config/shield/users* they're now config/xpack/users*

@simianhacker
Copy link
Member

Can you merge upstream/master with this?

@tsullivan tsullivan force-pushed the xpack-users-roles-creation branch from 32548a5 to 2fc8374 Compare March 3, 2016 20:00
@tsullivan
Copy link
Member Author

Done

% git lg -5
2fc8374 [enhancement] user creation support for 3.x/5.x (18 seconds ago) <Timothy Sullivan> (HEAD -> xpack-users-roles-creation, origin/xpack-users-roles-creation)
0639b22 [cleanup] remove unused function (18 seconds ago) <Timothy Sullivan>
13531b8 3.4.4 (47 minutes ago) <Chris Cowan> (upstream/master, master)
92b2675 Merge pull request #32 from Bargs/fixConfigOverride (48 minutes ago) <Chris Cowan>
54df111 Still need to create elasticsearch.json for overrides of default ES options to work (21 hours ago) <Matthew Bargar>

On March 3, 2016 at 12:59:17 PM, Chris Cowan (notifications@github.com) wrote:

Can you merge upstream/master with this?


Reply to this email directly or view it on GitHub.

@tsullivan tsullivan force-pushed the xpack-users-roles-creation branch from 2fc8374 to 096a18a Compare March 15, 2016 18:39
return function (configPath) {
// append the shield/xpack directory to configPath
var usersConfig = semver.satisfies(version, '5.x || 3.x') ? 'xpack' : 'shield';
configPath = path.join(configPath, usersConfig);
Copy link
Member

Choose a reason for hiding this comment

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

You should create a new variable here instead of just appending the usersConfig to this. When this function finally returns configPath it's now pointing to the wrong directory (which other functions depend on being set to the actual configPath)

@tsullivan tsullivan force-pushed the xpack-users-roles-creation branch from 096a18a to 739c3d4 Compare March 15, 2016 20:08
@tsullivan
Copy link
Member Author

@simianhacker I updated the function so it doesn't change the configPath that gets returned.

@simianhacker
Copy link
Member

LGTM

simianhacker added a commit that referenced this pull request Mar 16, 2016
@simianhacker simianhacker merged commit 9b4e1da into elastic:master Mar 16, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants