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

JustinBeckwith · web-flow · commit ca17685486a9 · 2019-07-19T12:33:33.000-07:00
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');

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ function isAppEngine() {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`function isCloudFunction() {`
`55`		`- return !!process.env.FUNCTION_NAME;`
	`55`	`+ return !!(process.env.FUNCTION_NAME \|\| process.env.FUNCTION_TARGET);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`async function isKubernetesEngine() {`