chore: update CI configuration (#15)

.github/workflows/build-and-release.yml

@@ -2,15 +2,14 @@ name: Build and release new version
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 env:
   NAMESPACE: community
   COLLECTION_NAME: upcloud
-  ANSIBLE_VERSION: stable-2.11
+  ANSIBLE_VERSION: stable-2.15
 
 jobs:
-
   units:
     runs-on: ubuntu-latest
     name: Build and release
@@ -22,7 +21,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.11
 
       - name: Install ansible-base (${{env.ANSIBLE_VERSION}})
         run: pip install https://github.com/ansible/ansible/archive/${{env.ANSIBLE_VERSION}}.tar.gz --disable-pip-version-check

.github/workflows/sanity-test.yml

@@ -1,24 +1,25 @@
 name: sanity
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
 env:
   NAMESPACE: community
   COLLECTION_NAME: upcloud
 
 jobs:
   sanity:
-    name: Sanity test (${{ matrix.ansible }})
+    name: Sanity test (${{ matrix.version.ansible }})
     strategy:
       matrix:
-        ansible:
-        - stable-2.9
-        - stable-2.10
-        - stable-2.11
-        - devel
+        version:
+          - { ansible: stable-2.13, python: "3.10" }
+          - { ansible: stable-2.14, python: "3.11" }
+          - { ansible: stable-2.15, python: "3.11" }
+          - { ansible: devel, python: "3.11" }
     runs-on: ubuntu-latest
     steps:
-
       - name: Check out code
         uses: actions/checkout@v1
         with:
@@ -27,13 +28,13 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: ${{ matrix.version.python }}
 
-      - name: Install ansible-base (${{ matrix.ansible }})
-        run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
+      - name: Install ansible-base (${{ matrix.version.ansible }})
+        run: pip install https://github.com/ansible/ansible/archive/${{ matrix.version.ansible }}.tar.gz --disable-pip-version-check
 
       - name: Run sanity tests
         run: ansible-test sanity --docker -v --color
 
       - name: Test building a release
-        run: ansible-galaxy collection build
+        run: ansible-galaxy collection build

.github/workflows/unit-tests.yml

@@ -1,25 +1,26 @@
 name: unit
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
 
 env:
   NAMESPACE: community
   COLLECTION_NAME: upcloud
 
 jobs:
-
   units:
     runs-on: ubuntu-latest
-    name: Unit tests (${{ matrix.ansible }})
+    name: Unit tests (${{ matrix.version.ansible }})
     strategy:
       fail-fast: true
       matrix:
-        ansible:
-          - stable-2.9
-          - stable-2.10
-          - stable-2.11
-          - devel
+        version:
+          - { ansible: stable-2.13, python: "3.10" }
+          - { ansible: stable-2.14, python: "3.11" }
+          - { ansible: stable-2.15, python: "3.11" }
+          - { ansible: devel, python: "3.11" }
 
     steps:
       - name: Check out code
@@ -32,10 +33,10 @@ jobs:
         with:
           # it is just required to run that once as "ansible-test units" in the docker image
           # will run on all python versions it supports.
-          python-version: 3.8
+          python-version: ${{ matrix.version.python }}
 
-      - name: Install ansible-base (${{ matrix.ansible }})
-        run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
+      - name: Install ansible-base (${{ matrix.version.ansible }})
+        run: pip install https://github.com/ansible/ansible/archive/${{ matrix.version.ansible }}.tar.gz --disable-pip-version-check
 
       # Run the unit tests
       - name: Run unit test

.gitignore

@@ -75,3 +75,6 @@ venv.bak/
 .mypy_cache/
 .dmypy.json
 dmypy.json
+
+# ansible-test
+tests/output/

plugins/inventory/upcloud.py

@@ -2,7 +2,6 @@
 
 DOCUMENTATION = r'''
     name: upcloud
-    plugin_type: inventory
     author:
       - Antti Myyrä (@ajmyyra)
     short_description: Ansible dynamic inventory plugin for UpCloud.
@@ -48,16 +47,19 @@
           description: Populate inventory with instances in these zones.
           default: []
           type: list
+          elements: str
           required: false
         tags:
           description: Populate inventory with instances with these tags.
           default: []
           type: list
+          elements: str
           required: false
         states:
           description: Populate inventory with instances with these states.
           default: []
           type: list
+          elements: str
           required: false
         network:
           description: Populate inventory with instances which are attached to this network name or UUID.
@@ -97,7 +99,6 @@
 
 try:
     import upcloud_api
-    from upcloud_api import Server
     from upcloud_api.errors import UpCloudAPIError
     UC_AVAILABLE = True
 except ImportError:

tests/sanity/ignore-2.13.txt

@@ -0,0 +1 @@
+plugins/inventory/upcloud.py validate-modules:missing-gplv3-license

tests/sanity/ignore-2.14.txt

@@ -0,0 +1 @@
+plugins/inventory/upcloud.py validate-modules:missing-gplv3-license

tests/sanity/ignore-2.15.txt

@@ -0,0 +1 @@
+plugins/inventory/upcloud.py validate-modules:missing-gplv3-license

tests/sanity/ignore-2.16.txt

@@ -0,0 +1 @@
+plugins/inventory/upcloud.py validate-modules:missing-gplv3-license

tests/unit/plugins/inventory/test_upcloud.py

@@ -2,7 +2,6 @@
 
 import pytest
 
-from ansible.errors import AnsibleParserError
 from ansible.inventory.data import InventoryData
 from .....plugins.inventory.upcloud import InventoryModule