Merge pull request #42 from ropable/master

Bugfix today's burns count check

kustomize/overlays/prod/kustomization.yaml

@@ -1,22 +1,22 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 nameSuffix: -prod
+resources:
+  - ../../base
+  - ingress.yaml
+  - pdb.yaml
 secretGenerator:
   - name: healthcheck-env
     type: Opaque
     envs:
     - .env
-resources:
-  - ../../base
-  - ingress.yaml
-  - pdb.yaml
 labels:
   - includeSelectors: true
     pairs:
       variant: prod
-images:
-  - name: ghcr.io/dbca-wa/healthcheck
-    newTag: 1.1.16
 patches:
   - path: deployment_patch.yaml
   - path: service_patch.yaml
+images:
+  - name: ghcr.io/dbca-wa/healthcheck
+    newTag: 1.1.17

kustomize/overlays/uat/kustomization.yaml

@@ -1,15 +1,15 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 nameSuffix: -uat
+resources:
+  - ../../base
+  - ingress.yaml
+  - pdb.yaml
 secretGenerator:
   - name: healthcheck-env
     type: Opaque
     envs:
     - .env
-resources:
-  - ../../base
-  - ingress.yaml
-  - pdb.yaml
 labels:
   - includeSelectors: true
     pairs:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "healthcheck"
-version = "1.1.16"
+version = "1.1.17"
 description = "Internal service endpoint health check for Spatial Support System"
 authors = ["ASI <[email protected]>"]
 
@@ -13,7 +13,7 @@ python-dotenv = "1.0.0"
 gunicorn = "21.2.0"
 
 [tool.poetry.group.dev.dependencies]
-ipython = "^8.19.0"
+ipython = "^8.20.0"
 
 [build-system]
 requires = ["poetry-core"]

status.py

@@ -317,17 +317,17 @@ def healthcheck_http():
 
     output += "</p>\n<p>\n"
 
-    if d["csw_catalogue_count"]:
+    if "csw_catalogue_count" in d and d["csw_catalogue_count"]:  # Should be >0
         output += f"CSW spatial catalogue for SSS: {d['csw_catalogue_count']} layers<br>\n"
     else:
         output += "CSW API endpoint: error<br>\n"
 
-    if d["todays_burns_count"]:
+    if "todays_burns_count" in d:  # Burns count might be 0
         output += f"Today's burns count (KMI): {d['todays_burns_count']}<br>\n"
     else:
         output += "Today's burns count (KMI): error<br>\n"
 
-    if d["kmi_wmts_layer_count"]:
+    if d["kmi_wmts_layer_count"] and d["kmi_wmts_layer_count"]:  # Should be >0
         output += f"KMI WMTS layer count (public workspace): {d['kmi_wmts_layer_count']}<br>\n"
     else:
         output += "KMI WMTS GetCapabilities: error<br>\n"