Redis ACL AUTH two argument supporting. (#167)

* Redis ACL AUTH two argument supporting.
Signed-off-by: Gennadii Chernykh <[email protected]>

Signed-off-by: Gennadii Chernykh <[email protected]>

* Redis ACL AUTH two argument supporting.
Signed-off-by: Gennadii Chernykh <[email protected]>

Signed-off-by: Gennadii Chernykh <[email protected]>

* Fix not using empty in Redis Adapter

* Fix not using empty in RedisNg Adapter

---------

Signed-off-by: Gennadii Chernykh <[email protected]>
Co-authored-by: Gennadii Chernykh <[email protected]>
Co-authored-by: Lukas Kämmerling <[email protected]>

Author: 3 people

src/Prometheus/Storage/Redis.php

@@ -28,6 +28,7 @@ class Redis implements Adapter
         'read_timeout' => '10',
         'persistent_connections' => false,
         'password' => null,
+        'user' => null,
     ];
 
     /**
@@ -195,9 +196,18 @@ private function ensureOpenConnection(): void
         }
 
         $this->connectToServer();
+        $authParams = [];
 
-        if ($this->options['password'] !== null) {
-            $this->redis->auth($this->options['password']);
+        if (isset($this->options['user'])) {
+            $authParams[] = $this->options['user'];
+        }
+
+        if (isset($this->options['password'])) {
+            $authParams[] = $this->options['password'];
+        }
+
+        if ($authParams !== []) {
+            $this->redis->auth($authParams);
         }
 
         if (isset($this->options['database'])) {

src/Prometheus/Storage/RedisNg.php

@@ -28,6 +28,7 @@ class RedisNg implements Adapter
         'read_timeout' => '10',
         'persistent_connections' => false,
         'password' => null,
+        'user' => null,
     ];
 
     /**
@@ -195,9 +196,18 @@ private function ensureOpenConnection(): void
         }
 
         $this->connectToServer();
+        $authParams = [];
 
-        if ($this->options['password'] !== null) {
-            $this->redis->auth($this->options['password']);
+        if (isset($this->options['user'])) {
+            $authParams[] = $this->options['user'];
+        }
+
+        if (isset($this->options['password'])) {
+            $authParams[] = $this->options['password'];
+        }
+
+        if ($authParams !== []) {
+            $this->redis->auth($authParams);
         }
 
         if (isset($this->options['database'])) {