Refactor accessing queue configuration

Author: marickvantuil

src/CloudTasksQueue.php

@@ -18,11 +18,13 @@ class CloudTasksQueue extends LaravelQueue implements QueueContract
 
     private $client;
     private $default;
+    private $config;
 
     public function __construct(array $config, CloudTasksClient $client)
     {
         $this->client = $client;
         $this->default = $config['queue'];
+        $this->config = $config;
     }
 
     public function size($queue = null)
@@ -52,19 +54,19 @@ public function later($delay, $job, $data = '', $queue = null)
     protected function pushToCloudTasks($queue, $payload, $delay = 0, $attempts = 0)
     {
         $queue = $this->getQueue($queue);
-        $queueName = $this->client->queueName(Config::project($this->connectionName), Config::location($this->connectionName), $queue);
+        $queueName = $this->client->queueName($this->config['project'], $this->config['location'], $queue);
         $availableAt = $this->availableAt($delay);
 
         $httpRequest = $this->createHttpRequest();
-        $httpRequest->setUrl(Config::handler($this->connectionName));
+        $httpRequest->setUrl($this->config['handler']);
         $httpRequest->setHttpMethod(HttpMethod::POST);
         $httpRequest->setBody($payload);
 
         $task = $this->createTask();
         $task->setHttpRequest($httpRequest);
 
         $token = new OidcToken;
-        $token->setServiceAccountEmail(Config::serviceAccountEmail($this->connectionName));
+        $token->setServiceAccountEmail($this->config['service_account_email']);
         $httpRequest->setOidcToken($token);
 
         if ($availableAt > time()) {

src/Config.php

@@ -6,31 +6,6 @@
 
 class Config
 {
-    public static function credentials($connection = 'cloudtasks')
-    {
-        return config("queue.connections.{$connection}.credentials");
-    }
-
-    public static function project($connection = 'cloudtasks')
-    {
-        return config("queue.connections.{$connection}.project");
-    }
-
-    public static function location($connection = 'cloudtasks')
-    {
-        return config("queue.connections.{$connection}.location");
-    }
-
-    public static function handler($connection = 'cloudtasks')
-    {
-        return config("queue.connections.{$connection}.handler");
-    }
-
-    public static function serviceAccountEmail($connection = 'cloudtasks')
-    {
-        return config("queue.connections.{$connection}.service_account_email");
-    }
-
     public static function validate(array $config)
     {
         if (empty($config['project'])) {

src/TaskHandler.php

@@ -12,6 +12,7 @@ class TaskHandler
 {
     private $request;
     private $publicKey;
+    private $config;
 
     public function __construct(CloudTasksClient $client, Request $request, OpenIdVerificator $publicKey)
     {
@@ -28,20 +29,29 @@ public function handle($task = null)
     {
         $task = $task ?: $this->captureTask();
 
-        $command = unserialize($task['data']['command']);
-        $connection = $command->connection ?? config('queue.default');
+        $this->loadQueueConnectionConfiguration($task);
 
-        $this->authorizeRequest($connection);
+        $this->authorizeRequest();
 
-        $this->listenForEvents($connection);
+        $this->listenForEvents();
+
+        $this->handleTask($task);
+    }
 
-        $this->handleTask($connection, $task);
+    private function loadQueueConnectionConfiguration($task)
+    {
+        $command = unserialize($task['data']['command']);
+        $connection = $command->connection ?? config('queue.default');
+        $this->config = array_merge(
+            config("queue.connections.{$connection}"),
+            ['connection' => $connection]
+        );
     }
 
     /**
      * @throws CloudTasksException
      */
-    public function authorizeRequest($connection)
+    public function authorizeRequest()
     {
         if (!$this->request->hasHeader('Authorization')) {
             throw new CloudTasksException('Missing [Authorization] header');
@@ -52,7 +62,7 @@ public function authorizeRequest($connection)
 
         $decodedToken = $this->publicKey->decodeOpenIdToken($openIdToken, $kid);
 
-        $this->validateToken($connection, $decodedToken);
+        $this->validateToken($decodedToken);
     }
 
     /**
@@ -61,13 +71,13 @@ public function authorizeRequest($connection)
      * @param $openIdToken
      * @throws CloudTasksException
      */
-    protected function validateToken($connection, $openIdToken)
+    protected function validateToken($openIdToken)
     {
         if (!in_array($openIdToken->iss, ['https://accounts.google.com', 'accounts.google.com'])) {
             throw new CloudTasksException('The given OpenID token is not valid');
         }
 
-        if ($openIdToken->aud != Config::handler($connection)) {
+        if ($openIdToken->aud != $this->config['handler']) {
             throw new CloudTasksException('The given OpenID token is not valid');
         }
 
@@ -96,11 +106,11 @@ private function captureTask()
         return $task;
     }
 
-    private function listenForEvents($connection)
+    private function listenForEvents()
     {
-        app('events')->listen(JobFailed::class, function ($event) use ($connection) {
+        app('events')->listen(JobFailed::class, function ($event) {
             app('queue.failer')->log(
-                $connection, $event->job->getQueue(),
+                $this->config['connection'], $event->job->getQueue(),
                 $event->job->getRawBody(), $event->exception
             );
         });
@@ -110,24 +120,24 @@ private function listenForEvents($connection)
      * @param $task
      * @throws CloudTasksException
      */
-    private function handleTask($connection, $task)
+    private function handleTask($task)
     {
         $job = new CloudTasksJob($task);
 
         $job->setAttempts(request()->header('X-CloudTasks-TaskRetryCount') + 1);
         $job->setQueue(request()->header('X-Cloudtasks-Queuename'));
-        $job->setMaxTries($this->getQueueMaxTries($connection, $job));
+        $job->setMaxTries($this->getQueueMaxTries($job));
 
         $worker = $this->getQueueWorker();
 
-        $worker->process($connection, $job, new WorkerOptions());
+        $worker->process($this->config['connection'], $job, new WorkerOptions());
     }
 
-    private function getQueueMaxTries($connection, CloudTasksJob $job)
+    private function getQueueMaxTries(CloudTasksJob $job)
     {
         $queueName = $this->client->queueName(
-            Config::project($connection),
-            Config::location($connection),
+            $this->config['project'],
+            $this->config['location'],
             $job->getQueue()
         );