Add support for json credential file

Author: miccehedin

README.md

@@ -51,6 +51,21 @@ Please check the [Laravel support policy](https://laravel.com/docs/master/releas
       // is marked as a DEADLINE_EXCEEDED failure.
       'dispatch_deadline' => null,
       'backoff' => 0,
+
+            'queue'                 => env('STACKKIT_CLOUD_TASKS_QUEUE', 'default'),
+            'credential_file'       => env('STACKKIT_CLOUD_TASKS_CREDENTIAL_FILE', ''),
+            // Either you have an AppEngine task, and use these
+            'app_engine'            => env('STACKKIT_APP_ENGINE_TASK', false),
+            'app_engine_service'    => env('STACKKIT_APP_ENGINE_SERVICE', ''),
+            // Else you get a HttpTask, and use these
+            'handler'               => env('STACKKIT_CLOUD_TASKS_HANDLER', ''),
+            'service_account_email' => env('STACKKIT_CLOUD_TASKS_SERVICE_EMAIL', ''),
+            'signed_audience'       => env('STACKKIT_CLOUD_TASKS_SIGNED_AUDIENCE', true),
+            // Optional: The deadline in seconds for requests sent to the worker. If the worker
+            // does not respond by this deadline then the request is cancelled and the attempt
+            // is marked as a DEADLINE_EXCEEDED failure.
+            'dispatch_deadline'     => null,
+            'backoff'               => 0,
   ],
   ```
 
@@ -64,13 +79,14 @@ Now that the package is installed, the final step is to set the correct environm
 
 Please check the table below on what the values mean and what their value should be.
 
-| Environment variable                 | Description                                                                                                                                                                               |Example
---------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---
-| `STACKKIT_CLOUD_TASKS_PROJECT`       | The project your queue belongs to.                                                                                                                                                        |`my-project`
-| `STACKKIT_CLOUD_TASKS_LOCATION`      | The region where the project is hosted                                                                                                                                                    |`europe-west6`
-| `STACKKIT_CLOUD_TASKS_QUEUE`         | The default queue a job will be added to                                                                                                                                                  |`emails`
-| `STACKKIT_CLOUD_TASKS_SERVICE_EMAIL` | The email address of the service account. Important, it should have the correct roles. See the section below which roles.                                                        |`[email protected]`
-| `STACKKIT_CLOUD_TASKS_HANDLER` (optional) | The URL that Cloud Tasks will call to process a job. This should be the URL to your Laravel app. By default we will use the URL that dispatched the job. |`https://<your website>.com`
+| Environment variable                              | Description                                                                                                                                              |Example
+---------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|---
+| `STACKKIT_CLOUD_TASKS_PROJECT`                    | The project your queue belongs to.                                                                                                                       |`my-project`
+| `STACKKIT_CLOUD_TASKS_LOCATION`                   | The region where the project is hosted.                                                                                                                  |`europe-west6`
+| `STACKKIT_CLOUD_TASKS_QUEUE`                      | The default queue a job will be added to.                                                                                                                |`emails`
+| `STACKKIT_CLOUD_TASKS_CREDENTIAL_FILE` (optional) | A json credential file to authenticate the connection (from outside AppEngine)                                                                           |`project-123.json`
+| `STACKKIT_CLOUD_TASKS_SERVICE_EMAIL`              | The email address of the service account. Important, it should have the correct roles. See the section below which roles.                                |`[email protected]`
+| `STACKKIT_CLOUD_TASKS_HANDLER` (optional)         | The URL that Cloud Tasks will call to process a job. This should be the URL to your Laravel app. By default we will use the URL that dispatched the job. |`https://<your website>.com`
 | `STACKKIT_CLOUD_TASKS_SIGNED_AUDIENCE` (optional) | True or false depending if you want extra security by signing the audience of your tasks. May misbehave in certain Cloud Run setups. Defaults to true.   | `true`
 </details>
 <details>

src/CloudTasksServiceProvider.php

@@ -29,8 +29,14 @@ public function boot(): void
 
     private function registerClient(): void
     {
-        $this->app->singleton(CloudTasksClient::class, function () {
-            return new CloudTasksClient();
+        $this->app->singleton(CloudTasksClient::class, function ($app) {
+            $config = config('queue.connections.cloudtasks');
+            $options = [];
+            $x = $config['credential_file'];
+            if (!empty($x)) {
+                $options['credentials'] = $x;
+            }
+            return new CloudTasksClient($options);
         });
 
         $this->app->bind('open-id-verificator', OpenIdVerificatorConcrete::class);

src/TaskHandler.php

@@ -10,10 +10,12 @@
 use Illuminate\Queue\Jobs\Job;
 use Illuminate\Queue\QueueManager;
 use Illuminate\Queue\WorkerOptions;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
 use Safe\Exceptions\JsonException;
 use UnexpectedValueException;
+
 use function Safe\json_decode;
 
 class TaskHandler
@@ -45,11 +47,18 @@ public function __construct(CloudTasksClient $client)
 
     public function handle(?string $task = null): void
     {
+        Log::debug(json_encode(request()->headers->all()));
+        Log::debug(json_encode(request()->bearerToken()));
+        Log::debug(json_encode(request()->getContent()));
+
         $task = $this->captureTask($task);
+        Log::debug(json_encode($task));
 
         $this->loadQueueConnectionConfiguration($task);
+        Log::debug(json_encode($this->config));
 
         $this->setQueue();
+        Log::debug(json_encode($this->queue));
 
         OpenIdVerificator::verify(request()->bearerToken(), $this->config);
 
@@ -63,7 +72,7 @@ public function handle(?string $task = null): void
      */
     private function captureTask($task): array
     {
-        $task = $task ?: (string) (request()->getContent());
+        $task = $task ?: (string)(request()->getContent());
 
         try {
             $array = json_decode($task, true);
@@ -72,13 +81,13 @@ private function captureTask($task): array
         }
 
         $validator = validator([
-            'json' => $task,
-            'task' => $array,
+            'json'        => $task,
+            'task'        => $array,
             'name_header' => request()->header('X-CloudTasks-Taskname'),
         ], [
-            'json' => 'required|json',
-            'task' => 'required|array',
-            'task.data' => 'required|array',
+            'json'        => 'required|json',
+            'task'        => 'required|array',
+            'task.data'   => 'required|array',
             'name_header' => 'required|string',
         ]);
 
@@ -141,8 +150,8 @@ private function handleTask(array $task): void
         // we know the job was created using an earlier version of the package. This
         // job does not have the attempts tracked internally yet.
         $taskRetryCountHeader = request()->header('X-CloudTasks-TaskRetryCount');
-        if ($taskRetryCountHeader && (int) $taskRetryCountHeader > 0) {
-            $job->setAttempts((int) $taskRetryCountHeader);
+        if ($taskRetryCountHeader && (int)$taskRetryCountHeader > 0) {
+            $job->setAttempts((int)$taskRetryCountHeader);
         } else {
             $job->setAttempts($task['internal']['attempts']);
         }
@@ -173,11 +182,14 @@ private function loadQueueRetryConfig(CloudTasksJob $job): void
     public static function getCommandProperties(string $command): array
     {
         if (Str::startsWith($command, 'O:')) {
-            return (array) unserialize($command, ['allowed_classes' => false]);
+            return (array)unserialize($command, ['allowed_classes' => false]);
         }
 
         if (app()->bound(Encrypter::class)) {
-            return (array) unserialize(app(Encrypter::class)->decrypt($command), ['allowed_classes' => ['Illuminate\Support\Carbon']]);
+            return (array)unserialize(
+                app(Encrypter::class)->decrypt($command),
+                ['allowed_classes' => ['Illuminate\Support\Carbon']]
+            );
         }
 
         return [];