Using ->addToAttribute()

renoki-co · Nov 2, 2020 · c82d7bf · c82d7bf
1 parent 08aa6e6
commit c82d7bf
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 44 deletions.
diff --git a/src/Instances/Container.php b/src/Instances/Container.php
@@ -42,15 +42,11 @@ public function setImage(string $image, string $tag = 'latest')
      */
     public function addPort(int $containerPort, string $protocol = 'TCP', string $name = null)
     {
-        $ports = array_merge($this->getAttribute('ports', []), [
-            [
-                'name' => $name,
-                'protocol' => $protocol,
-                'containerPort' => $containerPort,
-            ],
+        return $this->addToAttribute('ports', [
+            'name' => $name,
+            'protocol' => $protocol,
+            'containerPort' => $containerPort,
         ]);
-
-        return $this->setAttribute('ports', $ports);
     }
 
     /**

diff --git a/src/Kinds/K8sHorizontalPodAutoscaler.php b/src/Kinds/K8sHorizontalPodAutoscaler.php
@@ -60,11 +60,7 @@ public function setResource(Scalable $resource)
      */
     public function addMetric(ResourceMetric $metric)
     {
-        $metrics = array_merge($this->getMetrics(), [
-            $metric->toArray(),
-        ]);
-
-        return $this->setSpec('metrics', $metrics);
+        return $this->addToSpec('metrics', $metric->toArray());
     }
 
     /**

diff --git a/src/Kinds/K8sIngress.php b/src/Kinds/K8sIngress.php
@@ -52,11 +52,7 @@ public function setRules(array $rules = [])
      */
     public function addRule(array $rule)
     {
-        $rules = $this->getRules();
-
-        $rules = array_merge($rules, [$rule]);
-
-        return $this->setSpec('rules', $rules);
+        return $this->addToSpec('rules', $rule);
     }
 
     /**

diff --git a/src/Kinds/K8sPod.php b/src/Kinds/K8sPod.php
@@ -111,13 +111,7 @@ public function getInitContainers(bool $asInstance = true): array
      */
     public function addPulledSecret(string $name)
     {
-        $imagePullSecrets = $this->getAttribute('imagePullSecrets', []);
-
-        $imagePullSecrets = array_merge($imagePullSecrets, [
-            ['name' => $name],
-        ]);
-
-        return $this->setAttribute('imagePullSecrets', $imagePullSecrets);
+        return $this->addToAttribute('imagePullSecrets', ['name' => $name]);
     }
 
     /**

diff --git a/src/Kinds/K8sService.php b/src/Kinds/K8sService.php
@@ -47,11 +47,7 @@ public function setPorts(array $ports = [])
      */
     public function addPort(array $port)
     {
-        $ports = $this->getPorts();
-
-        $ports = array_merge($ports, [$port]);
-
-        return $this->setSpec('ports', $ports);
+        return $this->addToSpec('ports', $port);
     }
 
     /**

diff --git a/src/Kinds/K8sServiceAccount.php b/src/Kinds/K8sServiceAccount.php
@@ -33,13 +33,7 @@ public function addSecret($secret)
             $secret = $secret->getName();
         }
 
-        $secrets = $this->getAttribute('secrets', []);
-
-        $secrets = array_merge($secrets, [
-            ['name' => $secret],
-        ]);
-
-        return $this->setAttribute('secrets', $secrets);
+        return $this->addToAttribute('secrets', ['name' => $secret]);
     }
 
     /**
@@ -65,13 +59,7 @@ public function addSecrets(array $secrets)
      */
     public function addPulledSecret(string $name)
     {
-        $imagePullSecrets = $this->getAttribute('imagePullSecrets', []);
-
-        $imagePullSecrets = array_merge($imagePullSecrets, [
-            ['name' => $name],
-        ]);
-
-        return $this->setAttribute('imagePullSecrets', $imagePullSecrets);
+        return $this->addToAttribute('imagePullSecrets', ['name' => $name]);
     }
 
     /**

diff --git a/src/Traits/HasAttributes.php b/src/Traits/HasAttributes.php
@@ -28,6 +28,24 @@ public function setAttribute(string $name, $value)
         return $this;
     }
 
+    /**
+     * For an array attribute, append a new element to the list.
+     *
+     * @param  string  $name
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function addToAttribute(string $name, $value)
+    {
+        $current = $this->getAttribute($name, []);
+
+        if (! is_array($current)) {
+            return $this;
+        }
+
+        return $this->setAttribute($name, array_merge($current, [$value]));
+    }
+
     /**
      * Remove an attribute.
      *

diff --git a/src/Traits/HasSpec.php b/src/Traits/HasSpec.php
@@ -16,6 +16,18 @@ public function setSpec(string $name, $value)
         return $this->setAttribute("spec.{$name}", $value);
     }
 
+    /**
+     * Append a value to the spec parameter, if array.
+     *
+     * @param  string  $name
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function addToSpec(string $name, $value)
+    {
+        return $this->addToAttribute("spec.{$name}", $value);
+    }
+
     /**
      * Get the spec parameter with default.
      *