better handling of initial state, stricter variable handling for php 8

Signed-off-by: Travis Glenn Hansen <[email protected]>

Author: travisghansen

composer.lock

@@ -118,8 +118,8 @@ public function doAction()
 
         $pluginConfig = $this->getConfig();
 
-        $dnsmasqEnabled = $pluginConfig['dnsBackends']['dnsmasq']['enabled'];
-        $unboundEnabled = $pluginConfig['dnsBackends']['unbound']['enabled'];
+        $dnsmasqEnabled = $pluginConfig['dnsBackends']['dnsmasq']['enabled'] ?? false;
+        $unboundEnabled = $pluginConfig['dnsBackends']['unbound']['enabled'] ?? false;
 
         // only supported options move along
         if (!$dnsmasqEnabled && !$unboundEnabled) {
@@ -130,6 +130,10 @@ public function doAction()
         $haProxyConfig = HAProxyConfig::getInstalledPackagesConfigBlock($this->getController()->getRegistryItem('pfSenseClient'), 'haproxy');
 
         $store = $this->getStore();
+        if (empty($store)) {
+            $store = [];
+        }
+
         if (!key_exists('managed_hosts', $store)) {
             $store['managed_hosts'] = [];
         }

src/KubernetesPfSenseController/Plugin/DNSHAProxyIngressProxy.php

@@ -29,8 +29,8 @@ public function init()
     {
         $controller = $this->getController();
         $pluginConfig = $this->getConfig();
-        $ingressLabelSelector = $pluginConfig['serviceLabelSelector'];
-        $ingressFieldSelector = $pluginConfig['serviceFieldSelector'];
+        $ingressLabelSelector = $pluginConfig['serviceLabelSelector'] ?? null;
+        $ingressFieldSelector = $pluginConfig['serviceFieldSelector'] ?? null;
 
         // 1.20 will kill the old version
         // https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/

src/KubernetesPfSenseController/Plugin/DNSIngresses.php

@@ -52,6 +52,10 @@ public function doAction()
         try {
             // get store data
             $store = $this->getStore();
+            if (empty($store)) {
+                $store = [];
+            }
+
             $managedHosts = $store['managed_hosts'];
             if (empty($managedHosts)) {
                 $managedHosts = [];

src/KubernetesPfSenseController/Plugin/DNSResourceTrait.php

@@ -28,8 +28,8 @@ public function init()
     {
         $controller = $this->getController();
         $pluginConfig = $this->getConfig();
-        $serviceLabelSelector = $pluginConfig['serviceLabelSelector'];
-        $serviceFieldSelector = $pluginConfig['serviceFieldSelector'];
+        $serviceLabelSelector = $pluginConfig['serviceLabelSelector'] ?? null;
+        $serviceFieldSelector = $pluginConfig['serviceFieldSelector'] ?? null;
 
         // initial load of services
         $params = [

src/KubernetesPfSenseController/Plugin/DNSServices.php

@@ -130,6 +130,10 @@ public function doAction()
 
         // remove resources created by plugin but no longer needed
         $store = $this->getStore();
+        if (empty($store)) {
+            $store = [];
+        }
+
         $managedBackends = $store['managed_backends'];
         if (empty($managedBackends)) {
             $managedBackends = [];

src/KubernetesPfSenseController/Plugin/HAProxyDeclarative.php

@@ -53,8 +53,8 @@ public function init()
     {
         $controller = $this->getController();
         $pluginConfig = $this->getConfig();
-        $ingressLabelSelector = $pluginConfig['ingressLabelSelector'];
-        $ingressFieldSelector = $pluginConfig['ingressFieldSelector'];
+        $ingressLabelSelector = $pluginConfig['ingressLabelSelector'] ?? null;
+        $ingressFieldSelector = $pluginConfig['ingressFieldSelector'] ?? null;
 
         // 1.20 will kill the old version
         // https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/
@@ -274,6 +274,9 @@ public function doAction()
 
         // remove frontends created by plugin but no longer needed
         $store = $this->getStore();
+        if (empty($store)) {
+            $store = [];
+        }
 
         // get what we currently manage
         $managedFrontendNames = @array_keys($store['managed_frontends']);

src/KubernetesPfSenseController/Plugin/HAProxyIngressProxy.php

@@ -25,9 +25,9 @@ public function init()
     {
         $controller = $this->getController();
         $pluginConfig = $this->getConfig();
-        $nodeLabelSelector = $pluginConfig['nodeLabelSelector'];
-        $nodeFieldSelector = $pluginConfig['nodeFieldSelector'];
-        $configMap = ($pluginConfig['configMap']) ? $pluginConfig['configMap'] : "metallb-system/config";
+        $nodeLabelSelector = $pluginConfig['nodeLabelSelector'] ?? null;
+        $nodeFieldSelector = $pluginConfig['nodeFieldSelector'] ?? null;
+        $configMap = $pluginConfig['configMap'] ?? "metallb-system/config";
         $configMapNamespace = explode("/", $configMap)[0];
         $configMapName = explode("/", $configMap)[1];
 
@@ -214,6 +214,10 @@ private function doActionGeneric()
 
             // get store data
             $store = $this->getStore();
+            if (empty($store)) {
+                $store = [];
+            }
+
             $store[$pluginConfig['bgp-implementation']] = $store[$pluginConfig['bgp-implementation']] ?? [];
             $store[$pluginConfig['bgp-implementation']]['managed_neighbors'] = $store[$pluginConfig['bgp-implementation']]['managed_neighbors'] ?? [];