configmap_reader 0.1.0__tar.gz → 0.2.0__tar.gz

{configmap_reader-0.1.0 → configmap_reader-0.2.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: configmap_reader
-Version: 0.1.0
-Summary: Kafka Mock Messages Sender
+Version: 0.2.0
+Summary: microservice to read and return content of a configmap
 License: MIT
 License-File: LICENSE
 Keywords: kafka

{configmap_reader-0.1.0 → configmap_reader-0.2.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "configmap_reader"
-version = "0.1.0"
-description = "Kafka Mock Messages Sender"
+version = "0.2.0"
+description = "microservice to read and return content of a configmap"
 authors = [
     {name = "Siak Hooi",email = "siakhooi@gmail.com"}
 ]
@@ -37,10 +37,11 @@ packages = [{include = "configmap_reader", from = "src"}]
 
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^9.0.1"
+pytest = "^9.0.2"
 pytest-cov = "^7.0.0"
 flake8 = "^7.2.0"
 pytest-mock = "^3.15.1"
+httpx = "^0.28.1"
 
 [build-system]
 requires = ["poetry-core>=2.0.0,<3.0.0"]

{configmap_reader-0.1.0 → configmap_reader-0.2.0}/src/configmap_reader/cli.py

@@ -1,14 +1,8 @@
 import argparse
-import sys
 from importlib.metadata import version
 from . import main
 
 
-def print_to_stderr_and_exit(e: Exception, exit_code: int) -> None:
-    print(f"Error: {e}", file=sys.stderr)
-    exit(exit_code)
-
-
 def run() -> None:
     __version__: str = version("configmap-reader")
 

configmap_reader-0.2.0/src/configmap_reader/config_api.py

@@ -0,0 +1,57 @@
+from fastapi import HTTPException
+
+_k8s_client = None
+
+
+def _get_k8s_client():
+    global _k8s_client
+    if _k8s_client is not None:
+        return _k8s_client
+    try:
+        from kubernetes import client, config
+
+        # In-cluster config first; fallback to local kubeconfig for dev
+        try:
+            config.load_incluster_config()
+        except Exception:
+            config.load_kube_config()
+        _k8s_client = client.CoreV1Api()
+        return _k8s_client
+    except Exception as e:
+        raise HTTPException(
+            status_code=500, detail=f"Failed to init Kubernetes client: {e}"
+        )
+
+
+def read(configmap_name: str, namespace: str) -> dict:
+    """
+    Read ConfigMap via Kubernetes API.
+
+    Args:
+        configmap_name: Name of the ConfigMap to read
+        namespace: Kubernetes namespace
+
+    Returns:
+        dict: ConfigMap data as filename -> string content
+    """
+    if not configmap_name:
+        raise HTTPException(
+            status_code=500,
+            detail="CONFIGMAP_NAME is not set for API read mode",  # noqa: E501
+        )
+    if not namespace:
+        raise HTTPException(
+            status_code=500, detail="NAMESPACE is not set for API read mode"
+        )
+    api = _get_k8s_client()
+    try:
+        cm = api.read_namespaced_config_map(
+            name=configmap_name, namespace=namespace
+        )
+    except Exception as e:
+        raise HTTPException(
+            status_code=500,
+            detail=f"Failed to read ConfigMap {namespace}/{configmap_name}: {e}",  # noqa: E501
+        )
+    data = cm.data or {}
+    return dict(data)

configmap_reader-0.2.0/src/configmap_reader/config_dir.py

@@ -0,0 +1,32 @@
+import pathlib
+import os
+
+
+CONFIG_DIR = os.getenv("CONFIG_DIR", "/config")
+
+
+def read(config_dir: str = CONFIG_DIR) -> dict:
+    """Read all files from the config directory and return as a dictionary.
+
+    Args:
+        config_dir: Path to the configuration directory
+
+    Returns:
+        Dictionary mapping filenames to their content
+
+    Raises:
+        FileNotFoundError: If the config directory doesn't exist or
+            isn't a directory
+    """
+    path = pathlib.Path(config_dir)
+    if not path.exists() or not path.is_dir():
+        raise FileNotFoundError(f"Config directory not found: {config_dir}")
+    result = {}
+    for p in path.iterdir():
+        if p.is_file():
+            try:
+                content = p.read_text(encoding="utf-8")
+            except UnicodeDecodeError:
+                continue
+            result[p.name] = content
+    return result

configmap_reader-0.2.0/src/configmap_reader/main.py

@@ -0,0 +1,61 @@
+from fastapi import FastAPI, HTTPException
+from fastapi.responses import JSONResponse, PlainTextResponse
+import os
+import json
+import uvicorn
+from . import config_dir, config_api
+
+app = FastAPI()
+
+CONFIG_DIR = os.getenv("CONFIG_DIR", "/config")
+READ_MODE = os.getenv("READ_MODE", "volume").lower()  # 'volume' or 'api'
+CONFIGMAP_NAME = os.getenv("CONFIGMAP_NAME")
+K8S_NAMESPACE = os.getenv("NAMESPACE") or os.getenv("K8S_NAMESPACE")
+
+
+@app.get("/config")
+def get_config():
+    if READ_MODE == "api":
+        data = config_api.read(CONFIGMAP_NAME, K8S_NAMESPACE)
+    else:
+        try:
+            data = config_dir.read(CONFIG_DIR)
+        except FileNotFoundError as e:
+            raise HTTPException(status_code=500, detail=str(e))
+
+    if not isinstance(data, dict):
+        raise HTTPException(status_code=500, detail="Invalid config data")
+
+    status_code_raw = data.get("statusCode")
+    body = data.get("body")
+
+    if status_code_raw is None or body is None:
+        raise HTTPException(
+            status_code=500, detail="Missing required keys: statusCode or body"
+        )
+
+    try:
+        status_code = int(status_code_raw)
+    except Exception:
+        raise HTTPException(status_code=500, detail="Invalid statusCode value")
+
+    try:
+        parsed = json.loads(body)
+        return JSONResponse(content=parsed, status_code=status_code)
+    except Exception:
+        return PlainTextResponse(content=body, status_code=status_code)
+
+
+@app.get("/health")
+def health():
+    return {"status": "ok"}
+
+
+def run():
+
+    uvicorn.run(
+        "app.main:app",
+        host="0.0.0.0",
+        port=int(os.getenv("PORT", "8000")),
+        reload=False,
+    )

configmap_reader-0.1.0/src/configmap_reader/main.py

@@ -1,123 +0,0 @@
-from fastapi import FastAPI, HTTPException
-from fastapi.responses import JSONResponse, PlainTextResponse
-import os
-import pathlib
-import json
-import uvicorn
-
-app = FastAPI()
-
-CONFIG_DIR = os.getenv("CONFIG_DIR", "/config")
-READ_MODE = os.getenv("READ_MODE", "volume").lower()  # 'volume' or 'api'
-CONFIGMAP_NAME = os.getenv("CONFIGMAP_NAME")
-K8S_NAMESPACE = os.getenv("NAMESPACE") or os.getenv("K8S_NAMESPACE")
-
-_k8s_client = None
-
-
-def _get_k8s_client():
-    global _k8s_client
-    if _k8s_client is not None:
-        return _k8s_client
-    try:
-        from kubernetes import client, config
-
-        # In-cluster config first; fallback to local kubeconfig for dev
-        try:
-            config.load_incluster_config()
-        except Exception:
-            config.load_kube_config()
-        _k8s_client = client.CoreV1Api()
-        return _k8s_client
-    except Exception as e:
-        raise HTTPException(
-            status_code=500, detail=f"Failed to init Kubernetes client: {e}"
-        )
-
-
-def read_config_dir() -> dict:
-    path = pathlib.Path(CONFIG_DIR)
-    if not path.exists() or not path.is_dir():
-        raise FileNotFoundError(f"Config directory not found: {CONFIG_DIR}")
-    result = {}
-    for p in path.iterdir():
-        if p.is_file():
-            try:
-                content = p.read_text(encoding="utf-8")
-            except UnicodeDecodeError:
-                continue
-            result[p.name] = content
-    return result
-
-
-def read_config_via_api() -> dict:
-    if not CONFIGMAP_NAME:
-        raise HTTPException(
-            status_code=500,
-            detail="CONFIGMAP_NAME is not set for API read mode",  # noqa: E501
-        )
-    if not K8S_NAMESPACE:
-        raise HTTPException(
-            status_code=500, detail="NAMESPACE is not set for API read mode"
-        )
-    api = _get_k8s_client()
-    try:
-        cm = api.read_namespaced_config_map(
-            name=CONFIGMAP_NAME, namespace=K8S_NAMESPACE
-        )
-    except Exception as e:
-        raise HTTPException(
-            status_code=500,
-            detail=f"Failed to read ConfigMap {K8S_NAMESPACE}/{CONFIGMAP_NAME}: {e}",  # noqa: E501
-        )
-    data = cm.data or {}
-    # Return as filename -> string content just like volume mode
-    return dict(data)
-
-
-@app.get("/config")
-def get_config():
-    if READ_MODE == "api":
-        data = read_config_via_api()
-    else:
-        try:
-            data = read_config_dir()
-        except FileNotFoundError as e:
-            raise HTTPException(status_code=500, detail=str(e))
-
-    if not isinstance(data, dict):
-        raise HTTPException(status_code=500, detail="Invalid config data")
-
-    status_code_raw = data.get("statusCode")
-    body = data.get("body")
-
-    if status_code_raw is None or body is None:
-        raise HTTPException(
-            status_code=500, detail="Missing required keys: statusCode or body"
-        )
-
-    try:
-        status_code = int(status_code_raw)
-    except Exception:
-        raise HTTPException(status_code=500, detail="Invalid statusCode value")
-
-    try:
-        parsed = json.loads(body)
-        return JSONResponse(content=parsed, status_code=status_code)
-    except Exception:
-        return PlainTextResponse(content=body, status_code=status_code)
-
-
-@app.get("/health")
-def health():
-    return {"status": "ok"}
-
-
-def run():
-
-    uvicorn.run(
-        "app.main:app",
-        host="0.0.0.0",
-        port=int(os.getenv("PORT", "8000")),
-        reload=False,
-    )