Revert unintended changes to integration tests.

Author: taeold

integration_test/functions/src/index.ts

@@ -1,7 +1,8 @@
 import { PubSub } from "@google-cloud/pubsub";
+import { GoogleAuth } from "google-auth-library";
 import { Request, Response } from "express";
 import * as admin from "firebase-admin";
-import * as functions from "firebase-functions/v1";
+import * as functions from "firebase-functions";
 import * as fs from "fs";
 import fetch from "node-fetch";
 
@@ -19,17 +20,55 @@ import * as testLab from "./v1/testLab-utils";
 const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG);
 admin.initializeApp();
 
+// Re-enable no-unused-var check once callable functions are testable again.
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function callHttpsTrigger(name: string, data: any) {
   const url = `https://${REGION}-${firebaseConfig.projectId}.cloudfunctions.net/${name}`;
-  const resp = await fetch(url, {
+  const client = await new GoogleAuth().getIdTokenClient("32555940559.apps.googleusercontent.com");
+  const resp = await client.request({
+    url,
     method: "POST",
     headers: {
       "Content-Type": "application/json",
     },
     body: JSON.stringify({ data }),
   });
-  if (!resp.ok) {
-    throw new Error(`Failed request with status ${resp.status}!`);
+  if (resp.status > 200) {
+    throw Error(resp.statusText);
+  }
+}
+
+// Re-enable no-unused-var check once callable functions are testable again.
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+async function callV2HttpsTrigger(name: string, data: any, accessToken: string) {
+  const getFnResp = await fetch(
+    `https://cloudfunctions.googleapis.com/v2beta/projects/${firebaseConfig.projectId}/locations/${REGION}/functions/${name}`,
+    {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    }
+  );
+  if (!getFnResp.ok) {
+    throw new Error(getFnResp.statusText);
+  }
+  const fn = await getFnResp.json();
+  const uri = fn.serviceConfig?.uri;
+  if (!uri) {
+    throw new Error(`Cannot call v2 https trigger ${name} - no uri found`);
+  }
+
+  const client = await new GoogleAuth().getIdTokenClient("32555940559.apps.googleusercontent.com");
+  const invokeFnREsp = await client.request({
+    url: uri,
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({ data }),
+  });
+  if (invokeFnREsp.status > 200) {
+    throw Error(invokeFnREsp.statusText);
   }
 }
 
@@ -111,7 +150,8 @@ function v1Tests(testId: string, accessToken: string): Array<Promise<unknown>> {
     // A firestore write to trigger the Cloud Firestore tests.
     admin.firestore().collection("tests").doc(testId).set({ test: testId }),
     // Invoke a callable HTTPS trigger.
-    callHttpsTrigger("v1-callableTests", { foo: "bar", testId }),
+    // TODO: Temporarily disable - doesn't work unless running on projects w/ permission to create public functions.
+    // callHttpsTrigger("v1-callableTests", { foo: "bar", testId }),
     // A Remote Config update to trigger the Remote Config tests.
     updateRemoteConfig(testId, accessToken),
     // A storage upload to trigger the Storage tests
@@ -129,7 +169,8 @@ function v1Tests(testId: string, accessToken: string): Array<Promise<unknown>> {
 function v2Tests(testId: string, accessToken: string): Array<Promise<void>> {
   return [
     // Invoke a callable HTTPS trigger.
-    callHttpsTrigger("v2-callabletests", { foo: "bar", testId }),
+    // TODO: Temporarily disable - doesn't work unless running on projects w/ permission to create public functions.
+    // callV2HttpsTrigger("v2-callabletests", { foo: "bar", testId }, accessToken),
     // Invoke a scheduled trigger.
     callV2ScheduleTrigger("v2-schedule", "us-central1", accessToken),
   ];

integration_test/functions/src/testing.ts

@@ -1,5 +1,5 @@
 import * as firebase from "firebase-admin";
-import * as functions from "firebase-functions/v1";
+import * as functions from "firebase-functions";
 
 export type TestCase<T> = (data: T, context?: functions.EventContext) => any;
 export interface TestCaseMap<T> {

integration_test/functions/src/v1/auth-tests.ts

@@ -1,5 +1,5 @@
 import * as admin from "firebase-admin";
-import * as functions from "firebase-functions/v1";
+import * as functions from "firebase-functions";
 import { REGION } from "../region";
 import { expectEq, TestSuite } from "../testing";
 import UserMetadata = admin.auth.UserRecord;

integration_test/functions/src/v1/database-tests.ts

@@ -1,5 +1,5 @@
 import * as admin from "firebase-admin";
-import * as functions from "firebase-functions/v1";
+import * as functions from "firebase-functions";
 import { REGION } from "../region";
 import { expectEq, expectMatches, TestSuite } from "../testing";
 import DataSnapshot = admin.database.DataSnapshot;

integration_test/functions/src/v1/firestore-tests.ts

@@ -1,5 +1,5 @@
 import * as admin from "firebase-admin";
-import * as functions from "firebase-functions/v1";
+import * as functions from "firebase-functions";
 import { REGION } from "../region";
 import { expectDeepEq, expectEq, TestSuite } from "../testing";
 import DocumentSnapshot = admin.firestore.DocumentSnapshot;

integration_test/functions/src/v1/https-tests.ts

@@ -1,4 +1,4 @@
-import * as functions from "firebase-functions/v1";
+import * as functions from "firebase-functions";
 import { REGION } from "../region";
 import { expectEq, TestSuite } from "../testing";
 

integration_test/functions/src/v1/index.ts

@@ -2,7 +2,8 @@ export * from "./pubsub-tests";
 export * from "./database-tests";
 export * from "./auth-tests";
 export * from "./firestore-tests";
-export * from "./https-tests";
-// export * from "./remoteConfig-tests";
+// Temporarily disable http test - will not work unless running on projects w/ permission to create public functions.
+// export * from "./https-tests";
+export * from "./remoteConfig-tests";
 export * from "./storage-tests";
-// export * from "./testLab-tests";
+export * from "./testLab-tests";

integration_test/functions/src/v1/pubsub-tests.ts

@@ -1,5 +1,5 @@
 import * as admin from "firebase-admin";
-import * as functions from "firebase-functions/v1";
+import * as functions from "firebase-functions";
 import { REGION } from "../region";
 import { evaluate, expectEq, success, TestSuite } from "../testing";
 import PubsubMessage = functions.pubsub.Message;

integration_test/functions/src/v1/remoteConfig-tests.ts

@@ -1,4 +1,4 @@
-import * as functions from "firebase-functions/v1";
+import * as functions from "firebase-functions";
 import { REGION } from "../region";
 import { expectEq, TestSuite } from "../testing";
 import TemplateVersion = functions.remoteConfig.TemplateVersion;

integration_test/functions/src/v1/storage-tests.ts

@@ -1,4 +1,4 @@
-import * as functions from "firebase-functions/v1";
+import * as functions from "firebase-functions";
 import { REGION } from "../region";
 import { expectEq, TestSuite } from "../testing";
 import ObjectMetadata = functions.storage.ObjectMetadata;