Skip to content

Commit

Permalink
Fix some sanity (not yet) errors (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
felixfontein authored Sep 16, 2020
1 parent a344db0 commit bcc2cc4
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
19 changes: 10 additions & 9 deletions plugins/lookup/sops.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

from ansible.errors import AnsibleLookupError
from ansible.plugins.lookup import LookupBase
from ansible.module_utils._text import to_native
from ansible_collections.community.sops.plugins.module_utils.sops import Sops, SopsError

from ansible.utils.display import Display
display = Display()


DOCUMENTATION = """
lookup: sops
author: Edoardo Tenani (@endorama) <[email protected]>
Expand Down Expand Up @@ -67,8 +58,18 @@
RETURN = """
_raw:
description: decrypted file content
type: list
elements: str
"""

from ansible.errors import AnsibleLookupError
from ansible.plugins.lookup import LookupBase
from ansible.module_utils._text import to_native
from ansible_collections.community.sops.plugins.module_utils.sops import Sops, SopsError

from ansible.utils.display import Display
display = Display()


class LookupModule(LookupBase):

Expand Down
27 changes: 13 additions & 14 deletions plugins/vars/sops.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,8 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

import os
from ansible.errors import AnsibleParserError
from ansible.module_utils._text import to_bytes, to_native, to_text
from ansible.plugins.vars import BaseVarsPlugin
from ansible.inventory.host import Host
from ansible.inventory.group import Group
from ansible.utils.vars import combine_vars
from ansible_collections.community.sops.plugins.module_utils.sops import Sops, SopsError

from ansible.utils.display import Display
display = Display()


DOCUMENTATION = '''
vars: sops_vars
vars: sops
author: Edoardo Tenani (@endorama) <[email protected]>
short_description: Loading sops-encrypted vars files
description:
Expand All @@ -52,6 +39,18 @@
type: list
'''

import os
from ansible.errors import AnsibleParserError
from ansible.module_utils._text import to_bytes, to_native, to_text
from ansible.plugins.vars import BaseVarsPlugin
from ansible.inventory.host import Host
from ansible.inventory.group import Group
from ansible.utils.vars import combine_vars
from ansible_collections.community.sops.plugins.module_utils.sops import Sops, SopsError

from ansible.utils.display import Display
display = Display()


FOUND = {}
DECRYPTED = {}
Expand Down

0 comments on commit bcc2cc4

Please sign in to comment.