event more stringent on type checking and existence of haproxy config data

Author: travisghansen

.travis.yml

@@ -1,7 +1,7 @@
 # if: tag IS present
 language: php
 php:
-- '7.2'
+- '7.3'
 sudo: required
 services:
 - docker

src/KubernetesPfSenseController/Plugin/HAProxyConfig.php

@@ -28,10 +28,10 @@ public function save()
      */
     public function getFrontends()
     {
-        if (!key_exists('ha_backends', $this->data)) {
+        if (!is_array($this->data['ha_backends'])) {
             return [];
         }
-        if (!key_exists('item', $this->data['ha_backends'])) {
+        if (!is_array($this->data['ha_backends']['item'])) {
             return [];
         }
 
@@ -60,10 +60,10 @@ public function getFrontendNames()
      */
     public function getBackends()
     {
-        if (!key_exists('ha_pools', $this->data)) {
+        if (!is_array($this->data['ha_pools'])) {
             return [];
         }
-        if (!key_exists('item', $this->data['ha_pools'])) {
+        if (!is_array($this->data['ha_pools']['item'])) {
             return [];
         }
 
@@ -93,10 +93,10 @@ public function getBackendNames()
      */
     public function frontendExists($name)
     {
-        if (!key_exists('ha_backends', $this->data)) {
+        if (!is_array($this->data['ha_backends'])) {
             return false;
         }
-        if (!key_exists('item', $this->data['ha_backends'])) {
+        if (!is_array($this->data['ha_backends']['item'])) {
             return false;
         }
 
@@ -117,10 +117,10 @@ public function frontendExists($name)
      */
     public function backendExists($name)
     {
-        if (!key_exists('ha_pools', $this->data)) {
+        if (!is_array($this->data['ha_pools'])) {
             return false;
         }
-        if (!key_exists('item', $this->data['ha_pools'])) {
+        if (!is_array($this->data['ha_pools']['item'])) {
             return false;
         }
 
@@ -141,10 +141,10 @@ public function backendExists($name)
      */
     public function getFrontend($name)
     {
-        if (!key_exists('ha_backends', $this->data)) {
+        if (!is_array($this->data['ha_backends'])) {
             return;
         }
-        if (!key_exists('item', $this->data['ha_backends'])) {
+        if (!is_array($this->data['ha_backends']['item'])) {
             return;
         }
 
@@ -163,10 +163,10 @@ public function getFrontend($name)
      */
     public function getFrontendKey($name)
     {
-        if (!key_exists('ha_backends', $this->data)) {
+        if (!is_array($this->data['ha_backends'])) {
             return;
         }
-        if (!key_exists('item', $this->data['ha_backends'])) {
+        if (!is_array($this->data['ha_backends']['item'])) {
             return;
         }
 
@@ -185,10 +185,10 @@ public function getFrontendKey($name)
      */
     public function getBackend($name)
     {
-        if (!key_exists('ha_pools', $this->data)) {
+        if (!is_array($this->data['ha_pools'])) {
             return;
         }
-        if (!key_exists('item', $this->data['ha_pools'])) {
+        if (!is_array($this->data['ha_pools']['item'])) {
             return;
         }
 
@@ -207,10 +207,10 @@ public function getBackend($name)
      */
     public function getBackendKey($name)
     {
-        if (!key_exists('ha_pools', $this->data)) {
+        if (!is_array($this->data['ha_pools'])) {
             return;
         }
-        if (!key_exists('item', $this->data['ha_pools'])) {
+        if (!is_array($this->data['ha_pools']['item'])) {
             return;
         }
 
@@ -228,10 +228,10 @@ public function getBackendKey($name)
      */
     public function removeFrontend($name)
     {
-        if (!key_exists('ha_backends', $this->data)) {
+        if (!is_array($this->data['ha_backends'])) {
             return;
         }
-        if (!key_exists('item', $this->data['ha_backends'])) {
+        if (!is_array($this->data['ha_backends']['item'])) {
             return;
         }
 
@@ -253,10 +253,10 @@ public function removeFrontend($name)
      */
     public function removeBackend($name)
     {
-        if (!key_exists('ha_pools', $this->data)) {
+        if (!is_array($this->data['ha_pools'])) {
             return;
         }
-        if (!key_exists('item', $this->data['ha_pools'])) {
+        if (!is_array($this->data['ha_pools']['item'])) {
             return;
         }
 
@@ -282,10 +282,10 @@ public function putFrontend($item)
             $key = $this->getFrontendKey($item['name']);
             $this->data['ha_backends']['item'][$key] = $item;
         } else {
-            if (!key_exists('ha_backends', $this->data)) {
+            if (!is_array($this->data['ha_backends'])) {
                 $this->data['ha_backends'] = [];
             }
-            if (!key_exists('item', $this->data['ha_backends'])) {
+            if (!is_array($this->data['ha_backends']['item'])) {
                 $this->data['ha_backends']['item'] = [];
             }
 
@@ -304,10 +304,10 @@ public function putBackend($item)
             $key = $this->getBackendKey($item['name']);
             $this->data['ha_pools']['item'][$key] = $item;
         } else {
-            if (!key_exists('ha_pools', $this->data)) {
+            if (!is_array($this->data['ha_pools'])) {
                 $this->data['ha_pools'] = [];
             }
-            if (!key_exists('item', $this->data['ha_pools'])) {
+            if (!is_array($this->data['ha_pools']['item'])) {
                 $this->data['ha_pools']['item'] = [];
             }
 

src/KubernetesPfSenseController/Plugin/MetalLB.php

@@ -29,7 +29,7 @@ public function init()
         $nodeLabelSelector = $pluginConfig['nodeLabelSelector'];
         $nodeFieldSelector = $pluginConfig['nodeFieldSelector'];
 
-        //metallb config
+        // metallb config
         $watch = $controller->getKubernetesClient()->createWatch('/api/v1/watch/namespaces/metallb-system/configmaps/config', [], $this->getMetalLbConfigWatchCallback());
         $this->addWatch($watch);