From 94ea18f1cb862ee9bd9eda3635a29861f5f28c6c Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 18:26:03 +0200 Subject: [PATCH] =?UTF-8?q?bitwarden:=20Add=20field=20to=20search=20for=20?= =?UTF-8?q?all=20item=20attributes,=20instead=20of=20on=E2=80=A6=20(#5297)?= =?UTF-8?q?=20(#5325)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * bitwarden: Add field to search for all item attributes, instead of only name. * bitwarden: Add change to changelog. * bitwarden: Update changelog entry. * Update changelogs/fragments/5297-bitwarden-add-search-field.yml Co-authored-by: Felix Fontein * Update plugins/lookup/bitwarden.py Co-authored-by: Felix Fontein * Update plugins/lookup/bitwarden.py Co-authored-by: Felix Fontein Co-authored-by: Ole Pannbacker Co-authored-by: Felix Fontein (cherry picked from commit 394647df84dd50e6893fc63249e8b01ce67863eb) Co-authored-by: betuxy <72452886+betuxy@users.noreply.github.com> --- .../5297-bitwarden-add-search-field.yml | 2 ++ plugins/lookup/bitwarden.py | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/5297-bitwarden-add-search-field.yml diff --git a/changelogs/fragments/5297-bitwarden-add-search-field.yml b/changelogs/fragments/5297-bitwarden-add-search-field.yml new file mode 100644 index 0000000000..9b5d147b02 --- /dev/null +++ b/changelogs/fragments/5297-bitwarden-add-search-field.yml @@ -0,0 +1,2 @@ +minor_changes: + - bitwarden lookup plugin - add option ``search`` to search for other attributes than name (https://github.com/ansible-collections/community.general/pull/5297). diff --git a/plugins/lookup/bitwarden.py b/plugins/lookup/bitwarden.py index 124c139c78..1cc2e44c74 100644 --- a/plugins/lookup/bitwarden.py +++ b/plugins/lookup/bitwarden.py @@ -22,6 +22,11 @@ DOCUMENTATION = """ required: true type: list elements: str + search: + description: Field to retrieve, for example C(name) or C(id). + type: str + default: name + version_added: 5.7.0 field: description: Field to fetch; leave unset to fetch whole response. type: str @@ -33,6 +38,11 @@ EXAMPLES = """ msg: >- {{ lookup('community.general.bitwarden', 'a_test', field='password') }} +- name: "Get 'password' from Bitwarden record with id 'bafba515-af11-47e6-abe3-af1200cd18b2'" + ansible.builtin.debug: + msg: >- + {{ lookup('community.general.bitwarden', 'bafba515-af11-47e6-abe3-af1200cd18b2', search='id', field='password') }} + - name: "Get full Bitwarden record named 'a_test'" ansible.builtin.debug: msg: >- @@ -81,7 +91,7 @@ class Bitwarden(object): raise BitwardenException(err) return to_text(out, errors='surrogate_or_strict'), to_text(err, errors='surrogate_or_strict') - def _get_matches(self, search_value, search_field="name"): + def _get_matches(self, search_value, search_field): """Return matching records whose search_field is equal to key. """ out, err = self._run(['list', 'items', '--search', search_value]) @@ -97,7 +107,7 @@ class Bitwarden(object): If field is None, return the whole record for each match. """ - matches = self._get_matches(search_value) + matches = self._get_matches(search_value, search_field) if field: return [match['login'][field] for match in matches] @@ -110,10 +120,11 @@ class LookupModule(LookupBase): def run(self, terms, variables=None, **kwargs): self.set_options(var_options=variables, direct=kwargs) field = self.get_option('field') + search_field = self.get_option('search') if not _bitwarden.logged_in: raise AnsibleError("Not logged into Bitwarden. Run 'bw login'.") - return [_bitwarden.get_field(field, term) for term in terms] + return [_bitwarden.get_field(field, term, search_field) for term in terms] _bitwarden = Bitwarden()