Merge pull request #10 from FrozenDonkey/master

Adding Support for Credentials via env()
schulzefelix · Aug 12, 2020 · f40b7fb · f40b7fb
2 parents 4dd7c3f + 3693fb2
commit f40b7fb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -41,6 +41,16 @@ return [
     */
 
     'application_credentials' => env('GOOGLE_CLOUD_APPLICATION_CREDENTIALS'),
+
+
+    /*
+    | OPTIONAL:
+    | Use keyFile to use a json config from the current environment.
+    | For example secrets in laravel vapor
+    |
+    | https://docs.vapor.build/1.0/projects/environments.html#secrets
+    */
+    //'keyFile' => json_decode(trim(env('GOOGLE_CLOUD_APPLICATION_CREDENTIALS')), true),
 
     /*
     |--------------------------------------------------------------------------

diff --git a/src/BigQueryClientFactory.php b/src/BigQueryClientFactory.php
@@ -14,6 +14,7 @@ public static function createForConfig(array $bigQueryConfig): BigQueryClient
         $clientConfig = array_merge([
             'projectId' => $bigQueryConfig['project_id'],
             'keyFilePath' => $bigQueryConfig['application_credentials'],
+            'keyFile' => Arr::get($bigQueryConfig, 'keyFile', null),
             'authCache' => self::configureCache($bigQueryConfig['auth_cache_store']),
         ], Arr::get($bigQueryConfig, 'client_options', []));
 

diff --git a/src/BigQueryServiceProvider.php b/src/BigQueryServiceProvider.php
@@ -42,7 +42,7 @@ public function register()
 
     protected function guardAgainstInvalidConfiguration(array $bigQueryConfig = null)
     {
-        if (! file_exists($bigQueryConfig['application_credentials'])) {
+        if (! file_exists($bigQueryConfig['application_credentials']) && ! array_key_exists('keyFile', $bigQueryConfig)) {
             throw InvalidConfiguration::credentialsJsonDoesNotExist($bigQueryConfig['application_credentials']);
         }
     }

diff --git a/src/config/bigquery.php b/src/config/bigquery.php
@@ -15,6 +15,15 @@
 
     'application_credentials' => env('GOOGLE_CLOUD_APPLICATION_CREDENTIALS'),
 
+    /*
+    | OPTIONAL:
+    | Use keyFile to use a json config from the current environment.
+    | For example secrets in laravel vapor
+    |
+    | https://docs.vapor.build/1.0/projects/environments.html#secrets
+    */
+    //'keyFile' => json_decode(trim(env('GOOGLE_CLOUD_APPLICATION_CREDENTIALS')), true),
+
     /*
     |--------------------------------------------------------------------------
     | Project ID