{"action":"created","comment":{"url":"https://api.github.com/repos/saltstack/salt/pulls/comments/185102888","pull_request_review_id":116428501,"id":185102888,"diff_hunk":"@@ -68,11 +88,12 @@ def __virtual__():\n \n def ext_pillar(minion_id,  # pylint: disable=W0613\n                pillar,  # pylint: disable=W0613\n-               conf):","path":"salt/pillar/vault.py","position":38,"original_position":38,"commit_id":"a77f3982798024236bb55c002f7c342546a907e4","original_commit_id":"4087f34de9e2415028fc26d9c278d0ab0a44aa7e","user":{"login":"ccoughle","id":17281294,"avatar_url":"https://avatars2.githubusercontent.com/u/17281294?v=4","gravatar_id":"","url":"https://api.github.com/users/ccoughle","html_url":"https://github.com/ccoughle","followers_url":"https://api.github.com/users/ccoughle/followers","following_url":"https://api.github.com/users/ccoughle/following{/other_user}","gists_url":"https://api.github.com/users/ccoughle/gists{/gist_id}","starred_url":"https://api.github.com/users/ccoughle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ccoughle/subscriptions","organizations_url":"https://api.github.com/users/ccoughle/orgs","repos_url":"https://api.github.com/users/ccoughle/repos","events_url":"https://api.github.com/users/ccoughle/events{/privacy}","received_events_url":"https://api.github.com/users/ccoughle/received_events","type":"User","site_admin":false},"body":"Hello, \r\n\r\nI went ahead and switched it back to \"conf\"  \r\n\r\nIt shouldn't have broken anyone's confs unless they were using an explicit call to the \"conf\" tag in their files.  The default structure for the external pillar config in the documentation for this wasn't set up for multiple arguments to the vault external pillar.  So, the documentation just followed the following format:  \r\n- vault: path=secret/salt\r\nno mention of the arguments.  Keeping the master configs in this same format wouldn't change anything and things would continue to function.  It would only be a problem if someone had changed their master configs to look like: \r\n- vault: \r\n    conf: path=secret/salt\r\n\r\nHowever, you are right in that it would really be annoying for someone if they had gone through followed that secondary format (for consistency of confs or whatever other reason) and have it break here.  \r\nIt was meant as a nicety for clarity, but you are right that it isn't likely worth the effort. ","created_at":"2018-04-30T20:37:35Z","updated_at":"2018-04-30T20:37:35Z","html_url":"https://github.com/saltstack/salt/pull/47409#discussion_r185102888","pull_request_url":"https://api.github.com/repos/saltstack/salt/pulls/47409","author_association":"NONE","_links":{"self":{"href":"https://api.github.com/repos/saltstack/salt/pulls/comments/185102888"},"html":{"href":"https://github.com/saltstack/salt/pull/47409#discussion_r185102888"},"pull_request":{"href":"https://api.github.com/repos/saltstack/salt/pulls/47409"}},"in_reply_to_id":185096890},"pull_request":{"url":"https://api.github.com/repos/saltstack/salt/pulls/47409","id":185051507,"html_url":"https://github.com/saltstack/salt/pull/47409","diff_url":"https://github.com/saltstack/salt/pull/47409.diff","patch_url":"https://github.com/saltstack/salt/pull/47409.patch","issue_url":"https://api.github.com/repos/saltstack/salt/issues/47409","number":47409,"state":"open","locked":false,"title":"Update vault.py","user":{"login":"ccoughle","id":17281294,"avatar_url":"https://avatars2.githubusercontent.com/u/17281294?v=4","gravatar_id":"","url":"https://api.github.com/users/ccoughle","html_url":"https://github.com/ccoughle","followers_url":"https://api.github.com/users/ccoughle/followers","following_url":"https://api.github.com/users/ccoughle/following{/other_user}","gists_url":"https://api.github.com/users/ccoughle/gists{/gist_id}","starred_url":"https://api.github.com/users/ccoughle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ccoughle/subscriptions","organizations_url":"https://api.github.com/users/ccoughle/orgs","repos_url":"https://api.github.com/users/ccoughle/repos","events_url":"https://api.github.com/users/ccoughle/events{/privacy}","received_events_url":"https://api.github.com/users/ccoughle/received_events","type":"User","site_admin":false},"body":"These changes would allow for each vault source specified to be nested under a keyname in the pillar return. Also, if duplicate keynames are present they get merged. Lastly, it shouldn't affect existing configs, as the old config file format continues to work when no nesting_key is specified.  \"conf\" was also changed to \"secret_path\" to be more descriptive in the ext_pillar definition so that the configuration file is easier to read.  Documentation in file updated to reflect this name change.\r\n\r\n### What does this PR do?\r\n\r\nIt Allows nesting of vault pillar data returns as discussed in:  \r\nhttps://github.com/saltstack/salt/issues/47336\r\n\r\n\r\n\r\n### What issues does this PR fix or reference?\r\n\r\n### Previous Behavior\r\n\r\nNo way to nest return under a keyname\r\n\r\n### New Behavior\r\n\r\nAllows nesting under keyname.  Should have no impact on current configs as the old format will continue to function when no keyname value given\r\n\r\n### Tests written?\r\n\r\nYes/No\r\n\r\n### Commits signed with GPG?\r\n\r\nYes/No\r\n\r\nPlease review [Salt's Contributing Guide](https://docs.saltstack.com/en/latest/topics/development/contributing.html) for best practices.\r\n\r\nSee GitHub's [page on GPG signing](https://help.github.com/articles/signing-commits-using-gpg/) for more information about signing commits with GPG.\r\n","created_at":"2018-04-30T20:09:23Z","updated_at":"2018-04-30T20:37:35Z","closed_at":null,"merged_at":null,"merge_commit_sha":"62c584c81485a7372decd1a6debf8965ef9dc2c0","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/saltstack/salt/pulls/47409/commits","review_comments_url":"https://api.github.com/repos/saltstack/salt/pulls/47409/comments","review_comment_url":"https://api.github.com/repos/saltstack/salt/pulls/comments{/number}","comments_url":"https://api.github.com/repos/saltstack/salt/issues/47409/comments","statuses_url":"https://api.github.com/repos/saltstack/salt/statuses/a77f3982798024236bb55c002f7c342546a907e4","head":{"label":"ccoughle:develop","ref":"develop","sha":"a77f3982798024236bb55c002f7c342546a907e4","user":{"login":"ccoughle","id":17281294,"avatar_url":"https://avatars2.githubusercontent.com/u/17281294?v=4","gravatar_id":"","url":"https://api.github.com/users/ccoughle","html_url":"https://github.com/ccoughle","followers_url":"https://api.github.com/users/ccoughle/followers","following_url":"https://api.github.com/users/ccoughle/following{/other_user}","gists_url":"https://api.github.com/users/ccoughle/gists{/gist_id}","starred_url":"https://api.github.com/users/ccoughle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ccoughle/subscriptions","organizations_url":"https://api.github.com/users/ccoughle/orgs","repos_url":"https://api.github.com/users/ccoughle/repos","events_url":"https://api.github.com/users/ccoughle/events{/privacy}","received_events_url":"https://api.github.com/users/ccoughle/received_events","type":"User","site_admin":false},"repo":{"id":131638318,"name":"salt","full_name":"ccoughle/salt","owner":{"login":"ccoughle","id":17281294,"avatar_url":"https://avatars2.githubusercontent.com/u/17281294?v=4","gravatar_id":"","url":"https://api.github.com/users/ccoughle","html_url":"https://github.com/ccoughle","followers_url":"https://api.github.com/users/ccoughle/followers","following_url":"https://api.github.com/users/ccoughle/following{/other_user}","gists_url":"https://api.github.com/users/ccoughle/gists{/gist_id}","starred_url":"https://api.github.com/users/ccoughle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ccoughle/subscriptions","organizations_url":"https://api.github.com/users/ccoughle/orgs","repos_url":"https://api.github.com/users/ccoughle/repos","events_url":"https://api.github.com/users/ccoughle/events{/privacy}","received_events_url":"https://api.github.com/users/ccoughle/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/ccoughle/salt","description":"Software to automate the management and configuration of any infrastructure or application at scale. Get access to the Salt software package repository here: ","fork":true,"url":"https://api.github.com/repos/ccoughle/salt","forks_url":"https://api.github.com/repos/ccoughle/salt/forks","keys_url":"https://api.github.com/repos/ccoughle/salt/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ccoughle/salt/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ccoughle/salt/teams","hooks_url":"https://api.github.com/repos/ccoughle/salt/hooks","issue_events_url":"https://api.github.com/repos/ccoughle/salt/issues/events{/number}","events_url":"https://api.github.com/repos/ccoughle/salt/events","assignees_url":"https://api.github.com/repos/ccoughle/salt/assignees{/user}","branches_url":"https://api.github.com/repos/ccoughle/salt/branches{/branch}","tags_url":"https://api.github.com/repos/ccoughle/salt/tags","blobs_url":"https://api.github.com/repos/ccoughle/salt/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ccoughle/salt/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ccoughle/salt/git/refs{/sha}","trees_url":"https://api.github.com/repos/ccoughle/salt/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ccoughle/salt/statuses/{sha}","languages_url":"https://api.github.com/repos/ccoughle/salt/languages","stargazers_url":"https://api.github.com/repos/ccoughle/salt/stargazers","contributors_url":"https://api.github.com/repos/ccoughle/salt/contributors","subscribers_url":"https://api.github.com/repos/ccoughle/salt/subscribers","subscription_url":"https://api.github.com/repos/ccoughle/salt/subscription","commits_url":"https://api.github.com/repos/ccoughle/salt/commits{/sha}","git_commits_url":"https://api.github.com/repos/ccoughle/salt/git/commits{/sha}","comments_url":"https://api.github.com/repos/ccoughle/salt/comments{/number}","issue_comment_url":"https://api.github.com/repos/ccoughle/salt/issues/comments{/number}","contents_url":"https://api.github.com/repos/ccoughle/salt/contents/{+path}","compare_url":"https://api.github.com/repos/ccoughle/salt/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ccoughle/salt/merges","archive_url":"https://api.github.com/repos/ccoughle/salt/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ccoughle/salt/downloads","issues_url":"https://api.github.com/repos/ccoughle/salt/issues{/number}","pulls_url":"https://api.github.com/repos/ccoughle/salt/pulls{/number}","milestones_url":"https://api.github.com/repos/ccoughle/salt/milestones{/number}","notifications_url":"https://api.github.com/repos/ccoughle/salt/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ccoughle/salt/labels{/name}","releases_url":"https://api.github.com/repos/ccoughle/salt/releases{/id}","deployments_url":"https://api.github.com/repos/ccoughle/salt/deployments","created_at":"2018-04-30T19:34:47Z","updated_at":"2018-04-30T20:28:19Z","pushed_at":"2018-04-30T20:28:11Z","git_url":"git://github.com/ccoughle/salt.git","ssh_url":"git@github.com:ccoughle/salt.git","clone_url":"https://github.com/ccoughle/salt.git","svn_url":"https://github.com/ccoughle/salt","homepage":"https://repo.saltstack.com/","size":218687,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"saltstack:develop","ref":"develop","sha":"31178e7baeaeaaa3fadc418b2389629474bbcfb3","user":{"login":"saltstack","id":1147473,"avatar_url":"https://avatars3.githubusercontent.com/u/1147473?v=4","gravatar_id":"","url":"https://api.github.com/users/saltstack","html_url":"https://github.com/saltstack","followers_url":"https://api.github.com/users/saltstack/followers","following_url":"https://api.github.com/users/saltstack/following{/other_user}","gists_url":"https://api.github.com/users/saltstack/gists{/gist_id}","starred_url":"https://api.github.com/users/saltstack/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/saltstack/subscriptions","organizations_url":"https://api.github.com/users/saltstack/orgs","repos_url":"https://api.github.com/users/saltstack/repos","events_url":"https://api.github.com/users/saltstack/events{/privacy}","received_events_url":"https://api.github.com/users/saltstack/received_events","type":"Organization","site_admin":false},"repo":{"id":1390248,"name":"salt","full_name":"saltstack/salt","owner":{"login":"saltstack","id":1147473,"avatar_url":"https://avatars3.githubusercontent.com/u/1147473?v=4","gravatar_id":"","url":"https://api.github.com/users/saltstack","html_url":"https://github.com/saltstack","followers_url":"https://api.github.com/users/saltstack/followers","following_url":"https://api.github.com/users/saltstack/following{/other_user}","gists_url":"https://api.github.com/users/saltstack/gists{/gist_id}","starred_url":"https://api.github.com/users/saltstack/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/saltstack/subscriptions","organizations_url":"https://api.github.com/users/saltstack/orgs","repos_url":"https://api.github.com/users/saltstack/repos","events_url":"https://api.github.com/users/saltstack/events{/privacy}","received_events_url":"https://api.github.com/users/saltstack/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/saltstack/salt","description":"Software to automate the management and configuration of any infrastructure or application at scale. Get access to the Salt software package repository here: ","fork":false,"url":"https://api.github.com/repos/saltstack/salt","forks_url":"https://api.github.com/repos/saltstack/salt/forks","keys_url":"https://api.github.com/repos/saltstack/salt/keys{/key_id}","collaborators_url":"https://api.github.com/repos/saltstack/salt/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/saltstack/salt/teams","hooks_url":"https://api.github.com/repos/saltstack/salt/hooks","issue_events_url":"https://api.github.com/repos/saltstack/salt/issues/events{/number}","events_url":"https://api.github.com/repos/saltstack/salt/events","assignees_url":"https://api.github.com/repos/saltstack/salt/assignees{/user}","branches_url":"https://api.github.com/repos/saltstack/salt/branches{/branch}","tags_url":"https://api.github.com/repos/saltstack/salt/tags","blobs_url":"https://api.github.com/repos/saltstack/salt/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/saltstack/salt/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/saltstack/salt/git/refs{/sha}","trees_url":"https://api.github.com/repos/saltstack/salt/git/trees{/sha}","statuses_url":"https://api.github.com/repos/saltstack/salt/statuses/{sha}","languages_url":"https://api.github.com/repos/saltstack/salt/languages","stargazers_url":"https://api.github.com/repos/saltstack/salt/stargazers","contributors_url":"https://api.github.com/repos/saltstack/salt/contributors","subscribers_url":"https://api.github.com/repos/saltstack/salt/subscribers","subscription_url":"https://api.github.com/repos/saltstack/salt/subscription","commits_url":"https://api.github.com/repos/saltstack/salt/commits{/sha}","git_commits_url":"https://api.github.com/repos/saltstack/salt/git/commits{/sha}","comments_url":"https://api.github.com/repos/saltstack/salt/comments{/number}","issue_comment_url":"https://api.github.com/repos/saltstack/salt/issues/comments{/number}","contents_url":"https://api.github.com/repos/saltstack/salt/contents/{+path}","compare_url":"https://api.github.com/repos/saltstack/salt/compare/{base}...{head}","merges_url":"https://api.github.com/repos/saltstack/salt/merges","archive_url":"https://api.github.com/repos/saltstack/salt/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/saltstack/salt/downloads","issues_url":"https://api.github.com/repos/saltstack/salt/issues{/number}","pulls_url":"https://api.github.com/repos/saltstack/salt/pulls{/number}","milestones_url":"https://api.github.com/repos/saltstack/salt/milestones{/number}","notifications_url":"https://api.github.com/repos/saltstack/salt/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/saltstack/salt/labels{/name}","releases_url":"https://api.github.com/repos/saltstack/salt/releases{/id}","deployments_url":"https://api.github.com/repos/saltstack/salt/deployments","created_at":"2011-02-20T20:16:56Z","updated_at":"2018-04-30T19:03:15Z","pushed_at":"2018-04-30T20:35:11Z","git_url":"git://github.com/saltstack/salt.git","ssh_url":"git@github.com:saltstack/salt.git","clone_url":"https://github.com/saltstack/salt.git","svn_url":"https://github.com/saltstack/salt","homepage":"https://repo.saltstack.com/","size":218687,"stargazers_count":8794,"watchers_count":8794,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":4129,"mirror_url":null,"archived":false,"open_issues_count":3445,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":4129,"open_issues":3445,"watchers":8794,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/saltstack/salt/pulls/47409"},"html":{"href":"https://github.com/saltstack/salt/pull/47409"},"issue":{"href":"https://api.github.com/repos/saltstack/salt/issues/47409"},"comments":{"href":"https://api.github.com/repos/saltstack/salt/issues/47409/comments"},"review_comments":{"href":"https://api.github.com/repos/saltstack/salt/pulls/47409/comments"},"review_comment":{"href":"https://api.github.com/repos/saltstack/salt/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/saltstack/salt/pulls/47409/commits"},"statuses":{"href":"https://api.github.com/repos/saltstack/salt/statuses/a77f3982798024236bb55c002f7c342546a907e4"}},"author_association":"NONE"}}
{"actor":{"display_login":"ccoughle"}}