From 5a8be7bb094b534f7e42c92ca2a3e599f4db64bd Mon Sep 17 00:00:00 2001 From: "Mark J. Horninger" Date: Thu, 15 Feb 2024 13:10:13 -0500 Subject: [PATCH] Reorganized the project --- dominion_solutions/netbird/README.md => README.md | 0 dominion_solutions/netbird/galaxy.yml => galaxy.yml | 0 {dominion_solutions/netbird/meta => meta}/runtime.yml | 2 +- .../netbird/plugins => plugins}/README.md | 0 .../netbird/plugins => plugins}/inventory/netbird.py | 10 ++++++++-- requirements.txt | 4 ++-- .../netbird/roles => roles}/netbird/README.md | 0 .../netbird/roles => roles}/netbird/defaults/main.yml | 0 .../netbird/roles => roles}/netbird/handlers/main.yml | 0 .../netbird/roles => roles}/netbird/meta/main.yml | 0 .../netbird/roles => roles}/netbird/tasks/main.yml | 0 .../netbird/roles => roles}/netbird/tests/inventory | 0 .../netbird/roles => roles}/netbird/tests/test.yml | 0 .../netbird/roles => roles}/netbird/vars/main.yml | 0 .../unit/plugins/inventory/test_netbird.py | 2 +- .../netbird/tests => tests}/unit/requirements.txt | 0 16 files changed, 12 insertions(+), 6 deletions(-) rename dominion_solutions/netbird/README.md => README.md (100%) rename dominion_solutions/netbird/galaxy.yml => galaxy.yml (100%) rename {dominion_solutions/netbird/meta => meta}/runtime.yml (97%) rename {dominion_solutions/netbird/plugins => plugins}/README.md (100%) rename {dominion_solutions/netbird/plugins => plugins}/inventory/netbird.py (92%) rename {dominion_solutions/netbird/roles => roles}/netbird/README.md (100%) rename {dominion_solutions/netbird/roles => roles}/netbird/defaults/main.yml (100%) rename {dominion_solutions/netbird/roles => roles}/netbird/handlers/main.yml (100%) rename {dominion_solutions/netbird/roles => roles}/netbird/meta/main.yml (100%) rename {dominion_solutions/netbird/roles => roles}/netbird/tasks/main.yml (100%) rename {dominion_solutions/netbird/roles => roles}/netbird/tests/inventory (100%) rename {dominion_solutions/netbird/roles => roles}/netbird/tests/test.yml (100%) rename {dominion_solutions/netbird/roles => roles}/netbird/vars/main.yml (100%) rename {dominion_solutions/netbird/tests => tests}/unit/plugins/inventory/test_netbird.py (96%) rename {dominion_solutions/netbird/tests => tests}/unit/requirements.txt (100%) diff --git a/dominion_solutions/netbird/README.md b/README.md similarity index 100% rename from dominion_solutions/netbird/README.md rename to README.md diff --git a/dominion_solutions/netbird/galaxy.yml b/galaxy.yml similarity index 100% rename from dominion_solutions/netbird/galaxy.yml rename to galaxy.yml diff --git a/dominion_solutions/netbird/meta/runtime.yml b/meta/runtime.yml similarity index 97% rename from dominion_solutions/netbird/meta/runtime.yml rename to meta/runtime.yml index ae61395..d0f5b38 100644 --- a/dominion_solutions/netbird/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,7 +1,7 @@ --- # Collections must specify a minimum required ansible version to upload # to galaxy -requires_ansible: '>=9.2.0' +requires_ansible: '>=2.16.0' # Content that Ansible needs to load from another location or that has # been deprecated/removed diff --git a/dominion_solutions/netbird/plugins/README.md b/plugins/README.md similarity index 100% rename from dominion_solutions/netbird/plugins/README.md rename to plugins/README.md diff --git a/dominion_solutions/netbird/plugins/inventory/netbird.py b/plugins/inventory/netbird.py similarity index 92% rename from dominion_solutions/netbird/plugins/inventory/netbird.py rename to plugins/inventory/netbird.py index 5d1ddec..f5db27c 100644 --- a/dominion_solutions/netbird/plugins/inventory/netbird.py +++ b/plugins/inventory/netbird.py @@ -1,10 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright: (c) 2024, Dominion Solutions LLC (https://dominion.solutions) +# This code is licensed under the MIT License (see LICENSE or https://spdx.org/licenses/MIT.html) + +# This code uses code that is licensed under the GPL-V3 License as well +# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt) + from __future__ import (absolute_import, division, print_function) __metaclass__ = type DOCUMENTATION = r""" name: netbird - author: - - Mark Horninger (@dominion.soltuions@mstdn.business) + author: Mark J. Horninger (@spam-n-eggs) version_added: "0.0.2" requirements: - requests>=2.31.0 diff --git a/requirements.txt b/requirements.txt index 3527136..98dac08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -ansible==9.2.0 -ansible-core==2.16.3 +ansible>=9.2.0 +ansible-core>=2.16.3 cffi==1.16.0 cryptography==42.0.2 Jinja2==3.1.3 diff --git a/dominion_solutions/netbird/roles/netbird/README.md b/roles/netbird/README.md similarity index 100% rename from dominion_solutions/netbird/roles/netbird/README.md rename to roles/netbird/README.md diff --git a/dominion_solutions/netbird/roles/netbird/defaults/main.yml b/roles/netbird/defaults/main.yml similarity index 100% rename from dominion_solutions/netbird/roles/netbird/defaults/main.yml rename to roles/netbird/defaults/main.yml diff --git a/dominion_solutions/netbird/roles/netbird/handlers/main.yml b/roles/netbird/handlers/main.yml similarity index 100% rename from dominion_solutions/netbird/roles/netbird/handlers/main.yml rename to roles/netbird/handlers/main.yml diff --git a/dominion_solutions/netbird/roles/netbird/meta/main.yml b/roles/netbird/meta/main.yml similarity index 100% rename from dominion_solutions/netbird/roles/netbird/meta/main.yml rename to roles/netbird/meta/main.yml diff --git a/dominion_solutions/netbird/roles/netbird/tasks/main.yml b/roles/netbird/tasks/main.yml similarity index 100% rename from dominion_solutions/netbird/roles/netbird/tasks/main.yml rename to roles/netbird/tasks/main.yml diff --git a/dominion_solutions/netbird/roles/netbird/tests/inventory b/roles/netbird/tests/inventory similarity index 100% rename from dominion_solutions/netbird/roles/netbird/tests/inventory rename to roles/netbird/tests/inventory diff --git a/dominion_solutions/netbird/roles/netbird/tests/test.yml b/roles/netbird/tests/test.yml similarity index 100% rename from dominion_solutions/netbird/roles/netbird/tests/test.yml rename to roles/netbird/tests/test.yml diff --git a/dominion_solutions/netbird/roles/netbird/vars/main.yml b/roles/netbird/vars/main.yml similarity index 100% rename from dominion_solutions/netbird/roles/netbird/vars/main.yml rename to roles/netbird/vars/main.yml diff --git a/dominion_solutions/netbird/tests/unit/plugins/inventory/test_netbird.py b/tests/unit/plugins/inventory/test_netbird.py similarity index 96% rename from dominion_solutions/netbird/tests/unit/plugins/inventory/test_netbird.py rename to tests/unit/plugins/inventory/test_netbird.py index c2243d4..3bc96ee 100644 --- a/dominion_solutions/netbird/tests/unit/plugins/inventory/test_netbird.py +++ b/tests/unit/plugins/inventory/test_netbird.py @@ -25,7 +25,7 @@ def inventory(): def test_missing_access_token_lookup(inventory): loader = DataLoader() - inventory._options = {'access_token': None} + inventory._options = {'api_key': None} with pytest.raises(AnsibleError) as error_message: inventory._build_client(loader) assert 'Could not retrieve Netbird access token' in error_message diff --git a/dominion_solutions/netbird/tests/unit/requirements.txt b/tests/unit/requirements.txt similarity index 100% rename from dominion_solutions/netbird/tests/unit/requirements.txt rename to tests/unit/requirements.txt