Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jul 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/auth/envDetect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
9 changes: 8 additions & 1 deletion test/test.googleauth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down