Skip to content

Commit

Permalink
onepassword_ssh_key: avoid inheriting from OnePassCLIv2 (ansible-coll…
Browse files Browse the repository at this point in the history
…ections#9633)

* Avoid inheriting from OnePassCLIv2.

* Add changelog fragment.
  • Loading branch information
felixfontein authored Jan 27, 2025
1 parent 73b9756 commit 8749da7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/9633-onepassword_ssh_key.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- "onepassword_ssh_key - refactor to move code to lookup class (https://github.com/ansible-collections/community.general/pull/9633)."
13 changes: 4 additions & 9 deletions plugins/lookup/onepassword_ssh_key.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,8 @@
from ansible.plugins.lookup import LookupBase


class OnePassCLIv2SSHKey(OnePassCLIv2):

def get_ssh_key(self, item_id, vault=None, token=None, ssh_format=False):
rc, out, err = self.get_raw(item_id, vault=vault, token=token)

class LookupModule(LookupBase):
def get_ssh_key(self, out, item_id, ssh_format=False):
data = json.loads(out)

if data.get("category") != "SSH_KEY":
Expand All @@ -87,8 +84,6 @@ def get_ssh_key(self, item_id, vault=None, token=None, ssh_format=False):
)
return private_key_field.get("value", "")


class LookupModule(LookupBase):
def run(self, terms, variables=None, **kwargs):
self.set_options(var_options=variables, direct=kwargs)

Expand All @@ -114,11 +109,11 @@ def run(self, terms, variables=None, **kwargs):
account_id=account_id,
connect_host=connect_host,
connect_token=connect_token,
cli_class=OnePassCLIv2SSHKey,
cli_class=OnePassCLIv2,
)
op.assert_logged_in()

return [
op._cli.get_ssh_key(term, vault, token=op.token, ssh_format=ssh_format)
self.get_ssh_key(op.get_raw(term, vault), term, ssh_format=ssh_format)
for term in terms
]

0 comments on commit 8749da7

Please sign in to comment.