kube: rename query.py to test_query.py so pytest collects its tests

Also remove dead json_decode_error ResultType. Pydantic v2 validate_json()
always raises ValidationError, never JSONDecodeError, so this path has been
unreachable since the Pydantic v2 upgrade in December 2023 or possibly
earlier.

Change-Id: If91cc44413e882d7c5e683d5db09939c7fc7ffbe

Author: relrod

packages/cmk-plugins/cmk/plugins/kube/agent_based/openshift_queries.py

@@ -35,7 +35,6 @@ def discover(section: OpenShiftEndpoint) -> DiscoveryResult:
 
 SEVERITY = {
     ResultType.request_exception: State.CRIT,
-    ResultType.json_decode_error: State.CRIT,
     ResultType.validation_error: State.CRIT,
     ResultType.response_error: State.CRIT,
     ResultType.response_empty_result: State.CRIT,
@@ -45,12 +44,11 @@ def discover(section: OpenShiftEndpoint) -> DiscoveryResult:
 
 RANK_ORDER = {
     ResultType.request_exception: 0,
-    ResultType.json_decode_error: 1,
-    ResultType.validation_error: 2,
-    ResultType.response_error: 3,
-    ResultType.response_empty_result: 4,
-    ResultType.response_invalid_data: 5,
-    ResultType.success: 6,
+    ResultType.validation_error: 1,
+    ResultType.response_error: 2,
+    ResultType.response_empty_result: 3,
+    ResultType.response_invalid_data: 4,
+    ResultType.success: 5,
 }
 
 

packages/cmk-plugins/cmk/plugins/kube/prometheus_api.py

@@ -7,7 +7,6 @@
 import datetime
 import enum
 from collections.abc import Mapping, Sequence
-from json import JSONDecodeError
 from typing import Annotated, Literal, NewType
 
 from pydantic import BaseModel, ConfigDict, Field, TypeAdapter, ValidationError
@@ -112,8 +111,8 @@ class ResponseError(ParseModel):
 
 def parse_raw_response(
     response: bytes | str,
-) -> Response | ValidationError | JSONDecodeError:
+) -> Response | ValidationError:
     try:
         return RESPONSE_ADAPTER.validate_json(response)
-    except (ValidationError, JSONDecodeError) as e:
+    except ValidationError as e:
         return e

packages/cmk-plugins/cmk/plugins/kube/query.py

@@ -6,7 +6,6 @@
 
 import argparse
 import enum
-import json
 import logging
 import os
 from collections.abc import Iterable, Iterator, Mapping, MutableMapping
@@ -22,9 +21,7 @@
 
 TCPTimeout = NewType("TCPTimeout", tuple[int, int])
 
-HTTPResult = (
-    Response | ValidationError | json.JSONDecodeError | requests.exceptions.RequestException
-)
+HTTPResult = Response | ValidationError | requests.exceptions.RequestException
 
 
 class PrometheusEndpoints(enum.StrEnum):

packages/cmk-plugins/cmk/plugins/kube/schemata/section.py

@@ -11,7 +11,6 @@
 """
 
 import enum
-import json
 from collections.abc import Mapping, Sequence
 from typing import assert_never, Literal, NewType
 
@@ -622,7 +621,6 @@ class HardResourceRequirement(Section, api.HardResourceRequirement):
 
 class ResultType(enum.Enum):
     request_exception = "request_exception"
-    json_decode_error = "json_decode_error"
     validation_error = "validation_error"
     response_error = "response_error"
     response_invalid_data = "reponse_invalid_data"
@@ -648,8 +646,6 @@ def _from_result(cls, result: query.HTTPResult) -> tuple[ResultType, str | None]
         match result:
             case requests.exceptions.RequestException():
                 return ResultType.request_exception, type(result).__name__
-            case json.JSONDecodeError():
-                return ResultType.json_decode_error, None
             case ValidationError():
                 return ResultType.validation_error, None
             case prometheus_api.ResponseError():
@@ -666,8 +662,6 @@ def summary(self) -> str:
         match self.type_:
             case ResultType.request_exception:
                 return f"Request Exception: {self.details}"
-            case ResultType.json_decode_error:
-                return "Invalid response: did not receive JSON"
             case ResultType.validation_error:
                 return "Invalid response: did not match Prometheus HTTP API"
             case ResultType.response_error:

…k/plugins/kube/utils_kubernetes/query.py …gins/kube/utils_kubernetes/test_query.pypackages/cmk-plugins/tests/cmk/plugins/kube/utils_kubernetes/query.py renamed to packages/cmk-plugins/tests/cmk/plugins/kube/utils_kubernetes/test_query.py packages/cmk-plugins/tests/cmk/plugins/kube/utils_kubernetes/query.py renamed to packages/cmk-plugins/tests/cmk/plugins/kube/utils_kubernetes/test_query.py

@@ -53,7 +53,6 @@
         ),
     )
 )
-JSONERROR = prometheus_api.parse_raw_response("{")
 VALIDATIONERROR = prometheus_api.parse_raw_response("{}")
 EMPTY_DATA = ResponseSuccessFactory.build(data=VectorFactory.build(result=[]))
 SUCCESS = ResponseSuccessFactory.build(data=VectorFactory.build(result=SampleFactory.batch(size=3)))
@@ -62,45 +61,47 @@
 @pytest.mark.parametrize(
     "result, expected_details, expected_type",
     [
-        (
+        pytest.param(
             SSLERROR,
             "SSLError",
             section.ResultType.request_exception,
+            id="ssl error",
         ),
-        (
+        pytest.param(
             PROXYERROR,
             "ProxyError",
             section.ResultType.request_exception,
+            id="proxy error",
         ),
-        (
+        pytest.param(
             CONNECTIONERROR,
             "ConnectionError",
             section.ResultType.request_exception,
+            id="connection error",
         ),
-        (
-            JSONERROR,
-            None,
-            section.ResultType.json_decode_error,
-        ),
-        (
+        pytest.param(
             VALIDATIONERROR,
             None,
             section.ResultType.validation_error,
+            id="validation error",
         ),
-        (
+        pytest.param(
             EMPTY_DATA,
             None,
             section.ResultType.response_empty_result,
+            id="empty data",
         ),
-        (
+        pytest.param(
             SUCCESS,
             None,
             section.ResultType.success,
+            id="success",
         ),
-        (
+        pytest.param(
             RESPONSEERROR,
             f"{RESPONSEERROR.error_type}: {RESPONSEERROR.error}",
             section.ResultType.response_error,
+            id="response error",
         ),
     ],
 )
@@ -117,7 +118,7 @@ def test_prometheus__from_result(
 
 @pytest.mark.parametrize(
     "result",
-    [SSLERROR, PROXYERROR, CONNECTIONERROR, JSONERROR, VALIDATIONERROR, EMPTY_DATA, SUCCESS],
+    [SSLERROR, PROXYERROR, CONNECTIONERROR, VALIDATIONERROR, EMPTY_DATA, SUCCESS],
 )
 def test_prometheus_result_from_response(result: query.HTTPResult) -> None:
     # Assemble