Merge branch 'develop'

davedittrich · Dec 13, 2024 · 3be97b3 · 3be97b3
2 parents b568fd0 + 2edc4d9
commit 3be97b3
Show file tree

Hide file tree

Showing 104 changed files with 4,580 additions and 967 deletions.
diff --git a/.ansible-lint b/.ansible-lint
@@ -1,14 +1,7 @@
 ---
+# .ansible-lint
+# See https://ansible.readthedocs.io/projects/lint/configuring/
 
-parseable: true
-quiet: false
-skip_list:
-  - ANSIBLE0010
-  - command-instead-of-module
-  - no-handler
-  - experimental  # all rules tagged as experimental
-  - template-instead-of-copy
-use_default_rules: true
 exclude_paths:
   - __pycache__
   - .github
@@ -20,5 +13,16 @@ exclude_paths:
 # - molecule/*/prepare.yml
   - molecule/shared/prepare.yml  # No idea why this is failing.
   - roles/*/meta/main.yml
-# - playbooks/*.yml
-# - tasks/*.yml
+  - playbooks/*.yml
+  - tasks/*.yml
+parseable: true
+profile: null # min,basic,moderate,safety,shared,production
+quiet: false
+skip_list:
+  - ANSIBLE0010
+  - command-instead-of-module
+  - no-handler
+  - experimental  # all rules tagged as experimental
+  - template-instead-of-copy
+use_default_rules: true
+verbosity: 4
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.0-rc.105
+current_version = 0.7.0-rc.109
 commit = False
 tag = False
 parse = 

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,11 @@
+---
+
+custom:
+  - https://davedittrich.github.io
+  - https://dave-dittrich.medium.com
+  - https://www.paypal.me/davedittrich
+
+github:
+  - davedittrich
+
+...
diff --git a/.github/workflows/branding.yml b/.github/workflows/branding.yml
@@ -23,25 +23,20 @@ jobs:
       fail-fast: true
       matrix:
         molecule_distro:
-          # - { "distro":"centos7", "command":"/usr/sbin/init" }
-          # - { "distro":"centos8", "command":"/usr/sbin/init" }
-          # - { "distro":"fedora33", "command":"/usr/sbin/init" }
-          # - { "distro":"fedora34", "command":"/usr/sbin/init" }
-          # - { "distro":"ubuntu1804", "command":"/lib/systemd/systemd" }
           - { "distro":"ubuntu2004", "command":"/lib/systemd/systemd" }
-          # - { "distro":"ubuntu2204", "command":"/lib/systemd/systemd" }
-          # - { "distro":"debian9", "command":"/lib/systemd/systemd" }
-          - { "distro":"debian10", "command":"/lib/systemd/systemd" }
+          - { "distro":"ubuntu2204", "command":"/lib/systemd/systemd" }
+          - { "distro":"debian11", "command":"/lib/systemd/systemd" }
+          - { "distro":"debian12", "command":"/lib/systemd/systemd" }
         collection_role:
           - branding
     steps:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11.10
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.11.10
           check-latest: true
 
       - run: python --version
@@ -51,8 +46,7 @@ jobs:
           sudo apt install apt-transport-https ca-certificates curl software-properties-common
           curl -fsSL https://get.docker.com -o get-docker.sh
           sudo sh get-docker.sh
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements.txt
+          make install-poetry update-packages
 
       - name: Build the collection
         run: |

diff --git a/.github/workflows/dropins.yml b/.github/workflows/dropins.yml
@@ -23,25 +23,20 @@ jobs:
       fail-fast: true
       matrix:
         molecule_distro:
-          # - { "distro":"centos7", "command":"/usr/sbin/init" }
-          # - { "distro":"centos8", "command":"/usr/sbin/init" }
-          # - { "distro":"fedora33", "command":"/usr/sbin/init" }
-          # - { "distro":"fedora34", "command":"/usr/sbin/init" }
-          # - { "distro":"ubuntu1804", "command":"/lib/systemd/systemd" }
           - { "distro":"ubuntu2004", "command":"/lib/systemd/systemd" }
-          # - { "distro":"ubuntu2204", "command":"/lib/systemd/systemd" }
-          # - { "distro":"debian9", "command":"/lib/systemd/systemd" }
-          - { "distro":"debian10", "command":"/lib/systemd/systemd" }
+          - { "distro":"ubuntu2204", "command":"/lib/systemd/systemd" }
+          - { "distro":"debian11", "command":"/lib/systemd/systemd" }
+          - { "distro":"debian12", "command":"/lib/systemd/systemd" }
         collection_role:
           - dropins
     steps:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11.10
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.11.10
           check-latest: true
 
       - run: python --version
@@ -51,8 +46,7 @@ jobs:
           sudo apt install apt-transport-https ca-certificates curl software-properties-common
           curl -fsSL https://get.docker.com -o get-docker.sh
           sudo sh get-docker.sh
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements.txt
+          make install-poetry update-packages
 
       - name: Build the collection
         run: |

diff --git a/.github/workflows/ip_in_issue.yml b/.github/workflows/ip_in_issue.yml
@@ -23,25 +23,20 @@ jobs:
       fail-fast: true
       matrix:
         molecule_distro:
-          # - { "distro":"centos7", "command":"/usr/sbin/init" }
-          # - { "distro":"centos8", "command":"/usr/sbin/init" }
-          # - { "distro":"fedora33", "command":"/usr/sbin/init" }
-          # - { "distro":"fedora34", "command":"/usr/sbin/init" }
-          # - { "distro":"ubuntu1804", "command":"/lib/systemd/systemd" }
           - { "distro":"ubuntu2004", "command":"/lib/systemd/systemd" }
-          # - { "distro":"ubuntu2204", "command":"/lib/systemd/systemd" }
-          # - { "distro":"debian9", "command":"/lib/systemd/systemd" }
-          - { "distro":"debian10", "command":"/lib/systemd/systemd" }
+          - { "distro":"ubuntu2204", "command":"/lib/systemd/systemd" }
+          - { "distro":"debian11", "command":"/lib/systemd/systemd" }
+          - { "distro":"debian12", "command":"/lib/systemd/systemd" }
         collection_role:
           - ip_in_issue
     steps:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11.10
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.11.10
           check-latest: true
 
       - run: python --version
@@ -51,8 +46,7 @@ jobs:
           sudo apt install apt-transport-https ca-certificates curl software-properties-common
           curl -fsSL https://get.docker.com -o get-docker.sh
           sudo sh get-docker.sh
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements.txt
+          make install-poetry update-packages
 
       - name: Build the collection
         run: |

diff --git a/.github/workflows/kali_like.yml b/.github/workflows/kali_like.yml
@@ -23,25 +23,20 @@ jobs:
       fail-fast: true
       matrix:
         molecule_distro:
-          # - { "distro":"centos7", "command":"/usr/sbin/init" }
-          # - { "distro":"centos8", "command":"/usr/sbin/init" }
-          # - { "distro":"fedora33", "command":"/usr/sbin/init" }
-          # - { "distro":"fedora34", "command":"/usr/sbin/init" }
-          # - { "distro":"ubuntu1804", "command":"/lib/systemd/systemd" }
           - { "distro":"ubuntu2004", "command":"/lib/systemd/systemd" }
-          # - { "distro":"ubuntu2204", "command":"/lib/systemd/systemd" }
-          # - { "distro":"debian9", "command":"/lib/systemd/systemd" }
-          - { "distro":"debian10", "command":"/lib/systemd/systemd" }
+          - { "distro":"ubuntu2204", "command":"/lib/systemd/systemd" }
+          - { "distro":"debian11", "command":"/lib/systemd/systemd" }
+          - { "distro":"debian12", "command":"/lib/systemd/systemd" }
         collection_role:
           - kali_like
     steps:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11.10
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.11.10
           check-latest: true
 
       - run: python --version
@@ -51,8 +46,7 @@ jobs:
           sudo apt install apt-transport-https ca-certificates curl software-properties-common
           curl -fsSL https://get.docker.com -o get-docker.sh
           sudo sh get-docker.sh
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements.txt
+          make install-poetry update-packages
 
       - name: Build the collection
         run: |

diff --git a/.github/workflows/kdmt.yml b/.github/workflows/kdmt.yml
@@ -23,25 +23,20 @@ jobs:
       fail-fast: true
       matrix:
         molecule_distro:
-          # - { "distro":"centos7", "command":"/usr/sbin/init" }
-          # - { "distro":"centos8", "command":"/usr/sbin/init" }
-          # - { "distro":"fedora33", "command":"/usr/sbin/init" }
-          # - { "distro":"fedora34", "command":"/usr/sbin/init" }
-          # - { "distro":"ubuntu1804", "command":"/lib/systemd/systemd" }
           - { "distro":"ubuntu2004", "command":"/lib/systemd/systemd" }
-          # - { "distro":"ubuntu2204", "command":"/lib/systemd/systemd" }
-          # - { "distro":"debian9", "command":"/lib/systemd/systemd" }
-          - { "distro":"debian10", "command":"/lib/systemd/systemd" }
+          - { "distro":"ubuntu2204", "command":"/lib/systemd/systemd" }
+          - { "distro":"debian11", "command":"/lib/systemd/systemd" }
+          - { "distro":"debian12", "command":"/lib/systemd/systemd" }
         collection_role:
           - kdmt
     steps:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11.10
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.11.10
           check-latest: true
 
       - run: python --version
@@ -51,8 +46,7 @@ jobs:
           sudo apt install apt-transport-https ca-certificates curl software-properties-common
           curl -fsSL https://get.docker.com -o get-docker.sh
           sudo sh get-docker.sh
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements.txt
+          make install-poetry update-packages
 
       - name: Build the collection
         run: |

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ on:
       python-version:
         description: Python version to use.
         type: string
-        default: '3.9'
+        default: '3.11.10'
     secrets:
       ansible_galaxy_api_key:
         required: true
@@ -33,8 +33,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements.txt
+          make install-poetry update-packages
 
       - name: Run the Ansible Galaxy release playbook
         env:

diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
@@ -17,10 +17,17 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.9
+      - name: Determine Python versions available.
+        run: |
+          echo "Available Python versions"
+          echo "----"
+          cd /opt/hostedtoolcache/Python && ls
+          echo "----"
+
+      - name: Set up Python 3.11.10
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.11.10"
           check-latest: true
 
       - run: python --version
@@ -39,13 +46,11 @@ jobs:
           echo 'See: https://docs.github.com/en/actions/learn-github-actions/contexts#example-usage-of-the-github-context'
 
       - name: Install dependencies
+        env:
+          DEB_PYTHON_INSTALL_LAYOUT: deb_system pip install .
         run: |
           python3 -m pip install --upgrade pip
-          echo "Contents of requirements.txt"
-          echo "----"
-          cat requirements.txt
-          echo "----"
-          python3 -m pip install -r requirements.txt
+          make install-poetry update-packages
 
       - name: Move project to Ansible-required location
         run: |
@@ -62,7 +67,7 @@ jobs:
     uses: davedittrich/utils/.github/workflows/publish.yml@develop
     with:
       runs-on: ubuntu-latest
-      python-version: 3.9
+      python-version: "3.11.10"
       ansible_galaxy_server: https://galaxy-dev.ansible.com/
     secrets:
       ansible_galaxy_api_key: ${{secrets.GALAXYDEV_API_KEY}}
@@ -73,7 +78,7 @@ jobs:
     uses: davedittrich/utils/.github/workflows/publish.yml@develop
     with:
       runs-on: ubuntu-latest
-      python-version: 3.9
+      python-version: "3.11.10"
       ansible_galaxy_server: https://galaxy.ansible.com/
     secrets:
       ansible_galaxy_api_key: ${{secrets.GALAXY_API_KEY}}

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,13 +1,14 @@
 {
+  "ansible.python.interpreterPath": "/usr/local/Caskroom/miniconda/base/envs/utils/bin/python3",
   "python.linting.enabled": true,
   "python.linting.lintOnSave": true,
-  "python.defaultInterpreterPath": "${env:CONDA_PREFIX}/bin/python3",
+  "python.pythonPath": "/usr/local/Caskroom/miniconda/base/envs/utils/bin/python3",
   "python.terminal.activateEnvironment": true,
   "python.testing.autoTestDiscoverOnSaveEnabled": true,
   "python.testing.cwd": "${workspaceFolder}/molecule/shared",
   "python.testing.pytestArgs": ["-ra"],
   "python.testing.pytestEnabled": true,
-  "python.testing.pytestPath": "${env:CONDA_PREFIX}/bin/pytest",
+  "python.testing.pytestPath": "${env:CONDA_PREFIX}/utils/bin/pytest",
   "python.testing.unittestEnabled": false,
-  "python.venvPath": "${env:CONDA_PREFIX}/.."
+  "python.venvPath": "${env:CONDA_PREFIX}/utils"
 }
diff --git a/.yamllint b/.yamllint
@@ -15,7 +15,8 @@ rules:
   commas:
     max-spaces-after: -1
     level: error
-  comments: disable
+  comments:
+    min-spaces-from-content: 1
   comments-indentation: disable
   document-start: disable
   empty-lines:
@@ -29,5 +30,10 @@ rules:
   new-line-at-end-of-file: disable
   new-lines:
     type: unix
+  # The following 'forbid-*' rules may not mean what you think they mean.
+  # See: https://yamllint.readthedocs.io/en/stable/rules.html#module-yamllint.rules.octal_values
+  octal-values:
+    forbid-explicit-octal: true
+    forbid-implicit-octal: true
   trailing-spaces: disable
   truthy: disable