Merge pull request #40 from ropable/master

Refactor KMI layer checks
dbca-wa · Dec 27, 2023 · 2d330c9 · 2d330c9
2 parents ce56cfe + b159e05
commit 2d330c9
Show file tree

Hide file tree

Showing 7 changed files with 215 additions and 356 deletions.
diff --git a/.flake8 b/.flake8
@@ -1,2 +1,2 @@
 [flake8]
-ignore = E501
+ignore = E265,E501
diff --git a/kustomize/overlays/prod/deployment_patch.yaml b/kustomize/overlays/prod/deployment_patch.yaml
@@ -52,78 +52,78 @@ spec:
             secretKeyRef:
               name: healthcheck-env-prod
               key: TRACKING_POINTS_MAX_DELAY
-        - name: DBCA_GOING_BUSHFIRES_URL
+        - name: DBCA_GOING_BUSHFIRES_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: DBCA_GOING_BUSHFIRES_URL
-        - name: DBCA_CONTROL_LINES_URL
+              key: DBCA_GOING_BUSHFIRES_LAYER
+        - name: DBCA_CONTROL_LINES_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: DBCA_CONTROL_LINES_URL
-        - name: DFES_GOING_BUSHFIRES_URL
+              key: DBCA_CONTROL_LINES_LAYER
+        - name: DFES_GOING_BUSHFIRES_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: DFES_GOING_BUSHFIRES_URL
-        - name: ALL_CURRENT_HOTSPOTS
+              key: DFES_GOING_BUSHFIRES_LAYER
+        - name: ALL_CURRENT_HOTSPOTS_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: ALL_CURRENT_HOTSPOTS
-        - name: LIGHTNING_24H
+              key: ALL_CURRENT_HOTSPOTS_LAYER
+        - name: LIGHTNING_24H_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: LIGHTNING_24H
-        - name: LIGHTNING_24_48H
+              key: LIGHTNING_24H_LAYER
+        - name: LIGHTNING_24_48H_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: LIGHTNING_24_48H
-        - name: LIGHTNING_48_72H
+              key: LIGHTNING_24_48H_LAYER
+        - name: LIGHTNING_48_72H_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: LIGHTNING_48_72H
-        - name: FUEL_AGE_1_6Y
+              key: LIGHTNING_48_72H_LAYER
+        - name: FUEL_AGE_1_6Y_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: FUEL_AGE_1_6Y
-        - name: FUEL_AGE_NONFOREST_1_6Y
+              key: FUEL_AGE_1_6Y_LAYER
+        - name: FUEL_AGE_NONFOREST_1_6Y_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: FUEL_AGE_NONFOREST_1_6Y
-        - name: COG_BASEMAP
+              key: FUEL_AGE_NONFOREST_1_6Y_LAYER
+        - name: COG_BASEMAP_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: COG_BASEMAP
-        - name: STATE_BASEMAP
+              key: COG_BASEMAP_LAYER
+        - name: STATE_BASEMAP_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: STATE_BASEMAP
-        - name: DBCA_BURN_PROGRAM
+              key: STATE_BASEMAP_LAYER
+        - name: DBCA_BURN_PROGRAM_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: DBCA_BURN_PROGRAM
-        - name: DAILY_ACTIVE_BURNS
+              key: DBCA_BURN_PROGRAM_LAYER
+        - name: DAILY_ACTIVE_BURNS_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: DAILY_ACTIVE_BURNS
-        - name: DBCA_LANDS_WATERS
+              key: DAILY_ACTIVE_BURNS_LAYER
+        - name: DBCA_LANDS_WATERS_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: DBCA_LANDS_WATERS
-        - name: DBCA_LANDS_WATERS_INTEREST
+              key: DBCA_LANDS_WATERS_LAYER
+        - name: DBCA_LANDS_WATERS_INTEREST_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-prod
-              key: DBCA_LANDS_WATERS_INTEREST
+              key: DBCA_LANDS_WATERS_INTEREST_LAYER
diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml
@@ -16,7 +16,7 @@ labels:
       variant: prod
 images:
   - name: ghcr.io/dbca-wa/healthcheck
-    newTag: 1.1.15
+    newTag: 1.1.16
 patches:
   - path: deployment_patch.yaml
   - path: service_patch.yaml
diff --git a/kustomize/overlays/uat/deployment_patch.yaml b/kustomize/overlays/uat/deployment_patch.yaml
@@ -52,78 +52,78 @@ spec:
             secretKeyRef:
               name: healthcheck-env-uat
               key: TRACKING_POINTS_MAX_DELAY
-        - name: DBCA_GOING_BUSHFIRES_URL
+        - name: DBCA_GOING_BUSHFIRES_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: DBCA_GOING_BUSHFIRES_URL
-        - name: DBCA_CONTROL_LINES_URL
+              key: DBCA_GOING_BUSHFIRES_LAYER
+        - name: DBCA_CONTROL_LINES_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: DBCA_CONTROL_LINES_URL
-        - name: DFES_GOING_BUSHFIRES_URL
+              key: DBCA_CONTROL_LINES_LAYER
+        - name: DFES_GOING_BUSHFIRES_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: DFES_GOING_BUSHFIRES_URL
-        - name: ALL_CURRENT_HOTSPOTS
+              key: DFES_GOING_BUSHFIRES_LAYER
+        - name: ALL_CURRENT_HOTSPOTS_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: ALL_CURRENT_HOTSPOTS
-        - name: LIGHTNING_24H
+              key: ALL_CURRENT_HOTSPOTS_LAYER
+        - name: LIGHTNING_24H_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: LIGHTNING_24H
-        - name: LIGHTNING_24_48H
+              key: LIGHTNING_24H_LAYER
+        - name: LIGHTNING_24_48H_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: LIGHTNING_24_48H
-        - name: LIGHTNING_48_72H
+              key: LIGHTNING_24_48H_LAYER
+        - name: LIGHTNING_48_72H_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: LIGHTNING_48_72H
-        - name: FUEL_AGE_1_6Y
+              key: LIGHTNING_48_72H_LAYER
+        - name: FUEL_AGE_1_6Y_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: FUEL_AGE_1_6Y
-        - name: FUEL_AGE_NONFOREST_1_6Y
+              key: FUEL_AGE_1_6Y_LAYER
+        - name: FUEL_AGE_NONFOREST_1_6Y_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: FUEL_AGE_NONFOREST_1_6Y
-        - name: COG_BASEMAP
+              key: FUEL_AGE_NONFOREST_1_6Y_LAYER
+        - name: COG_BASEMAP_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: COG_BASEMAP
-        - name: STATE_BASEMAP
+              key: COG_BASEMAP_LAYER
+        - name: STATE_BASEMAP_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: STATE_BASEMAP
-        - name: DBCA_BURN_PROGRAM
+              key: STATE_BASEMAP_LAYER
+        - name: DBCA_BURN_PROGRAM_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: DBCA_BURN_PROGRAM
-        - name: DAILY_ACTIVE_BURNS
+              key: DBCA_BURN_PROGRAM_LAYER
+        - name: DAILY_ACTIVE_BURNS_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: DAILY_ACTIVE_BURNS
-        - name: DBCA_LANDS_WATERS
+              key: DAILY_ACTIVE_BURNS_LAYER
+        - name: DBCA_LANDS_WATERS_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: DBCA_LANDS_WATERS
-        - name: DBCA_LANDS_WATERS_INTEREST
+              key: DBCA_LANDS_WATERS_LAYER
+        - name: DBCA_LANDS_WATERS_INTEREST_LAYER
           valueFrom:
             secretKeyRef:
               name: healthcheck-env-uat
-              key: DBCA_LANDS_WATERS_INTEREST
+              key: DBCA_LANDS_WATERS_INTEREST_LAYER
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "healthcheck"
-version = "1.1.15"
+version = "1.1.16"
 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.10.0"
+ipython = "^8.19.0"
 
 [build-system]
 requires = ["poetry-core"]