From 42a6ed3b706336c1931e661577d87085b08b991d Mon Sep 17 00:00:00 2001 From: kcolton-jpg Date: Fri, 28 Aug 2026 13:54:34 -0700 Subject: [PATCH 1/2] Update gcp-residency.ts to include K_CLOUD_RUN_WORKER_POOLS when determining if the environment is GCP Serverless Update the function for determining whether a environment is GCP Serverless to include K_CLOUD_RUN_WORKER_POOLS. --- core/packages/gcp-metadata/src/gcp-residency.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/packages/gcp-metadata/src/gcp-residency.ts b/core/packages/gcp-metadata/src/gcp-residency.ts index 8c65d260efa2..dd4cd295f95c 100644 --- a/core/packages/gcp-metadata/src/gcp-residency.ts +++ b/core/packages/gcp-metadata/src/gcp-residency.ts @@ -47,11 +47,16 @@ export function isGoogleCloudServerless(): boolean { * `K_SERVICE` is used in Cloud Run and newer Cloud Functions environments: * - See {@link https://cloud.google.com/run/docs/container-contract#env-vars Cloud Run environment variables}. * - See {@link https://cloud.google.com/functions/docs/env-var Cloud Functions newer runtimes}. + * + * `K_CLOUD_RUN_WORKER_POOL` is used in Cloud Run and newer Cloud Functions environments: + * - See {@link https://cloud.google.com/run/docs/container-contract#env-vars Cloud Run environment variables}. + * - See {@link http://cloud/run/docs/deploy-worker-pools Deploy Worker Pools to Cloud Run}. */ const isGFEnvironment = process.env.CLOUD_RUN_JOB || process.env.FUNCTION_NAME || - process.env.K_SERVICE; + process.env.K_SERVICE || + process.env.K_CLOUD_RUN_WORKER_POOL; return !!isGFEnvironment; } From 99458b39b7b7f2a857ff3a8bd638c38375688251 Mon Sep 17 00:00:00 2001 From: kcolton-jpg Date: Fri, 28 Aug 2026 14:32:30 -0700 Subject: [PATCH 2/2] Update ISGoogleCloudServerless function check for Cloud Run Worker Pools --- core/packages/gcp-metadata/src/gcp-residency.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/packages/gcp-metadata/src/gcp-residency.ts b/core/packages/gcp-metadata/src/gcp-residency.ts index dd4cd295f95c..82bb62c7d57c 100644 --- a/core/packages/gcp-metadata/src/gcp-residency.ts +++ b/core/packages/gcp-metadata/src/gcp-residency.ts @@ -48,7 +48,7 @@ export function isGoogleCloudServerless(): boolean { * - See {@link https://cloud.google.com/run/docs/container-contract#env-vars Cloud Run environment variables}. * - See {@link https://cloud.google.com/functions/docs/env-var Cloud Functions newer runtimes}. * - * `K_CLOUD_RUN_WORKER_POOL` is used in Cloud Run and newer Cloud Functions environments: + * `CLOUD_RUN_WORKER_POOL` is used in Cloud Run and newer Cloud Functions environments: * - See {@link https://cloud.google.com/run/docs/container-contract#env-vars Cloud Run environment variables}. * - See {@link http://cloud/run/docs/deploy-worker-pools Deploy Worker Pools to Cloud Run}. */ @@ -56,7 +56,7 @@ export function isGoogleCloudServerless(): boolean { process.env.CLOUD_RUN_JOB || process.env.FUNCTION_NAME || process.env.K_SERVICE || - process.env.K_CLOUD_RUN_WORKER_POOL; + process.env.CLOUD_RUN_WORKER_POOL; return !!isGFEnvironment; }