Use only one instance of GcpMetadata

kreait · Mar 19, 2020 · 90616d2 · 90616d2
1 parent 7d11727
commit 90616d2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/Firebase/Factory.php b/src/Firebase/Factory.php
@@ -89,6 +89,11 @@ class Factory
      */
     protected $httpClientMiddlewares = [];
 
+    /**
+     * @var GcpMetadata
+     */
+    protected $gcpMetadata;
+
     protected static $databaseUriPattern = 'https://%s.firebaseio.com';
 
     protected static $storageBucketNamePattern = '%s.appspot.com';
@@ -98,7 +103,8 @@ class Factory
 
     public function __construct()
     {
-        $this->serviceAccountDiscoverer = new Discoverer();
+        $this->gcpMetadata = new GcpMetadata(new Client());
+        $this->serviceAccountDiscoverer = new Discoverer([], $this->gcpMetadata);
         $this->clock = new SystemClock();
     }
 
@@ -415,7 +421,7 @@ protected function createGoogleAuthTokenMiddleware(): AuthTokenMiddleware
                 'client_id' => $serviceAccount->getClientId(),
                 'private_key' => $serviceAccount->getPrivateKey(),
             ]);
-        } elseif ((new GcpMetadata())->isAvailable()) {
+        } elseif ($this->gcpMetadata->isAvailable()) {
             // @codeCoverageIgnoreStart
             // We can't test this programatically when not on GCE/GCP
             $credentials = new GCECredentials();

diff --git a/src/Firebase/ServiceAccount/Discoverer.php b/src/Firebase/ServiceAccount/Discoverer.php
@@ -7,6 +7,7 @@
 use Google\Auth\CredentialsLoader;
 use Kreait\Firebase\Exception\ServiceAccountDiscoveryFailed;
 use Kreait\Firebase\ServiceAccount;
+use Kreait\GcpMetadata;
 use Throwable;
 
 class Discoverer
@@ -16,12 +17,18 @@ class Discoverer
      */
     private $methods;
 
+    /**
+     * @var GcpMetadata
+     */
+    private $gcpMetadata;
+
     /**
      * @param callable[] $methods
      */
-    public function __construct(array $methods = null)
+    public function __construct(array $methods = null, GcpMetadata $gcpMetadata = null)
     {
         $this->methods = $methods ?? $this->getDefaultMethods();
+        $this->gcpMetadata = $gcpMetadata ?? new GcpMetadata();
     }
 
     public function getDefaultMethods(): array
@@ -30,7 +37,7 @@ public function getDefaultMethods(): array
             new Discovery\FromEnvironmentVariable('FIREBASE_CREDENTIALS'),
             new Discovery\FromEnvironmentVariable(CredentialsLoader::ENV_VAR),
             new Discovery\FromGoogleWellKnownFile(),
-            new Discovery\OnGoogleCloudPlatform(),
+            new Discovery\OnGoogleCloudPlatform($this->gcpMetadata),
         ];
     }