From e13a880522f6ed0b2340b9e29dcb8e1c33332920 Mon Sep 17 00:00:00 2001 From: Ian Littman Date: Mon, 28 Sep 2020 00:23:41 -0500 Subject: [PATCH] Allow use with GCP service account; fixes #60 Re-rolled from https://github.com/ralfiannor/laravel-google-cloud-storage/tree/patch-1 --- src/GoogleCloudStorageServiceProvider.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/GoogleCloudStorageServiceProvider.php b/src/GoogleCloudStorageServiceProvider.php index c45aee0..bc8a262 100644 --- a/src/GoogleCloudStorageServiceProvider.php +++ b/src/GoogleCloudStorageServiceProvider.php @@ -85,19 +85,16 @@ public function boot() private function createClient($config) { $keyFile = Arr::get($config, 'key_file'); - if (is_string($keyFile)) { + if (is_array($keyFile)) { return new StorageClient([ 'projectId' => $config['project_id'], - 'keyFilePath' => $keyFile, + 'keyFile' => array_merge(["project_id" => $config['project_id']], $keyFile) ]); } - if (! is_array($keyFile)) { - $keyFile = []; - } return new StorageClient([ 'projectId' => $config['project_id'], - 'keyFile' => array_merge(["project_id" => $config['project_id']], $keyFile) + 'keyFilePath' => $keyFile ]); }