fix: use FUNCTION_TARGET to detect GCF 10 and above (#748)

googleapis · Jul 19, 2019 · ca17685 · ca17685
1 parent 131489e
commit ca17685
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/auth/envDetect.ts b/src/auth/envDetect.ts
@@ -52,7 +52,7 @@ function isAppEngine() {
 }
 
 function isCloudFunction() {
- return !!process.env.FUNCTION_NAME;
+ return !!(process.env.FUNCTION_NAME || process.env.FUNCTION_TARGET);
 }
 
 async function isKubernetesEngine() {

diff --git a/test/test.googleauth.ts b/test/test.googleauth.ts
@@ -1226,13 +1226,20 @@ describe('googleauth', () => {
  scope.done();
  });
 
- it('should get the current environment if GCF', async () => {
+ it('should get the current environment if GCF 8 and below', async () => {
  envDetect.clear();
  mockEnvVar('FUNCTION_NAME', 'DOGGY');
  const env = await auth.getEnv();
  assert.strictEqual(env, envDetect.GCPEnv.CLOUD_FUNCTIONS);
  });
 
+ it('should get the current environment if GCF 10 and up', async () => {
+ envDetect.clear();
+ mockEnvVar('FUNCTION_TARGET', 'KITTY');
+ const env = await auth.getEnv();
+ assert.strictEqual(env, envDetect.GCPEnv.CLOUD_FUNCTIONS);
+ });
+
  it('should get the current environment if GAE', async () => {
  envDetect.clear();
  mockEnvVar('GAE_SERVICE', 'KITTY');