More fixes

plugins/module_utils/controller.py

@@ -4,7 +4,7 @@
 # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 from __future__ import absolute_import, annotations, division, print_function
 
-from typing import List, Optional, Union
+from typing import Any, List, NoReturn, Optional, Union
 
 from ansible.module_utils.basic import AnsibleModule
 
@@ -75,7 +75,7 @@ def get_item_name(self, item):
         msg = "Cant determine identity field for Undefined object."
         raise EDAError(msg)
 
-    def fail_wanted_one(self, response, endpoint, query_params):
+    def fail_wanted_one(self, response, endpoint, query_params) -> NoReturn:
         sample = response.json.copy()
         if len(sample["results"]) > 1:
             sample["results"] = sample["results"][:2] + ["...more results snipped..."]
@@ -90,22 +90,26 @@ def fail_wanted_one(self, response, endpoint, query_params):
     def get_exactly_one(
         self, endpoint, name=None, **kwargs
     ) -> Optional[dict[str, bool]]:
-        result = self.get_one_or_many(endpoint, name=name, allow_none=False, **kwargs)
-        if isinstance(result, list):
-            raise RuntimeError("This should never happen.")
+        result = self.get_one_or_many(
+            endpoint, name=name, allow_none=False, want_one=True, **kwargs
+        )
+        # typing: needed as get_one_or_many can also return lists, not expected
+        # to reach this ever.
+        if isinstance(result, list):  # pragma: no cover
+            self.fail_wanted_one(result, endpoint, {})
         return result
 
     def resolve_name_to_id(self, endpoint, name):
         return self.get_exactly_one(endpoint, name)["id"]
 
     def get_one_or_many(
         self,
-        endpoint,
-        name=None,
-        allow_none=True,
-        check_exists=False,
-        want_one=True,
-        **kwargs,
+        endpoint: str,
+        name: Optional[str] = None,
+        allow_none: bool = True,
+        check_exists: bool = False,
+        want_one: bool = True,
+        **kwargs: Any,
     ) -> Union[None, dict[str, bool], List]:
         new_kwargs = kwargs.copy()
         response = None

tests/sanity/ignore-2.15.txt

@@ -0,0 +1,15 @@
+plugins/module_utils/arguments.py future-import-boilerplate!skip
+plugins/module_utils/common.py import-3.7!skip
+plugins/module_utils/common.py import-3.8!skip
+plugins/module_utils/controller.py future-import-boilerplate!skip
+plugins/modules/activation.py import-3.7!skip
+plugins/modules/activation.py import-3.8!skip
+plugins/modules/activation_info.py import-3.7!skip
+plugins/modules/activation_info.py import-3.8!skip
+plugins/modules/credential_info.py import-3.7!skip
+plugins/modules/credential_info.py import-3.8!skip
+plugins/modules/credential_type_info.py future-import-boilerplate!skip
+plugins/modules/credential_type_info.py import-3.7!skip
+plugins/modules/credential_type_info.py import-3.8!skip
+plugins/modules/decision_environment_info.py import-3.7!skip
+plugins/modules/decision_environment_info.py import-3.8!skip

tests/sanity/ignore-2.16.txt

@@ -0,0 +1,15 @@
+plugins/module_utils/arguments.py future-import-boilerplate!skip
+plugins/module_utils/common.py import-3.7!skip
+plugins/module_utils/common.py import-3.8!skip
+plugins/module_utils/controller.py future-import-boilerplate!skip
+plugins/modules/activation.py import-3.7!skip
+plugins/modules/activation.py import-3.8!skip
+plugins/modules/activation_info.py import-3.7!skip
+plugins/modules/activation_info.py import-3.8!skip
+plugins/modules/credential_info.py import-3.7!skip
+plugins/modules/credential_info.py import-3.8!skip
+plugins/modules/credential_type_info.py future-import-boilerplate!skip
+plugins/modules/credential_type_info.py import-3.7!skip
+plugins/modules/credential_type_info.py import-3.8!skip
+plugins/modules/decision_environment_info.py import-3.7!skip
+plugins/modules/decision_environment_info.py import-3.8!skip