fix(js/plugins/google-cloud): pass projectId through to GoogleAuth cl…

…ient

js/plugins/firebase/src/index.ts

@@ -26,6 +26,12 @@ import {
 } from '@genkit-ai/google-cloud';
 export { defineFirestoreRetriever } from './firestoreRetriever.js';
 
+/**
+ * Enables telemetry export to Firebase Genkit Monitoring, backed by the
+ * Google Cloud Observability suite.
+ *
+ * @param options configuration options
+ */
 export async function enableFirebaseTelemetry(
   options?: GcpTelemetryConfigOptions
 ) {

js/plugins/google-cloud/src/auth.ts

@@ -14,7 +14,13 @@
  * limitations under the License.
  */
 import { logger } from 'genkit/logging';
-import { auth, CredentialBody, GoogleAuth } from 'google-auth-library';
+import {
+  auth,
+  CredentialBody,
+  GoogleAuth,
+  GoogleAuthOptions,
+} from 'google-auth-library';
+import { JSONClient } from 'google-auth-library/build/src/auth/googleauth.js';
 import { GcpPrincipal, GcpTelemetryConfig } from './types.js';
 
 /**
@@ -29,34 +35,42 @@ import { GcpPrincipal, GcpTelemetryConfig } from './types.js';
  * searches for credential files in standard locations, before using this
  * method.
  *
- * See also: https://github.com/googleapis/google-auth-library-nodejs?tab=readme-ov-file#loading-credentials-from-environment-variables
+ * @see https://github.com/googleapis/google-auth-library-nodejs?tab=readme-ov-file#loading-credentials-from-environment-variables
+ *
+ * @param projectId if provided, will take precendence over projectId from credential
  */
-export async function credentialsFromEnvironment(): Promise<
-  Partial<GcpTelemetryConfig>
-> {
+export async function credentialsFromEnvironment(
+  projectId?: string
+): Promise<Partial<GcpTelemetryConfig>> {
+  const telemetryConfig: Partial<GcpTelemetryConfig> = {};
+  const authOptions: GoogleAuthOptions<JSONClient> = {};
+
+  // provided projectId always takes precedence
+  if (projectId !== undefined) {
+    authOptions.projectId = projectId;
+  }
+
   let authClient: GoogleAuth;
-  let options: Partial<GcpTelemetryConfig> = {};
 
   if (process.env.GCLOUD_SERVICE_ACCOUNT_CREDS) {
     logger.debug('Retrieving credentials from GCLOUD_SERVICE_ACCOUNT_CREDS');
     const serviceAccountCreds = JSON.parse(
       process.env.GCLOUD_SERVICE_ACCOUNT_CREDS
     );
-    const authOptions = { credentials: serviceAccountCreds };
+    authOptions.credentials = serviceAccountCreds;
     authClient = new GoogleAuth(authOptions);
-    options.credentials = await authClient.getCredentials();
+    telemetryConfig.credentials = await authClient.getCredentials();
   } else {
-    authClient = new GoogleAuth();
+    authClient = new GoogleAuth(authOptions);
   }
+
   try {
-    const projectId = await authClient.getProjectId();
-    if (projectId && projectId.length > 0) {
-      options.projectId = projectId;
-    }
+    telemetryConfig.projectId = await authClient.getProjectId();
   } catch (error) {
     logger.warn(error);
   }
-  return options;
+
+  return telemetryConfig;
 }
 
 /**

js/plugins/google-cloud/src/index.ts

@@ -41,7 +41,7 @@ export function enableGoogleCloudTelemetry(
 async function configureGcpPlugin(
   options?: GcpTelemetryConfigOptions
 ): Promise<GcpTelemetryConfig> {
-  const envOptions = await credentialsFromEnvironment();
+  const envOptions = await credentialsFromEnvironment(options?.projectId);
   return {
     projectId: options?.projectId || envOptions.projectId,
     credentials: options?.credentials || envOptions.credentials,